#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
-#include <stdio.h> /* fprintf() */
-#include <stdlib.h> /* putenv(), strtol(), */
+#include <stdio.h>
+#include <stdlib.h>
#include <locale.h>
+#ifdef __GLIBC__
+#include <dlfcn.h>
+#endif
+
/* Explicit HACK */
extern void LocaleFree (const char *);
/*****************************************************************************
* main: parse command line, start interface and spawn threads.
*****************************************************************************/
-int main( int i_argc, char *ppsz_argv[] )
+int main( int i_argc, const char *ppsz_argv[] )
{
int i_ret;
+# ifdef __GLIBC__
+ if (dlsym (RTLD_NEXT, "inet6_rth_add") && !dlsym (RTLD_NEXT, "qsort_r"))
+ {
+ /* Way too many Linux users have glibc 2.5-2.7 that keeps crashing
+ * inside its non-thread-safe dcgettext(). */
+ /* Hopefully glibc 2.8 will eventually work, not sure though */
+ fprintf (stderr,
+"***************************************************\n"
+"*** glibc version with broken libintl detected. ***\n"
+"*** Messages localization will be disabled. ***\n"
+"***************************************************\n");
+ setenv ("LC_MESSAGES", "C", 1);
+ }
+# endif
setlocale (LC_ALL, "");
#ifndef __APPLE__
#endif
#ifdef HAVE_PUTENV
-# ifdef DEBUG
+# ifndef NDEBUG
/* Activate malloc checking routines to detect heap corruptions. */
putenv( (char*)"MALLOC_CHECK_=2" );
+# ifdef __APPLE__
+ putenv( (char*)"MallocErrorAbort=crash_my_baby_crash" );
+# endif
/* Disable the ugly Gnome crash dialog so that we properly segfault */
putenv( (char *)"GNOME_DISABLE_CRASH_DIALOG=1" );
# endif
-
- /* If the user isn't using VLC_VERBOSE, set it to 0 by default */
- if( getenv( "VLC_VERBOSE" ) == NULL )
- {
- putenv( (char *)"VLC_VERBOSE=0" );
- }
#endif
#if defined (HAVE_GETEUID) && !defined (SYS_BEOS)
}
#if !defined(WIN32) && !defined(UNDER_CE)
- /* Synchronously intercepted signals. Thy request a clean shutdown,
- * and force an unclean shutdown if they are triggered again 2+ seconds
- * later. We have to handle SIGTERM cleanly because of daemon mode.
+ /* Synchronously intercepted POSIX signals.
+ *
+ * In a threaded program such as VLC, the only sane way to handle signals
+ * is to block them in all thread but one - this is the only way to
+ * predict which thread will receive them. If any piece of code depends
+ * on delivery of one of this signal it is intrinsically not thread-safe
+ * and MUST NOT be used in VLC, whether we like it or not.
+ * There is only one exception: if the signal is raised with
+ * pthread_kill() - we do not use this in LibVLC but some pthread
+ * implementations use them internally. You should really use conditions
+ * for thread synchronization anyway.
+ *
+ * Signal that request a clean shutdown, and force an unclean shutdown
+ * if they are triggered again 2+ seconds later.
+ * We have to handle SIGTERM cleanly because of daemon mode.
* Note that we set the signals after the vlc_create call. */
static const int exitsigs[] = { SIGINT, SIGHUP, SIGQUIT, SIGTERM };
+ /* Signals that cause a no-op:
+ * - SIGALRM should not happen, but lets stay on the safe side.
+ * - SIGPIPE might happen with sockets and would crash VLC. It MUST be
+ * blocked by any LibVLC-dependant application, in addition to VLC.
+ * - SIGCHLD is comes after exec*() (such as httpd CGI support) and must
+ * be dequeued to cleanup zombie processes.
+ */
static const int dummysigs[] = { SIGALRM, SIGPIPE, SIGCHLD };
sigset_t set;
int si = { 0 };
__wgetmainargs(&i_wargc, &wargv, &wenvp, 0, &si);
- for( i = 1; i < i_wargc; i++ )
+ for( i = 0; i < i_wargc; i++ )
{
int len = WideCharToMultiByte(CP_UTF8, 0, wargv[i], -1, NULL, 0, NULL, NULL);
if( len > 0 )
*****************************************************************************/
static void *SigHandler (void *data)
{
- const sigset_t *set = (sigset_t *)data;
+ const sigset_t *exitset = (sigset_t *)data;
+ sigset_t fullset;
time_t abort_time = 0;
+ pthread_sigmask (SIG_BLOCK, exitset, &fullset);
+
for (;;)
{
int i_signal, state;
- (void)sigwait (set, &i_signal);
+ if( sigwait (&fullset, &i_signal) != 0 )
+ continue;
#ifdef __APPLE__
/* In Mac OS X up to 10.4.8 sigwait (among others) is not a pthread
pthread_testcancel();
#endif
+ if (!sigismember (exitset, i_signal))
+ continue; /* Ignore "dummy" signals */
+
/* Once a signal has been trapped, the termination sequence will be
* armed and subsequent signals will be ignored to avoid sending
* signals to a libvlc structure having been destroyed */
pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state);
- if (abort_time == 0)
+ if (abort_time == 0 || time (NULL) > abort_time)
{
time (&abort_time);
abort_time += 2;
fprintf (stderr, "signal %d received, terminating vlc - do it "
- "again in case it gets stuck\n", i_signal);
+ "again quickly in case it gets stuck\n", i_signal);
/* Acknowledge the signal received */
Kill ();
}
- else
- if (time (NULL) <= abort_time)
+ else /* time (NULL) <= abort_time */
{
/* If user asks again more than 2 seconds later, die badly */
- pthread_sigmask (SIG_UNBLOCK, set, NULL);
+ pthread_sigmask (SIG_UNBLOCK, exitset, NULL);
fprintf (stderr, "user insisted too much, dying badly\n");
+#ifdef __APPLE__
+ /* On Mac OS X, use exit(-1) as it doesn't trigger
+ * backtrace generation, whereas abort() does.
+ * The backtrace generation trigger a Crash Dialog
+ * And takes way too much time, which is not what
+ * we want. */
+ exit (-1);
+#else
abort ();
+#endif
}
pthread_setcancelstate (state, NULL);
}
projects / vlc / blobdiff