X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bin%2Fvlc.c;h=085aa3afda453b37dd9cf8422b42c05b5c55c5b3;hb=c60652e38ac6afd74bd8225e9dae5406f13aaa4f;hp=2633f84cbb3028dac219032ed07285e53023c67d;hpb=6791c80f95ab61be78794f076f7e4cbe05a24102;p=vlc diff --git a/bin/vlc.c b/bin/vlc.c index 2633f84cbb..085aa3afda 100644 --- a/bin/vlc.c +++ b/bin/vlc.c @@ -32,7 +32,13 @@ #include #include #include +#include #include +#include +#include +#include +#include +#include #ifdef __APPLE__ #include @@ -42,21 +48,65 @@ /* Explicit HACK */ extern void LocaleFree (const char *); extern char *FromLocale (const char *); +extern void vlc_enable_override (void); -#include -#include -#include -#include +#ifdef HAVE_MAEMO +static void dummy_handler (int signum) +{ + (void) signum; +} +#endif + +static bool signal_ignored (int signum) +{ + struct sigaction sa; + + if (sigaction (signum, NULL, &sa)) + return false; + return ((sa.sa_flags & SA_SIGINFO) + ? (void *)sa.sa_sigaction : (void *)sa.sa_handler) == SIG_IGN; +} + +static void vlc_kill (void *data) +{ + pthread_t *ps = data; + + pthread_kill (*ps, SIGTERM); +} + +static void exit_timeout (int signum) +{ + (void) signum; + signal (SIGINT, SIG_DFL); +} /***************************************************************************** * main: parse command line, start interface and spawn threads. *****************************************************************************/ int main( int i_argc, const char *ppsz_argv[] ) { -#ifdef __APPLE__ - /* The so-called POSIX-compliant MacOS X is not. - * SIGPIPE fires even when it is blocked in all threads! */ + /* The so-called POSIX-compliant MacOS X reportedly processes SIGPIPE even + * if it is blocked in all thread. Also some libraries want SIGPIPE blocked + * as they have no clue about signal masks. + * Note: this is NOT an excuse for not protecting against SIGPIPE. If + * LibVLC runs outside of VLC, we cannot rely on this code snippet. */ signal (SIGPIPE, SIG_IGN); + /* Restore default for SIGCHLD in case parent ignores it. */ + signal (SIGCHLD, SIG_DFL); + +#ifdef HAVE_SETENV +# ifndef NDEBUG + /* Activate malloc checking routines to detect heap corruptions. */ + setenv ("MALLOC_CHECK_", "2", 1); + + /* Disable the ugly Gnome crash dialog so that we properly segfault */ + setenv ("GNOME_DISABLE_CRASH_DIALOG", "1", 1); +# endif + + /* Clear the X.Org startup notification ID. Otherwise the UI might try to + * change the environment while the process is multi-threaded. That could + * crash. Screw you X.Org. Next time write a thread-safe specification. */ + unsetenv ("DESKTOP_STARTUP_ID"); #endif #ifndef ALLOW_RUN_AS_ROOT @@ -74,23 +124,17 @@ int main( int i_argc, const char *ppsz_argv[] ) #ifndef __APPLE__ /* This clutters OSX GUI error logs */ - fprintf( stderr, "VLC media player %s\n", libvlc_get_version() ); + fprintf( stderr, "VLC media player %s (revision %s)\n", + libvlc_get_version(), libvlc_get_changeset() ); #endif -#ifdef HAVE_PUTENV -# ifndef NDEBUG - /* Activate malloc checking routines to detect heap corruptions. */ - putenv( (char*)"MALLOC_CHECK_=2" ); - - /* Disable the ugly Gnome crash dialog so that we properly segfault */ - putenv( (char *)"GNOME_DISABLE_CRASH_DIALOG=1" ); -# endif -#endif + sigset_t set; + sigemptyset (&set); /* 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 + * is to block them in all threads 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. @@ -101,28 +145,30 @@ int main( int i_argc, const char *ppsz_argv[] ) * * 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 sigs[] = { - SIGINT, SIGHUP, SIGQUIT, SIGTERM, + * We have to handle SIGTERM cleanly because of daemon mode. */ + sigaddset (&set, SIGINT); + sigaddset (&set, SIGHUP); + sigaddset (&set, SIGQUIT); + sigaddset (&set, SIGTERM); + /* Signals that cause a no-op: * - SIGPIPE might happen with sockets and would crash VLC. It MUST be * blocked by any LibVLC-dependent application, not just VLC. * - SIGCHLD comes after exec*() (such as httpd CGI support) and must * be dequeued to cleanup zombie processes. */ - SIGPIPE, SIGCHLD - }; - - sigset_t set; - sigemptyset (&set); - for (unsigned i = 0; i < sizeof (sigs) / sizeof (sigs[0]); i++) - sigaddset (&set, sigs[i]); + sigaddset (&set, SIGPIPE); + sigaddset (&set, SIGCHLD); +#ifdef HAVE_MAEMO + sigaddset (&set, SIGRTMIN); + { + struct sigaction act = { .sa_handler = dummy_handler, }; + sigaction (SIGRTMIN, &act, NULL); + } +#endif /* Block all these signals */ pthread_sigmask (SIG_BLOCK, &set, NULL); - sigdelset (&set, SIGPIPE); - sigdelset (&set, SIGCHLD); /* Note that FromLocale() can be used before libvlc is initialized */ const char *argv[i_argc + 3]; @@ -150,28 +196,54 @@ int main( int i_argc, const char *ppsz_argv[] ) return 1; // BOOM! argv[argc] = NULL; - libvlc_exception_t ex, dummy; - libvlc_exception_init (&ex); - libvlc_exception_init (&dummy); + vlc_enable_override (); /* Initialize libvlc */ - libvlc_instance_t *vlc = libvlc_new (argc, argv, &ex); + libvlc_instance_t *vlc = libvlc_new (argc, argv); + if (vlc == NULL) + goto out; - if (vlc != NULL) - { - if (libvlc_add_intf (vlc, "signals")) - pthread_sigmask (SIG_UNBLOCK, &set, NULL); -#if !defined (HAVE_MAEMO) - libvlc_add_intf (vlc, "globalhotkeys,none"); + libvlc_set_user_agent (vlc, "VLC media player", "VLC/"PACKAGE_VERSION); + +#if !defined (HAVE_MAEMO) && !defined __APPLE__ + libvlc_add_intf (vlc, "globalhotkeys,none"); #endif - libvlc_add_intf (vlc, NULL); - libvlc_playlist_play (vlc, -1, 0, NULL, &dummy); - libvlc_wait (vlc); - libvlc_release (vlc); - } + if (libvlc_add_intf (vlc, NULL)) + goto out; + + libvlc_playlist_play (vlc, -1, 0, NULL); + + /* Wait for a termination signal */ + pthread_t self = pthread_self (); + libvlc_set_exit_handler (vlc, vlc_kill, &self); + if (signal_ignored (SIGHUP)) /* <- needed to handle nohup properly */ + sigdelset (&set, SIGHUP); + sigdelset (&set, SIGPIPE); + + int signum; + do + sigwait (&set, &signum); + while (signum == SIGCHLD); + + /* Restore default signal behaviour after 3 seconds */ + sigemptyset (&set); + sigaddset (&set, SIGINT); + sigaddset (&set, SIGALRM); + signal (SIGINT, SIG_IGN); + signal (SIGALRM, exit_timeout); + pthread_sigmask (SIG_UNBLOCK, &set, NULL); + alarm (3); + + /* Cleanup */ +out: + if (vlc != NULL) + libvlc_release (vlc); for (int i = 1; i < argc; i++) LocaleFree (argv[i]); - return vlc == NULL || libvlc_exception_raised (&ex); + /* Do not run exit handlers. Some of them are buggy (e.g. KDE IO scheduler) + * and crash. Also some will crash because their library may be already + * unloaded (dlclose()). */ + _exit (0); }