Commit 2dde53c5 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Only print the first 5 threading errors each

parent 804f2fb6
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#endif #endif
#include <stdbool.h> #include <stdbool.h>
#define MAX_ERRORS 5
void vlc_enable_override (void); void vlc_enable_override (void);
...@@ -56,32 +57,37 @@ void vlc_enable_override (void) ...@@ -56,32 +57,37 @@ void vlc_enable_override (void)
pthread_atfork (NULL, NULL, vlc_reset_override); pthread_atfork (NULL, NULL, vlc_reset_override);
} }
static void vlogbug (const char *level, const char *func, const char *fmt, static void vlogbug (unsigned *pc, const char *level, const char *func,
va_list ap) const char *fmt, va_list ap)
{ {
#ifdef HAVE_BACKTRACE #ifdef HAVE_BACKTRACE
const size_t framec = 4; const size_t framec = 5;
void *framev[framec]; void *framev[framec];
backtrace (framev, framec); backtrace (framev, framec);
#endif #endif
flockfile (stderr); flockfile (stderr);
fprintf (stderr, "%s: call to %s(", level, func); if (*pc < MAX_ERRORS)
vfprintf (stderr, fmt, ap); {
fputs (")\n", stderr); (*pc)++;
fflush (stderr); fprintf (stderr, "%s: call to %s(", level, func);
vfprintf (stderr, fmt, ap);
fputs (")\n", stderr);
fflush (stderr);
#ifdef HAVE_BACKTRACE #ifdef HAVE_BACKTRACE
backtrace_symbols_fd (framev + 2, framec - 2, fileno (stderr)); backtrace_symbols_fd (framev + 2, framec - 2, fileno (stderr));
#endif #endif
}
funlockfile (stderr); funlockfile (stderr);
} }
static void logbug (const char *level, const char *func, const char *fmt, ...) static void logbug (unsigned *pc, const char *level, const char *func,
const char *fmt, ...)
{ {
va_list ap; va_list ap;
va_start (ap, fmt); va_start (ap, fmt);
vlogbug (level, func, fmt, ap); vlogbug (pc, level, func, fmt, ap);
va_end (ap); va_end (ap);
} }
...@@ -97,7 +103,12 @@ static void *getsym (const char *name) ...@@ -97,7 +103,12 @@ static void *getsym (const char *name)
return sym; return sym;
} }
#define LOG(level, ...) logbug(level, __func__, __VA_ARGS__) #define LOG(level, ...) \
do { \
static unsigned counter = 0; \
logbug(&counter, level, __func__, __VA_ARGS__); \
} while (0)
/* Evil non-standard GNU C macro ;) /* Evil non-standard GNU C macro ;)
* typeof keyword, * typeof keyword,
* statement-expression, * statement-expression,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment