#include <stdbool.h>
#include <locale.h>
#include <signal.h>
-#include <time.h>
#include <pthread.h>
#include <unistd.h>
-#include <dlfcn.h>
#ifdef __APPLE__
#include <string.h>
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[] )
{
/* 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);
+#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)
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 print it only on a TTY.
+ * Forunately, LibVLC prints version infos with -vv anyhow. */
+ 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);
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
}
#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
if (vlc == NULL)
goto out;
+ libvlc_set_user_agent (vlc, "VLC media player", "VLC/"PACKAGE_VERSION);
+
#if !defined (HAVE_MAEMO) && !defined __APPLE__
libvlc_add_intf (vlc, "globalhotkeys,none");
#endif
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:
if (vlc != NULL)
libvlc_release (vlc);
- for (int i = 2; i < argc; i++)
+ for (int i = 1; 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;
}
projects / vlc / blobdiff