X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bin%2Foverride.c;h=ac9e14cddd5bf98be6ad55e8726dc007a53868fd;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=b5de22d0f558b4c941937048c63ea11c75ffc0a9;hpb=b67a5864cbcd069e3c0ad971745137469bb07ed6;p=vlc diff --git a/bin/override.c b/bin/override.c index b5de22d0f5..ac9e14cddd 100644 --- a/bin/override.c +++ b/bin/override.c @@ -23,6 +23,7 @@ #endif #include +#define MAX_ERRORS 5 void vlc_enable_override (void); @@ -56,32 +57,37 @@ void vlc_enable_override (void) pthread_atfork (NULL, NULL, vlc_reset_override); } -static void vlogbug (const char *level, const char *func, const char *fmt, - va_list ap) +static void vlogbug (unsigned *pc, const char *level, const char *func, + const char *fmt, va_list ap) { #ifdef HAVE_BACKTRACE - const size_t framec = 4; + const size_t framec = 5; void *framev[framec]; backtrace (framev, framec); #endif flockfile (stderr); - fprintf (stderr, "%s: call to %s(", level, func); - vfprintf (stderr, fmt, ap); - fputs (")\n", stderr); - fflush (stderr); + if (*pc < MAX_ERRORS) + { + (*pc)++; + fprintf (stderr, "%s: call to %s(", level, func); + vfprintf (stderr, fmt, ap); + fputs (")\n", stderr); + fflush (stderr); #ifdef HAVE_BACKTRACE - backtrace_symbols_fd (framev + 2, framec - 2, fileno (stderr)); + backtrace_symbols_fd (framev + 2, framec - 2, fileno (stderr)); #endif + } 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_start (ap, fmt); - vlogbug (level, func, fmt, ap); + vlogbug (pc, level, func, fmt, ap); va_end (ap); } @@ -97,7 +103,12 @@ static void *getsym (const char *name) 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 ;) * typeof keyword, * statement-expression, @@ -190,6 +201,7 @@ int rand (void) } +#if 0 /** Signals **/ #include @@ -241,6 +253,7 @@ error: LOG("Blocked", "%d, %p, %p", signum, act, old); return -1; } +#endif /*** Locales ***