X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bin%2Fvlc.c;h=6969a1b5b440468c0a094e090b370eaf198f7b93;hb=c9a3688176a1571ab5cd9b77b6fddc3e1a110b62;hp=2ed8c6b7219c0901b67e59f79dfc4905bd052baf;hpb=82a5a07b283630b80ef6fcd92f867fb43f8cc042;p=vlc diff --git a/bin/vlc.c b/bin/vlc.c index 2ed8c6b721..6969a1b5b4 100644 --- a/bin/vlc.c +++ b/bin/vlc.c @@ -35,10 +35,8 @@ #include #include #include -#include #include #include -#include #ifdef __APPLE__ #include @@ -69,11 +67,21 @@ static bool signal_ignored (int signum) static void vlc_kill (void *data) { +#ifndef __OS2__ pthread_t *ps = data; pthread_kill (*ps, SIGTERM); +#else + // send a signal to the main thread + kill (getpid(), SIGTERM); +#endif } +static void exit_timeout (int signum) +{ + (void) signum; + signal (SIGINT, SIG_DFL); +} /***************************************************************************** * main: parse command line, start interface and spawn threads. @@ -81,32 +89,29 @@ static void vlc_kill (void *data) int main( int i_argc, const char *ppsz_argv[] ) { /* 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. + * if it is blocked in all thread. * 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. */ + /* Restore SIGCHLD in case our parent process ignores it. */ signal (SIGCHLD, SIG_DFL); -#ifdef HAVE_SETENV -# ifndef NDEBUG +#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 +#endif - /* Make Xlib hide visuals with an alphachannel. Ensure that Qt4 will not - * use the alpha channel for the embedded video window. */ - setenv ("XLIB_SKIP_ARGB_VISUALS", "1", 1); +#ifdef TOP_BUILDDIR + setenv ("VLC_PLUGIN_PATH", TOP_BUILDDIR"/modules", 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 if (geteuid () == 0) @@ -121,28 +126,26 @@ int main( int i_argc, const char *ppsz_argv[] ) setlocale (LC_ALL, ""); -#ifndef __APPLE__ - /* This clutters OSX GUI error logs */ - fprintf( stderr, "VLC media player %s (revision %s)\n", - libvlc_get_version(), libvlc_get_changeset() ); -#endif + if (isatty (STDERR_FILENO)) + /* This message clutters error logs. It is printed only on a TTY. + * Fortunately, LibVLC prints version info with -vv anyway. */ + fprintf (stderr, "VLC media player %s (revision %s)\n", + libvlc_get_version(), libvlc_get_changeset()); sigset_t set; sigemptyset (&set); - /* Synchronously intercepted POSIX signals. + /* VLC uses sigwait() to dequeue interesting signals. + * For this to work, those signals must be blocked in all threads, + * including the thread calling sigwait() (see the man page for details). * - * In a threaded program such as VLC, the only sane way to handle signals - * 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. - * 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. + * There are two advantages to sigwait() over traditional signal handlers: + * - delivery is synchronous: no need to worry about async-safety, + * - EINTR is not generated: other threads need not handle that error. + * That being said, some LibVLC programs do not use sigwait(). Therefore + * EINTR must still be handled cleanly, notably from poll() calls. * - * Signal that request a clean shutdown, and force an unclean shutdown + * Signals 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. */ sigaddset (&set, SIGINT); @@ -150,13 +153,21 @@ int main( int i_argc, const char *ppsz_argv[] ) 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 can happen and would crash the process. On modern systems, + * the MSG_NOSIGNAL flag protects socket write operations against SIGPIPE. + * But we still need to block SIGPIPE when: + * - writing to pipes, + * - using write() instead of send() for code not specific to sockets. + * LibVLC code assumes that SIGPIPE is blocked. Other LibVLC applications + * shall block it (or handle it somehow) too. */ sigaddset (&set, SIGPIPE); + + /* SIGCHLD must be dequeued to clean up zombie child processes. + * Furthermore the handler must not be set to SIG_IGN (see above). + * We cannot pragmatically handle EINTR, short reads and short writes + * in every code paths (including underlying libraries). So we just + * block SIGCHLD in all threads, and dequeue it below. */ sigaddset (&set, SIGCHLD); #ifdef HAVE_MAEMO @@ -167,17 +178,14 @@ int main( int i_argc, const char *ppsz_argv[] ) } #endif /* Block all these signals */ - pthread_sigmask (SIG_BLOCK, &set, NULL); + pthread_sigmask (SIG_SETMASK, &set, NULL); /* Note that FromLocale() can be used before libvlc is initialized */ - const char *argv[i_argc + 4]; + const char *argv[i_argc + 3]; int argc = 0; argv[argc++] = "--no-ignore-config"; - argv[argc++] = "--user-agent=\"VLC media player\""; -#ifdef TOP_BUILDDIR - argv[argc++] = FromLocale ("--plugin-path="TOP_BUILDDIR"/modules"); -#endif + argv[argc++] = "--media-library"; #ifdef TOP_SRCDIR argv[argc++] = FromLocale ("--data-path="TOP_SRCDIR"/share"); #endif @@ -203,7 +211,9 @@ int main( int i_argc, const char *ppsz_argv[] ) if (vlc == NULL) goto out; -#if !defined (HAVE_MAEMO) + libvlc_set_user_agent (vlc, "VLC media player", "VLC/"PACKAGE_VERSION); + +#if !defined (HAVE_MAEMO) && !defined __APPLE__ && !defined (__OS2__) libvlc_add_intf (vlc, "globalhotkeys,none"); #endif if (libvlc_add_intf (vlc, NULL)) @@ -215,14 +225,28 @@ int main( int i_argc, const char *ppsz_argv[] ) pthread_t self = pthread_self (); libvlc_set_exit_handler (vlc, vlc_kill, &self); - if (signal_ignored (SIGHUP)) /* <- needed to handle nohup properly */ + /* Qt4 insists on catching SIGCHLD via signal handler. To work around that, + * unblock it after all our child threads are created. */ + sigdelset (&set, SIGCHLD); + pthread_sigmask (SIG_SETMASK, &set, NULL); + + /* Do not dequeue SIGHUP if it is ignored (nohup) */ + if (signal_ignored (SIGHUP)) sigdelset (&set, SIGHUP); + /* Ignore SIGPIPE */ sigdelset (&set, SIGPIPE); int signum; - do - sigwait (&set, &signum); - while (signum == SIGCHLD); + sigwait (&set, &signum); + + /* 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: @@ -231,15 +255,5 @@ out: for (int i = 2; i < argc; i++) LocaleFree (argv[i]); -#ifdef RTLD_NOLOAD - /* Avoid crash in KIO scheduler cleanup. */ - /* This is ugly, but we get way too many crash reports due to this. */ - if (dlopen ("libkio.so.5", RTLD_LAZY|RTLD_LOCAL|RTLD_NOLOAD) != NULL) - { - fprintf (stderr, "KIO present. Unclean shutdown!\n" - " (see http://bugs.kde.org/show_bug.cgi?id=234484 for details)\n"); - _exit (0); - } -#endif return 0; }