X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bin%2Fvlc.c;h=3f8cf3c97409abb78dbbaa404a3cc85474f4c5f1;hb=deb38e43ecf62699d62e2dc80fd4c4aea4ac0d32;hp=a77142419460a97040115ff2be5217960f9dc3d6;hpb=94763831fb59701a30f7e55c8ce9258ddbeeff18;p=vlc diff --git a/bin/vlc.c b/bin/vlc.c index a771424194..3f8cf3c974 100644 --- a/bin/vlc.c +++ b/bin/vlc.c @@ -32,30 +32,82 @@ #include #include #include -#include - -#ifdef __APPLE__ +#include #include +#include +#include +#ifdef HAVE_PTHREAD_H +# include #endif +#include + +#ifdef __OS2__ +# include +# define pthread_t int +# define pthread_self() _gettid() + +static char *FromSystem(const void *str) +{ + iconv_t handle = iconv_open ("UTF-8", ""); + if (handle == (iconv_t)(-1)) + return NULL; + + size_t str_len = strlen (str); + char *out = NULL; + for (unsigned mul = 4; mul < 8; mul++) + { + size_t in_size = str_len; + const char *in = str; + size_t out_max = mul * str_len; + char *tmp = out = malloc (1 + out_max); + if (!out) + break; + + if (iconv (handle, &in, &in_size, &tmp, &out_max) != (size_t)(-1)) { + *tmp = '\0'; + break; + } + free(out); + out = NULL; + + if (errno != E2BIG) + break; + } + iconv_close(handle); + return out; +} +#endif -/* Explicit HACK */ -extern void LocaleFree (const char *); -extern char *FromLocale (const char *); extern void vlc_enable_override (void); -#include -#include -#include -#include -#include +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; +} -#ifdef HAVE_MAEMO -static void dummy_handler (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); } -#endif /***************************************************************************** * main: parse command line, start interface and spawn threads. @@ -63,32 +115,30 @@ static void dummy_handler (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 - /* 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); + 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) @@ -103,114 +153,136 @@ 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()); - /* Synchronously intercepted POSIX signals. + sigset_t set; + + sigemptyset (&set); + /* 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. - * Note that we set the signals after the vlc_create call. */ - static const int sigs[] = { - SIGINT, SIGHUP, SIGQUIT, 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. + * We have to handle SIGTERM cleanly because of daemon mode. */ + sigaddset (&set, SIGINT); + sigaddset (&set, SIGHUP); + sigaddset (&set, SIGQUIT); + sigaddset (&set, SIGTERM); + + /* 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. */ - SIGPIPE, SIGCHLD - }; + sigaddset (&set, SIGPIPE); - sigset_t set; - sigemptyset (&set); - for (unsigned i = 0; i < sizeof (sigs) / sizeof (sigs[0]); i++) - sigaddset (&set, sigs[i]); -#ifdef HAVE_MAEMO - sigaddset (&set, SIGRTMIN); - { - struct sigaction act = { .sa_handler = dummy_handler, }; - sigaction (SIGRTMIN, &act, NULL); - } -#endif + /* 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); /* Block all these signals */ - pthread_sigmask (SIG_BLOCK, &set, NULL); - sigdelset (&set, SIGPIPE); - sigdelset (&set, SIGCHLD); + pthread_t self = pthread_self (); + pthread_sigmask (SIG_SETMASK, &set, NULL); - /* Note that FromLocale() can be used before libvlc is initialized */ - const char *argv[i_argc + 3]; + const char *argv[i_argc + 2]; int argc = 0; argv[argc++] = "--no-ignore-config"; -#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; + argv[argc++] = "--media-library"; + 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 +#ifdef __OS2__ + for (int i = 0; i < i_argc; i++) + if ((argv[argc++] = FromSystem (ppsz_argv[i])) == NULL) + { + fprintf (stderr, "Converting '%s' to UTF-8 failed.\n", + ppsz_argv[i]); + return 1; + } +#else + memcpy (argv + argc, ppsz_argv, i_argc * sizeof (*argv)); + argc += i_argc; #endif - for (; i < i_argc; i++) - if ((argv[argc++] = FromLocale (ppsz_argv[i])) == NULL) - return 1; // BOOM! argv[argc] = NULL; vlc_enable_override (); /* Initialize libvlc */ libvlc_instance_t *vlc = libvlc_new (argc, argv); + if (vlc == NULL) + return 1; - 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"); + int ret = 1; + libvlc_set_exit_handler (vlc, vlc_kill, &self); + libvlc_set_app_id (vlc, "org.VideoLAN.VLC", PACKAGE_VERSION, PACKAGE_NAME); + libvlc_set_user_agent (vlc, "VLC media player", "VLC/"PACKAGE_VERSION); + + libvlc_add_intf (vlc, "hotkeys,none"); +#if !defined __APPLE__ && !defined (__OS2__) + libvlc_add_intf (vlc, "globalhotkeys,none"); #endif - if (libvlc_add_intf (vlc, NULL) == 0) - { - libvlc_playlist_play (vlc, -1, 0, NULL); - libvlc_wait (vlc); - } - libvlc_release (vlc); - } +#ifdef HAVE_DBUS + libvlc_add_intf (vlc, "dbus,none"); +#endif + if (libvlc_add_intf (vlc, NULL)) + goto out; - for (int i = 1; i < argc; i++) - LocaleFree (argv[i]); + libvlc_playlist_play (vlc, -1, 0, NULL); -#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); - } + /* 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; + 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); + + ret = 0; + /* Cleanup */ +out: + libvlc_release (vlc); +#ifdef __OS2__ + for (int i = 2; i < argc; i++) + free (argv[i]); #endif - return 0; + return ret; }