* threads.c : threads implementation for the VideoLAN client
*****************************************************************************
* Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
- * $Id: threads.c,v 1.12 2002/08/08 00:35:11 sam Exp $
+ * $Id: threads.c,v 1.41 2003/08/28 17:19:41 sam Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#include <vlc/vlc.h>
+#include <stdlib.h>
+
#define VLC_THREADS_UNINITIALIZED 0
#define VLC_THREADS_PENDING 1
#define VLC_THREADS_ERROR 2
#define VLC_THREADS_READY 3
/*****************************************************************************
- * Prototype for GPROF wrapper
- *****************************************************************************/
-#ifdef GPROF
-/* Wrapper function for profiling */
-static void * vlc_thread_wrapper ( void *p_wrapper );
-
-# ifdef WIN32
-
-# define ITIMER_REAL 1
-# define ITIMER_PROF 2
-
-struct itimerval
-{
- struct timeval it_value;
- struct timeval it_interval;
-};
-
-int setitimer(int kind, const struct itimerval* itnew, struct itimerval* itold);
-# endif /* WIN32 */
-
-typedef struct wrapper_t
-{
- /* Data lock access */
- vlc_mutex_t lock;
- vlc_cond_t wait;
-
- /* Data used to spawn the real thread */
- vlc_thread_func_t func;
- void *p_data;
-
- /* Profiling timer passed to the thread */
- struct itimerval itimer;
-
-} wrapper_t;
-
-#endif /* GPROF */
-
-/*****************************************************************************
- * Global mutexes for lazy initialization of the threads system
+ * Global mutex for lazy initialization of the threads system
*****************************************************************************/
static volatile int i_initializations = 0;
#if defined( PTH_INIT_IN_PTH_H )
- /* Unimplemented */
#elif defined( ST_INIT_IN_ST_H )
- /* Unimplemented */
+#elif defined( UNDER_CE )
#elif defined( WIN32 )
- /* Unimplemented */
#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
static pthread_mutex_t once_mutex = PTHREAD_MUTEX_INITIALIZER;
#elif defined( HAVE_CTHREADS_H )
- /* Unimplemented */
#elif defined( HAVE_KERNEL_SCHEDULER_H )
- /* Unimplemented */
#endif
+/*****************************************************************************
+ * Global variable for named mutexes
+ *****************************************************************************/
+typedef struct vlc_namedmutex_t vlc_namedmutex_t;
+struct vlc_namedmutex_t
+{
+ vlc_mutex_t lock;
+
+ char *psz_name;
+ int i_usage;
+ vlc_namedmutex_t *p_next;
+};
+
/*****************************************************************************
* vlc_threads_init: initialize threads system
*****************************************************************************
int __vlc_threads_init( vlc_object_t *p_this )
{
static volatile int i_status = VLC_THREADS_UNINITIALIZED;
- int i_ret = 0;
+ libvlc_t *p_libvlc = (libvlc_t *)p_this;
+ int i_ret = VLC_SUCCESS;
+
+ /* If we have lazy mutex initialization, use it. Otherwise, we just
+ * hope nothing wrong happens. */
#if defined( PTH_INIT_IN_PTH_H )
- /* Unimplemented */
#elif defined( ST_INIT_IN_ST_H )
- /* Unimplemented */
+#elif defined( UNDER_CE )
#elif defined( WIN32 )
- /* Unimplemented */
+ HINSTANCE hInstLib;
#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
pthread_mutex_lock( &once_mutex );
#elif defined( HAVE_CTHREADS_H )
- /* Unimplemented */
#elif defined( HAVE_KERNEL_SCHEDULER_H )
- /* Unimplemented */
#endif
if( i_status == VLC_THREADS_UNINITIALIZED )
{
i_status = VLC_THREADS_PENDING;
+ /* We should be safe now. Do all the initialization stuff we want. */
+ p_libvlc->b_ready = VLC_FALSE;
+
#if defined( PTH_INIT_IN_PTH_H )
- i_ret = pth_init();
+ i_ret = ( pth_init() == FALSE );
+
#elif defined( ST_INIT_IN_ST_H )
i_ret = st_init();
+
+#elif defined( UNDER_CE )
+ /* Nothing to initialize */
+
#elif defined( WIN32 )
- /* Unimplemented */
+ /* Dynamically get the address of SignalObjectAndWait */
+ if( GetVersion() < 0x80000000 )
+ {
+ /* We are running on NT/2K/XP, we can use SignalObjectAndWait */
+ hInstLib = LoadLibrary( "kernel32" );
+ if( hInstLib )
+ {
+ p_libvlc->SignalObjectAndWait =
+ (SIGNALOBJECTANDWAIT)GetProcAddress( hInstLib,
+ "SignalObjectAndWait" );
+ }
+ }
+ else
+ {
+ p_libvlc->SignalObjectAndWait = NULL;
+ }
+
+ p_libvlc->b_fast_mutex = 0;
+ p_libvlc->i_win9x_cv = 0;
+
#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
- /* Unimplemented */
#elif defined( HAVE_CTHREADS_H )
- /* Unimplemented */
#elif defined( HAVE_KERNEL_SCHEDULER_H )
- /* Unimplemented */
#endif
+ vlc_object_create( p_libvlc, VLC_OBJECT_ROOT );
+
if( i_ret )
{
i_status = VLC_THREADS_ERROR;
}
else
{
- vlc_mutex_init( p_this, p_this->p_vlc->p_global_lock );
+ i_initializations++;
i_status = VLC_THREADS_READY;
}
}
else
{
- i_ret = ( i_status == VLC_THREADS_READY );
+ /* Just increment the initialization count */
+ i_initializations++;
}
- i_initializations++;
-
+ /* If we have lazy mutex initialization support, unlock the mutex;
+ * otherwize, do a naive wait loop. */
#if defined( PTH_INIT_IN_PTH_H )
- /* Unimplemented */
+ while( i_status == VLC_THREADS_PENDING ) msleep( THREAD_SLEEP );
#elif defined( ST_INIT_IN_ST_H )
- /* Unimplemented */
+ while( i_status == VLC_THREADS_PENDING ) msleep( THREAD_SLEEP );
+#elif defined( UNDER_CE )
+ while( i_status == VLC_THREADS_PENDING ) msleep( THREAD_SLEEP );
#elif defined( WIN32 )
- /* Unimplemented */
+ while( i_status == VLC_THREADS_PENDING ) msleep( THREAD_SLEEP );
#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
pthread_mutex_unlock( &once_mutex );
- return i_ret;
#elif defined( HAVE_CTHREADS_H )
- /* Unimplemented */
+ while( i_status == VLC_THREADS_PENDING ) msleep( THREAD_SLEEP );
#elif defined( HAVE_KERNEL_SCHEDULER_H )
- /* Unimplemented */
+ while( i_status == VLC_THREADS_PENDING ) msleep( THREAD_SLEEP );
#endif
- /* Wait until the other thread has initialized the thread library */
- while( i_status == VLC_THREADS_PENDING )
+ if( i_status != VLC_THREADS_READY )
{
- msleep( THREAD_SLEEP );
+ return VLC_ETHREAD;
}
- return i_status == VLC_THREADS_READY;
+ return i_ret;
}
/*****************************************************************************
i_initializations--;
if( i_initializations == 0 )
{
- return pth_kill();
+ return ( pth_kill() == FALSE );
}
- return 0;
#elif defined( ST_INIT_IN_ST_H )
i_initializations--;
- return 0;
+
+#elif defined( UNDER_CE )
+ i_initializations--;
#elif defined( WIN32 )
i_initializations--;
- return 0;
#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
pthread_mutex_lock( &once_mutex );
i_initializations--;
pthread_mutex_unlock( &once_mutex );
- return 0;
#elif defined( HAVE_CTHREADS_H )
i_initializations--;
- return 0;
#elif defined( HAVE_KERNEL_SCHEDULER_H )
i_initializations--;
- return 0;
#endif
+ return VLC_SUCCESS;
}
/*****************************************************************************
*****************************************************************************/
int __vlc_mutex_init( vlc_object_t *p_this, vlc_mutex_t *p_mutex )
{
+ p_mutex->p_this = p_this;
+
#if defined( PTH_INIT_IN_PTH_H )
- return pth_mutex_init( p_mutex );
+ return ( pth_mutex_init( &p_mutex->mutex ) == FALSE );
#elif defined( ST_INIT_IN_ST_H )
- *p_mutex = st_mutex_new();
- return ( *p_mutex == NULL ) ? errno : 0;
+ p_mutex->mutex = st_mutex_new();
+ return ( p_mutex->mutex == NULL ) ? errno : 0;
+
+#elif defined( UNDER_CE )
+ InitializeCriticalSection( &p_mutex->csection );
+ return 0;
#elif defined( WIN32 )
/* We use mutexes on WinNT/2K/XP because we can use the SignalObjectAndWait
* function and have a 100% correct vlc_cond_wait() implementation.
* As this function is not available on Win9x, we can use the faster
* CriticalSections */
- if( p_this->p_vlc->SignalObjectAndWait && !p_this->p_vlc->b_fast_mutex )
+ if( p_this->p_libvlc->SignalObjectAndWait &&
+ !p_this->p_libvlc->b_fast_mutex )
{
/* We are running on NT/2K/XP, we can use SignalObjectAndWait */
p_mutex->mutex = CreateMutex( 0, FALSE, 0 );
- return ( p_mutex->mutex ? 0 : 1 );
+ return ( p_mutex->mutex != NULL ? 0 : 1 );
}
else
{
#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
# if defined(DEBUG) && defined(SYS_LINUX)
- /* Create error-checking mutex to detect threads problems more easily. */
- pthread_mutexattr_t attr;
- int i_result;
-
- pthread_mutexattr_init( &attr );
- pthread_mutexattr_setkind_np( &attr, PTHREAD_MUTEX_ERRORCHECK_NP );
- i_result = pthread_mutex_init( p_mutex, &attr );
- pthread_mutexattr_destroy( &attr );
- return( i_result );
+ {
+ /* Create error-checking mutex to detect problems more easily. */
+ pthread_mutexattr_t attr;
+ int i_result;
+
+ pthread_mutexattr_init( &attr );
+ pthread_mutexattr_setkind_np( &attr, PTHREAD_MUTEX_ERRORCHECK_NP );
+ i_result = pthread_mutex_init( &p_mutex->mutex, &attr );
+ pthread_mutexattr_destroy( &attr );
+ return( i_result );
+ }
# endif
- return pthread_mutex_init( p_mutex, NULL );
+ return pthread_mutex_init( &p_mutex->mutex, NULL );
#elif defined( HAVE_CTHREADS_H )
mutex_init( p_mutex );
return 0;
#elif defined( HAVE_KERNEL_SCHEDULER_H )
-
/* check the arguments and whether it's already been initialized */
if( p_mutex == NULL )
{
*****************************************************************************/
int __vlc_mutex_destroy( char * psz_file, int i_line, vlc_mutex_t *p_mutex )
{
+ int i_result;
+ /* In case of error : */
+ int i_thread = -1;
+ const char * psz_error = "";
+
#if defined( PTH_INIT_IN_PTH_H )
return 0;
#elif defined( ST_INIT_IN_ST_H )
- return st_mutex_destroy( *p_mutex );
+ i_result = st_mutex_destroy( p_mutex->mutex );
+
+#elif defined( UNDER_CE )
+ DeleteCriticalSection( &p_mutex->csection );
+ return 0;
#elif defined( WIN32 )
if( p_mutex->mutex )
}
return 0;
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
- int i_return = pthread_mutex_destroy( p_mutex );
- if( i_return )
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+ i_result = pthread_mutex_destroy( &p_mutex->mutex );
+ if ( i_result )
{
-#if 0
- intf_ErrMsg( "thread %d error: mutex_destroy failed at %s:%d (%s)",
- pthread_self(), psz_file, i_line, strerror(i_return) );
-#endif
+ i_thread = (int)pthread_self();
+ psz_error = strerror(i_result);
}
- return i_return;
#elif defined( HAVE_CTHREADS_H )
return 0;
p_mutex->init = 0;
return B_OK;
+#endif
-#endif
+ if( i_result )
+ {
+ msg_Err( p_mutex->p_this,
+ "thread %d: mutex_destroy failed at %s:%d (%d:%s)",
+ i_thread, psz_file, i_line, i_result, psz_error );
+ }
+ return i_result;
}
/*****************************************************************************
*****************************************************************************/
int __vlc_cond_init( vlc_object_t *p_this, vlc_cond_t *p_condvar )
{
+ p_condvar->p_this = p_this;
+
#if defined( PTH_INIT_IN_PTH_H )
- return pth_cond_init( p_condvar );
+ return ( pth_cond_init( &p_condvar->cond ) == FALSE );
#elif defined( ST_INIT_IN_ST_H )
- *p_condvar = st_cond_new();
- return ( *p_condvar == NULL ) ? errno : 0;
+ p_condvar->cond = st_cond_new();
+ return ( p_condvar->cond == NULL ) ? errno : 0;
+
+#elif defined( UNDER_CE )
+ /* Initialize counter */
+ p_condvar->i_waiting_threads = 0;
+
+ /* Create an auto-reset event. */
+ p_condvar->event = CreateEvent( NULL, /* no security */
+ FALSE, /* auto-reset event */
+ FALSE, /* start non-signaled */
+ NULL ); /* unnamed */
+ return !p_condvar->event;
#elif defined( WIN32 )
/* Initialize counter */
p_condvar->i_waiting_threads = 0;
/* Misc init */
- p_condvar->i_win9x_cv = p_this->p_vlc->i_win9x_cv;
- p_condvar->SignalObjectAndWait = p_this->p_vlc->SignalObjectAndWait;
+ p_condvar->i_win9x_cv = p_this->p_libvlc->i_win9x_cv;
+ p_condvar->SignalObjectAndWait = p_this->p_libvlc->SignalObjectAndWait;
- if( p_this->p_vlc->i_win9x_cv == 0 )
+ if( (p_condvar->SignalObjectAndWait && !p_this->p_libvlc->b_fast_mutex)
+ || p_condvar->i_win9x_cv == 0 )
{
/* Create an auto-reset event. */
p_condvar->event = CreateEvent( NULL, /* no security */
0x7fffffff, /* max count */
NULL ); /* unnamed */
- if( p_this->p_vlc->i_win9x_cv == 1 )
+ if( p_condvar->i_win9x_cv == 1 )
/* Create a manual-reset event initially signaled. */
p_condvar->event = CreateEvent( NULL, TRUE, TRUE, NULL );
else
}
#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
- return pthread_cond_init( p_condvar, NULL );
+ return pthread_cond_init( &p_condvar->cond, NULL );
#elif defined( HAVE_CTHREADS_H )
/* condition_init() */
p_condvar->thread = -1;
p_condvar->init = 9999;
return 0;
-
#endif
}
*****************************************************************************/
int __vlc_cond_destroy( char * psz_file, int i_line, vlc_cond_t *p_condvar )
{
+ int i_result;
+ /* In case of error : */
+ int i_thread = -1;
+ const char * psz_error = "";
+
#if defined( PTH_INIT_IN_PTH_H )
return 0;
#elif defined( ST_INIT_IN_ST_H )
- return st_cond_destroy( *p_condvar );
+ i_result = st_cond_destroy( p_condvar->cond );
+
+#elif defined( UNDER_CE )
+ i_result = !CloseHandle( p_condvar->event );
#elif defined( WIN32 )
if( !p_condvar->semaphore )
- return !CloseHandle( p_condvar->event );
+ i_result = !CloseHandle( p_condvar->event );
else
- return !CloseHandle( p_condvar->event )
+ i_result = !CloseHandle( p_condvar->event )
|| !CloseHandle( p_condvar->semaphore );
#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
- int i_result = pthread_cond_destroy( p_condvar );
- if( i_result )
+ i_result = pthread_cond_destroy( &p_condvar->cond );
+ if ( i_result )
{
-#if 0
- intf_ErrMsg( "thread %d error: cond_destroy failed at %s:%d (%s)",
- pthread_self(), psz_file, i_line, strerror(i_result) );
-#endif
+ i_thread = (int)pthread_self();
+ psz_error = strerror(i_result);
}
- return i_result;
#elif defined( HAVE_CTHREADS_H )
return 0;
#elif defined( HAVE_KERNEL_SCHEDULER_H )
p_condvar->init = 0;
return 0;
+#endif
-#endif
+ if( i_result )
+ {
+ msg_Err( p_condvar->p_this,
+ "thread %d: cond_destroy failed at %s:%d (%d:%s)",
+ i_thread, psz_file, i_line, i_result, psz_error );
+ }
+ return i_result;
}
/*****************************************************************************
* vlc_thread_create: create a thread, inner version
+ *****************************************************************************
+ * Note that i_priority is only taken into account on platforms supporting
+ * userland real-time priority threads.
*****************************************************************************/
int __vlc_thread_create( vlc_object_t *p_this, char * psz_file, int i_line,
char *psz_name, void * ( *func ) ( void * ),
- vlc_bool_t b_wait )
+ int i_priority, vlc_bool_t b_wait )
{
int i_ret;
+ void *p_data = (void *)p_this;
vlc_mutex_lock( &p_this->object_lock );
-#ifdef GPROF
- wrapper_t wrapper;
-
- /* Initialize the wrapper structure */
- wrapper.func = func;
- wrapper.p_data = (void *)p_this;
- getitimer( ITIMER_PROF, &wrapper.itimer );
- vlc_mutex_init( p_this, &wrapper.lock );
- vlc_cond_init( p_this, &wrapper.wait );
- vlc_mutex_lock( &wrapper.lock );
-
- /* Alter user-passed data so that we call the wrapper instead
- * of the real function */
- p_data = &wrapper;
- func = vlc_thread_wrapper;
-#endif
-
#if defined( PTH_INIT_IN_PTH_H )
- p_this->thread_id = pth_spawn( PTH_ATTR_DEFAULT, func, (void *)p_this );
- i_ret = 0;
+ p_this->thread_id = pth_spawn( PTH_ATTR_DEFAULT, func, p_data );
+ i_ret = p_this->thread_id == NULL;
#elif defined( ST_INIT_IN_ST_H )
- p_this->thread_id = st_thread_create( func, (void *)p_this, 1, 0 );
+ p_this->thread_id = st_thread_create( func, p_data, 1, 0 );
i_ret = 0;
-
-#elif defined( WIN32 )
+
+#elif defined( WIN32 ) || defined( UNDER_CE )
{
unsigned threadID;
/* When using the MSVCRT C library you have to use the _beginthreadex
* function instead of CreateThread, otherwise you'll end up with
- * memory leaks and the signal functions not working */
+ * memory leaks and the signal functions not working (see Microsoft
+ * Knowledge Base, article 104641) */
p_this->thread_id =
- (HANDLE)_beginthreadex( NULL, 0, (PTHREAD_START) func,
- (void *)p_this, 0, &threadID );
+#if defined( UNDER_CE )
+ (HANDLE)CreateThread( NULL, 0, (PTHREAD_START) func,
+ p_data, 0, &threadID );
+#else
+ (HANDLE)_beginthreadex( NULL, 0, (PTHREAD_START) func,
+ p_data, 0, &threadID );
+#endif
+ }
+
+ if ( p_this->thread_id && i_priority )
+ {
+ if ( !SetThreadPriority(p_this->thread_id, i_priority) )
+ {
+ msg_Warn( p_this, "couldn't set a faster priority" );
+ i_priority = 0;
+ }
}
i_ret = ( p_this->thread_id ? 0 : 1 );
#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
- i_ret = pthread_create( &p_this->thread_id, NULL, func, (void *)p_this );
+ i_ret = pthread_create( &p_this->thread_id, NULL, func, p_data );
+
+#ifdef SYS_DARWIN
+ if ( i_priority )
+ {
+ int i_error, i_policy;
+ struct sched_param param;
+ memset( ¶m, 0, sizeof(struct sched_param) );
+ if ( i_priority < 0 )
+ {
+ param.sched_priority = (-1) * i_priority;
+ i_policy = SCHED_OTHER;
+ }
+ else
+ {
+ param.sched_priority = i_priority;
+ i_policy = SCHED_RR;
+ }
+ if ( (i_error = pthread_setschedparam( p_this->thread_id,
+ i_policy, ¶m )) )
+ {
+ msg_Warn( p_this, "couldn't set thread priority (%s:%d): %s",
+ psz_file, i_line, strerror(i_error) );
+ i_priority = 0;
+ }
+ }
+#endif
#elif defined( HAVE_CTHREADS_H )
- p_this->thread_id = cthread_fork( (cthread_fn_t)func, (any_t)p_this );
+ p_this->thread_id = cthread_fork( (cthread_fn_t)func, (any_t)p_data );
i_ret = 0;
#elif defined( HAVE_KERNEL_SCHEDULER_H )
p_this->thread_id = spawn_thread( (thread_func)func, psz_name,
- B_NORMAL_PRIORITY, (void *)p_this );
+ i_priority, p_data );
i_ret = resume_thread( p_this->thread_id );
#endif
-#ifdef GPROF
- if( i_ret == 0 )
- {
- vlc_cond_wait( &wrapper.wait, &wrapper.lock );
- }
-
- vlc_mutex_unlock( &wrapper.lock );
- vlc_mutex_destroy( &wrapper.lock );
- vlc_cond_destroy( &wrapper.wait );
-#endif
-
if( i_ret == 0 )
{
if( b_wait )
p_this->b_thread = 1;
- msg_Dbg( p_this, "thread %d (%s) created (%s:%d)",
- p_this->thread_id, psz_name, psz_file, i_line );
+ msg_Dbg( p_this, "thread %d (%s) created at priority %d (%s:%d)",
+ (int)p_this->thread_id, psz_name, i_priority,
+ psz_file, i_line );
vlc_mutex_unlock( &p_this->object_lock );
}
else
{
+#ifdef HAVE_STRERROR
msg_Err( p_this, "%s thread could not be created at %s:%d (%s)",
psz_name, psz_file, i_line, strerror(i_ret) );
+#else
+ msg_Err( p_this, "%s thread could not be created at %s:%d",
+ psz_name, psz_file, i_line );
+#endif
vlc_mutex_unlock( &p_this->object_lock );
}
return i_ret;
}
+/*****************************************************************************
+ * 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)
+ *****************************************************************************/
+int __vlc_thread_set_priority( vlc_object_t *p_this, char * psz_file,
+ int i_line, int i_priority )
+{
+#if defined( PTH_INIT_IN_PTH_H ) || defined( ST_INIT_IN_ST_H )
+#elif defined( WIN32 ) || defined( UNDER_CE )
+ if ( !SetThreadPriority(GetCurrentThread(), i_priority) )
+ {
+ msg_Warn( p_this, "couldn't set a faster priority" );
+ return 1;
+ }
+
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+
+#ifdef SYS_DARWIN
+ if ( i_priority )
+ {
+ int i_error, i_policy;
+ struct sched_param param;
+ memset( ¶m, 0, sizeof(struct sched_param) );
+ if ( i_priority < 0 )
+ {
+ param.sched_priority = (-1) * i_priority;
+ i_policy = SCHED_OTHER;
+ }
+ else
+ {
+ param.sched_priority = i_priority;
+ i_policy = SCHED_RR;
+ }
+ if ( (i_error = pthread_setschedparam( pthread_self(),
+ i_policy, ¶m )) )
+ {
+ msg_Warn( p_this, "couldn't set thread priority (%s:%d): %s",
+ psz_file, i_line, strerror(i_error) );
+ i_priority = 0;
+ }
+ }
+#endif
+
+#endif
+
+ return 0;
+}
+
/*****************************************************************************
* vlc_thread_ready: tell the parent thread we were successfully spawned
*****************************************************************************/
int i_ret = 0;
#if defined( PTH_INIT_IN_PTH_H )
- i_ret = pth_join( p_this->thread_id, NULL );
+ i_ret = ( pth_join( p_this->thread_id, NULL ) == FALSE );
#elif defined( ST_INIT_IN_ST_H )
i_ret = st_thread_join( p_this->thread_id, NULL );
-
+
+#elif defined( UNDER_CE )
+ WaitForSingleObject( p_this->thread_id, INFINITE );
+
#elif defined( WIN32 )
WaitForSingleObject( p_this->thread_id, INFINITE );
if( i_ret )
{
+#ifdef HAVE_STRERROR
msg_Err( p_this, "thread_join(%d) failed at %s:%d (%s)",
- p_this->thread_id, psz_file, i_line, strerror(i_ret) );
+ (int)p_this->thread_id, psz_file, i_line,
+ strerror(i_ret) );
+#else
+ msg_Err( p_this, "thread_join(%d) failed at %s:%d",
+ (int)p_this->thread_id, psz_file, i_line );
+#endif
}
else
{
msg_Dbg( p_this, "thread %d joined (%s:%d)",
- p_this->thread_id, psz_file, i_line );
+ (int)p_this->thread_id, psz_file, i_line );
}
p_this->b_thread = 0;
}
-/*****************************************************************************
- * vlc_thread_wrapper: wrapper around thread functions used when profiling.
- *****************************************************************************/
-#ifdef GPROF
-static void *vlc_thread_wrapper( void *p_wrapper )
-{
- /* Put user data in thread-local variables */
- void * p_data = ((wrapper_t*)p_wrapper)->p_data;
- vlc_thread_func_t func = ((wrapper_t*)p_wrapper)->func;
-
- /* Set the profile timer value */
- setitimer( ITIMER_PROF, &((wrapper_t*)p_wrapper)->itimer, NULL );
-
- /* Tell the calling thread that we don't need its data anymore */
- vlc_mutex_lock( &((wrapper_t*)p_wrapper)->lock );
- vlc_cond_signal( &((wrapper_t*)p_wrapper)->wait );
- vlc_mutex_unlock( &((wrapper_t*)p_wrapper)->lock );
-
- /* Call the real function */
- return func( p_data );
-}
-#endif
projects / vlc / blobdiff