X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bin%2Fvlc.c;h=46c7d7d6d623b547b0e45a3225fc9692cbbf8943;hb=02a1c23e33c01f424b5d2c6de498baaeca2252a3;hp=de9c88be60be734c77c3c0c36e78619b780569bc;hpb=3f71509f445580a4b5ec08f16bc03aa12201cfba;p=vlc diff --git a/bin/vlc.c b/bin/vlc.c index de9c88be60..46c7d7d6d6 100644 --- a/bin/vlc.c +++ b/bin/vlc.c @@ -33,30 +33,22 @@ #include #include #include +#include #include #include -#include -#include +#ifdef HAVE_PTHREAD_H +# include +#endif #include -#include -#ifdef __APPLE__ -#include +#ifdef __OS2__ +# define pthread_t int +# define pthread_self() _gettid() #endif -/* Explicit HACK */ -extern void LocaleFree (const char *); -extern char *FromLocale (const char *); extern void vlc_enable_override (void); -#ifdef HAVE_MAEMO -static void dummy_handler (int signum) -{ - (void) signum; -} -#endif - static bool signal_ignored (int signum) { struct sigaction sa; @@ -69,9 +61,14 @@ 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) @@ -86,28 +83,30 @@ static void exit_timeout (int signum) 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 + +#ifdef TOP_BUILDDIR + setenv ("VLC_PLUGIN_PATH", TOP_BUILDDIR"/modules", 1); + setenv ("VLC_DATA_PATH", TOP_SRCDIR"/share", 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) @@ -122,28 +121,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); @@ -151,50 +148,42 @@ 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 - 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); + 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 + 2]; int argc = 0; argv[argc++] = "--no-ignore-config"; argv[argc++] = "--media-library"; -#ifdef TOP_BUILDDIR - argv[argc++] = FromLocale ("--plugin-path="TOP_BUILDDIR"/modules"); -#endif -#ifdef TOP_SRCDIR - argv[argc++] = FromLocale ("--data-path="TOP_SRCDIR"/share"); -#endif - - int i = 1; + ppsz_argv++; i_argc--; /* skip executable path */ #ifdef __APPLE__ /* When VLC.app is run by double clicking in Mac OS X, the 2nd arg * is the PSN - process serial number (a unique PID-ish thingie) * still ok for real Darwin & when run from command line * for example -psn_0_9306113 */ - if(i_argc >= 2 && !strncmp( ppsz_argv[1] , "-psn" , 4 )) - i = 2; + if (i_argc >= 1 && !strncmp (*ppsz_argv, "-psn" , 4)) + ppsz_argv++, i_argc--; #endif - for (; i < i_argc; i++) - if ((argv[argc++] = FromLocale (ppsz_argv[i])) == NULL) - return 1; // BOOM! + memcpy (argv + argc, ppsz_argv, i_argc * sizeof (*argv)); + argc += i_argc; argv[argc] = NULL; vlc_enable_override (); @@ -206,8 +195,12 @@ int main( int i_argc, const char *ppsz_argv[] ) libvlc_set_user_agent (vlc, "VLC media player", "VLC/"PACKAGE_VERSION); -#if !defined (HAVE_MAEMO) && !defined __APPLE__ +#if !defined (HAVE_MAEMO) && !defined __APPLE__ && !defined (__OS2__) libvlc_add_intf (vlc, "globalhotkeys,none"); +#endif +#ifdef HAVE_DBUS + libvlc_add_intf (vlc, "dbus,none"); + libvlc_add_intf (vlc, "inhibit,none"); #endif if (libvlc_add_intf (vlc, NULL)) goto out; @@ -218,14 +211,19 @@ 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); @@ -240,11 +238,6 @@ int main( int i_argc, const char *ppsz_argv[] ) out: if (vlc != NULL) libvlc_release (vlc); - for (int i = 1; i < argc; i++) - LocaleFree (argv[i]); - /* 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); + return 0; }