[vlc-devel] commit: Remove vlc_thread_create ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Wed Jan 14 21:21:49 2009 +0200| [f38e00c93262c7fa48af84d2e40210978a9165e2] | committer: Rémi Denis-Courmont 

Remove vlc_thread_create

By the way, its earlier (<= 0.8.6) incarnation were buggy.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f38e00c93262c7fa48af84d2e40210978a9165e2
---

 include/vlc_threads.h |    3 ---
 src/libvlc.h          |    9 ---------
 src/libvlccore.sym    |    1 -
 src/misc/threads.c    |   31 +------------------------------
 4 files changed, 1 insertions(+), 43 deletions(-)

diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index 0232dc7..fb9bb54 100644
--- a/include/vlc_threads.h
+++ b/include/vlc_threads.h
@@ -172,9 +172,6 @@ enum {
 };
 #endif
 
-VLC_EXPORT(void, vlc_thread_ready, (vlc_object_t *obj));
-#define vlc_thread_ready(o) vlc_thread_ready(VLC_OBJECT(o))
-
 /**
  * Save the cancellation state and disable cancellation for the calling thread.
  * This function must be called before entering a piece of code that is not
diff --git a/src/libvlc.h b/src/libvlc.h
index 35801b8..b4c5b9a 100644
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -141,10 +141,6 @@ extern char *psz_vlcpath;
 VLC_EXPORT(char **, module_GetModulesNamesForCapability,
                     ( const char * psz_capability, char ***psz_longname ) );
 
-#ifdef LIBVLC_USE_PTHREAD
-# include <semaphore.h> /* TODO: get rid of vlc_thread_ready and this */
-#endif
-
 /**
  * Private LibVLC data for each object.
  */
@@ -159,11 +155,6 @@ typedef struct vlc_object_internals_t
     /* Thread properties, if any */
     vlc_thread_t    thread_id;
     bool            b_thread;
-#ifdef LIBVLC_USE_PTHREAD
-    sem_t           thread_ready;
-#elif defined (WIN32)
-    HANDLE          thread_ready;
-#endif
 
     /* Objects thread synchronization */
     vlc_mutex_t     lock;
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index e5bb2cf..ab96c32 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -506,7 +506,6 @@ vlc_strtoll
 vlc_submodule_create
 __vlc_thread_create
 __vlc_thread_join
-vlc_thread_ready
 __vlc_thread_set_priority
 vlc_threadvar_create
 vlc_threadvar_delete
diff --git a/src/misc/threads.c b/src/misc/threads.c
index 4d618d4..53d59f7 100644
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -868,8 +868,6 @@ int __vlc_thread_create( vlc_object_t *p_this, const char * psz_file, int i_line
     assert( !p_priv->b_thread );
 
 #if defined( LIBVLC_USE_PTHREAD )
-    if (b_wait)
-        sem_init (&p_priv->thread_ready, 0, 0);
 #ifndef __APPLE__
     if( config_GetInt( p_this, "rt-priority" ) > 0 )
 #endif
@@ -878,9 +876,6 @@ int __vlc_thread_create( vlc_object_t *p_this, const char * psz_file, int i_line
         if( config_GetType( p_this, "rt-offset" ) )
             i_priority += config_GetInt( p_this, "rt-offset" );
     }
-#elif defined (WIN32)
-    if (b_wait)
-        p_priv->thread_ready = CreateEvent (NULL, TRUE, FALSE, NULL);
 #endif
 
     p_priv->b_thread = true;
@@ -889,17 +884,7 @@ int __vlc_thread_create( vlc_object_t *p_this, const char * psz_file, int i_line
     {
         msg_Dbg( p_this, "thread (%s) created at priority %d (%s:%d)",
                  psz_name, i_priority, psz_file, i_line );
-        if( b_wait )
-        {
-            msg_Dbg( p_this, "waiting for thread initialization" );
-#if defined (LIBVLC_USE_PTHREAD)
-            sem_wait (&p_priv->thread_ready);
-            sem_destroy (&p_priv->thread_ready);
-#elif defined (WIN32)
-            WaitForSingleObject (p_priv->thread_ready, INFINITE);
-            CloseHandle (p_priv->thread_ready);
-#endif
-        }
+        assert( !b_wait );
     }
     else
     {
@@ -912,20 +897,6 @@ int __vlc_thread_create( vlc_object_t *p_this, const char * psz_file, int i_line
     return i_ret;
 }
 
-#undef vlc_thread_ready
-void vlc_thread_ready (vlc_object_t *obj)
-{
-    vlc_object_internals_t *priv = vlc_internals (obj);
-
-    assert (priv->b_thread);
-#if defined (LIBVLC_USE_PTHREAD)
-    assert (pthread_equal (pthread_self (), priv->thread_id));
-    sem_post (&priv->thread_ready);
-#elif defined (WIN32)
-    SetEvent (priv->thread_ready);
-#endif
-}
-
 /*****************************************************************************
  * vlc_thread_set_priority: set the priority of the current thread when we
  * couldn't set it in vlc_thread_create (for instance for the main thread)