Changeset 9565a093f9fce8aa15e54990e9fd9d3086b41b08

Timestamp:

05/29/08 23:47:17 (3 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1212097637 +0200

git-parent:

[003c1216d89735a273e075c66a3af0f7655a54ae]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1212097637 +0200

Message:

signals: Workaround the fact that sigwait() isn't a pthread cancellation point on Mac OS X.

Files:

• modules/control/signals.c (modified) (2 diffs)

modules/control/signals.c

@@ -79 +79 @@
-
-    pthread_cancel (p_sys->thread);
+#ifdef __APPLE__
+   /* In Mac OS X up to 10.5 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 (p_sys->thread, SIGQUIT);
+# endif
-    pthread_join (p_sys->thread, NULL);
-    free (p_sys);
@@ -102 +108 @@
-
-        sigwait (&set, &signum);
+
+#ifdef __APPLE__
+        /* In Mac OS X up to 10.5 sigwait (among others) is not a pthread
+         * cancellation point */
+        pthread_testcancel();
+#endif
-
-        vlc_object_lock (obj);