#endif
#include <stdbool.h>
+#define MAX_ERRORS 5
void vlc_enable_override (void);
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <dlfcn.h>
#include <pthread.h>
#ifdef HAVE_EXECINFO_H
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);
}
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,
}
+#if 0
/** Signals **/
#include <signal.h>
if (!blocked_signal (signum))
goto error;
/* For our blocked signals, the handler won't matter much... */
- LOG("Warning", "%d, %p", signum, handler);
+ if (handler == SIG_DFL)
+ LOG("Warning", "%d, SIG_DFL", signum, handler);
}
return CALL(signal, signum, handler);
error:
if ((act->sa_flags & SA_SIGINFO)
|| (act->sa_handler != SIG_IGN && act->sa_handler != SIG_DFL))
goto error;
- LOG("Warning", "%d, %p, %p", signum, act, old);
+ if (act->sa_handler == SIG_DFL)
+ LOG("Warning", "%d, %p, SIG_DFL", signum, act);
}
return CALL(sigaction, signum, act, old);
error:
LOG("Blocked", "%d, %p, %p", signum, act, old);
return -1;
}
+#endif
/*** Locales ***
}
+/* strerror() is not thread-safe in theory (POSIX), nor in practice (glibc).
+ * This caused quite nasty crashes in the history of VLC/Linux. */
+char *strerror (int val)
+{
+ if (override)
+ {
+ static const char msg[] =
+ "Error message unavailable (use strerror_r instead of strerror)!";
+ LOG("Blocked", "%d", val);
+ return (char *)msg;
+ }
+ return CALL(strerror, val);
+}
+
/*** Xlib ****/
#ifdef HAVE_X11_XLIB_H
# include <X11/Xlib.h>