Changeset c13d67b82c674fffe5d65656aff7484c227a74a1

Timestamp:

03/01/07 21:09:41 (1 year ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1172779781 +0000

git-parent:

[1d58919125812d569c23bde687e42fca86858e33]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1172779781 +0000

Message:

Fix race condition and simplify SigHandler?
Missing piece pointed out by Pierre d'H.

Files:

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

src/vlc.c

@@ -40 +40 @@
-extern void __wgetmainargs(int *argc, wchar_t ***wargv, wchar_t ***wenviron,
-                           int expand_wildcards, int *startupinfo);
+static inline void Kill(void) { }
-#else
-
@@ -45 +46 @@
-# include <time.h>
-# include <pthread.h>
-
-
-
-
-
-
-
-
+
+
-static void *SigHandler (void *set);
-#endif
@@ -176 +171 @@
-    VLC_CleanUp( 0 );
-
+    Kill ();
+
-    /* Destroy the libvlc structure */
-    VLC_Destroy( 0 );
@@ -219 +216 @@
-
-            /* Acknowledge the signal received */
-
-
-
-
-
-
-
+
-        }
-        else if( time( NULL ) > abort_time + 2 )
@@ -238 +229 @@
-    /* Never reached */
-}
+
+
+static void KillOnce (void)
+{
+    VLC_Die (0);
+}
+
+
+static void Kill (void)
+{
+    static pthread_once_t once = PTHREAD_ONCE_INIT;
+    pthread_once (&once, KillOnce);
+}
+
-#endif
-