Commit f38e00c9 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove vlc_thread_create

By the way, its earlier (<= 0.8.6) incarnation were buggy.
parent db37d62c
...@@ -172,9 +172,6 @@ enum { ...@@ -172,9 +172,6 @@ enum {
}; };
#endif #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. * 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 * This function must be called before entering a piece of code that is not
......
...@@ -141,10 +141,6 @@ extern char *psz_vlcpath; ...@@ -141,10 +141,6 @@ extern char *psz_vlcpath;
VLC_EXPORT(char **, module_GetModulesNamesForCapability, VLC_EXPORT(char **, module_GetModulesNamesForCapability,
( const char * psz_capability, char ***psz_longname ) ); ( 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. * Private LibVLC data for each object.
*/ */
...@@ -159,11 +155,6 @@ typedef struct vlc_object_internals_t ...@@ -159,11 +155,6 @@ typedef struct vlc_object_internals_t
/* Thread properties, if any */ /* Thread properties, if any */
vlc_thread_t thread_id; vlc_thread_t thread_id;
bool b_thread; bool b_thread;
#ifdef LIBVLC_USE_PTHREAD
sem_t thread_ready;
#elif defined (WIN32)
HANDLE thread_ready;
#endif
/* Objects thread synchronization */ /* Objects thread synchronization */
vlc_mutex_t lock; vlc_mutex_t lock;
......
...@@ -506,7 +506,6 @@ vlc_strtoll ...@@ -506,7 +506,6 @@ vlc_strtoll
vlc_submodule_create vlc_submodule_create
__vlc_thread_create __vlc_thread_create
__vlc_thread_join __vlc_thread_join
vlc_thread_ready
__vlc_thread_set_priority __vlc_thread_set_priority
vlc_threadvar_create vlc_threadvar_create
vlc_threadvar_delete vlc_threadvar_delete
......
...@@ -868,8 +868,6 @@ int __vlc_thread_create( vlc_object_t *p_this, const char * psz_file, int i_line ...@@ -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 ); assert( !p_priv->b_thread );
#if defined( LIBVLC_USE_PTHREAD ) #if defined( LIBVLC_USE_PTHREAD )
if (b_wait)
sem_init (&p_priv->thread_ready, 0, 0);
#ifndef __APPLE__ #ifndef __APPLE__
if( config_GetInt( p_this, "rt-priority" ) > 0 ) if( config_GetInt( p_this, "rt-priority" ) > 0 )
#endif #endif
...@@ -878,9 +876,6 @@ int __vlc_thread_create( vlc_object_t *p_this, const char * psz_file, int i_line ...@@ -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" ) ) if( config_GetType( p_this, "rt-offset" ) )
i_priority += config_GetInt( 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 #endif
p_priv->b_thread = true; 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 ...@@ -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)", msg_Dbg( p_this, "thread (%s) created at priority %d (%s:%d)",
psz_name, i_priority, psz_file, i_line ); psz_name, i_priority, psz_file, i_line );
if( b_wait ) assert( !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
}
} }
else else
{ {
...@@ -912,20 +897,6 @@ int __vlc_thread_create( vlc_object_t *p_this, const char * psz_file, int i_line ...@@ -912,20 +897,6 @@ int __vlc_thread_create( vlc_object_t *p_this, const char * psz_file, int i_line
return i_ret; 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 * 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) * couldn't set it in vlc_thread_create (for instance for the main thread)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment