Changeset 0054378d6e90f6796759fca438a5ff209e19fbf8

Timestamp:

01/03/07 22:38:58 (2 years ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1172785138 +0000

git-parent:

[7cdfb7ee8b66706492e2f781ded8deeef0566969]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1172785138 +0000

Message:

Fix a hang when quitting vlc on Mac OS X. This hang is due to the signal thread that isn't cancelled properly, because Mac OS X's sigwait is not a pthread cancellation point as it ought to be according to POSIX.1.

Files:

• src/vlc.c (modified) (2 diffs)

src/vlc.c

@@ -178 +178 @@
-#if !defined(WIN32) && !defined(UNDER_CE)
-    pthread_cancel (sigth);
+# ifdef __APPLE__
+    /* In Mac OS X up to 10.4.8 sigwait (among others) is not a pthread
+     * cancellation point, so we throw a dummy quit signal to end
+     * sigwait() in the sigth thread */
+    pthread_kill (sigth, SIGQUIT);
+# endif
-    pthread_join (sigth, NULL);
-#endif
@@ -201 +207 @@
-        int i_signal, state;
-        (void)sigwait (set, &i_signal);
+
+#ifdef __APPLE__
+        /* In Mac OS X up to 10.4.8 sigwait (among others) is not a pthread
+         * cancellation point */
+        pthread_testcancel();
+#endif
-
-        /* Once a signal has been trapped, the termination sequence will be