* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
-#include <stdlib.h>
#include "libvlc.h"
+#include <assert.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#define VLC_THREADS_UNINITIALIZED 0
#define VLC_THREADS_PENDING 1
static volatile int i_status = VLC_THREADS_UNINITIALIZED;
static vlc_object_t *p_root;
-#if defined( PTH_INIT_IN_PTH_H )
-#elif defined( ST_INIT_IN_ST_H )
-#elif defined( UNDER_CE )
+#if defined( UNDER_CE )
#elif defined( WIN32 )
+
+/* following is only available on NT/2000/XP and above */
static SIGNALOBJECTANDWAIT pf_SignalObjectAndWait = NULL;
-static vlc_bool_t b_fast_mutex = 0;
-static int i_win9x_cv = 0;
+
+/*
+** On Windows NT/2K/XP we use a slow mutex implementation but which
+** allows us to correctly implement condition variables.
+** You can also use the faster Win9x implementation but you might
+** experience problems with it.
+*/
+static bool b_fast_mutex = false;
+/*
+** On Windows 9x/Me you can use a fast but incorrect condition variables
+** implementation (more precisely there is a possibility for a race
+** condition to happen).
+** However it is possible to use slower alternatives which are more robust.
+** Currently you can choose between implementation 0 (which is the
+** fastest but slightly incorrect), 1 (default) and 2.
+*/
+static int i_win9x_cv = 1;
+
#elif defined( HAVE_KERNEL_SCHEDULER_H )
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+#elif defined( LIBVLC_USE_PTHREAD )
static pthread_mutex_t once_mutex = PTHREAD_MUTEX_INITIALIZER;
-#elif defined( HAVE_CTHREADS_H )
#endif
vlc_threadvar_t msg_context_global_key;
+#if defined(LIBVLC_USE_PTHREAD)
+static inline unsigned long vlc_threadid (void)
+{
+ union { pthread_t th; unsigned long int i; } v = { };
+ v.th = pthread_self ();
+ return v.i;
+}
+
+
+/*****************************************************************************
+ * vlc_thread_fatal: Report an error from the threading layer
+ *****************************************************************************
+ * This is mostly meant for debugging.
+ *****************************************************************************/
+void vlc_pthread_fatal (const char *action, int error,
+ const char *file, unsigned line)
+{
+ fprintf (stderr, "LibVLC fatal error %s in thread %lu at %s:%u: %d\n",
+ action, vlc_threadid (), file, line, error);
+ fflush (stderr);
+
+ /* Sometimes strerror_r() crashes too, so make sure we print an error
+ * message before we invoke it */
+#ifdef __GLIBC__
+ /* Avoid the strerror_r() prototype brain damage in glibc */
+ errno = error;
+ fprintf (stderr, " Error message: %m\n");
+#else
+ char buf[1000];
+ const char *msg;
+
+ switch (strerror_r (error, buf, sizeof (buf)))
+ {
+ case 0:
+ msg = buf;
+ break;
+ case ERANGE: /* should never happen */
+ msg = "unknwon (too big to display)";
+ break;
+ default:
+ msg = "unknown (invalid error number)";
+ break;
+ }
+ fprintf (stderr, " Error message: %s\n", msg);
+#endif
+
+ fflush (stderr);
+ abort ();
+}
+#endif
+
+
/*****************************************************************************
* vlc_threads_init: initialize threads system
*****************************************************************************
/* If we have lazy mutex initialization, use it. Otherwise, we just
* hope nothing wrong happens. */
-#if defined( PTH_INIT_IN_PTH_H )
-#elif defined( ST_INIT_IN_ST_H )
-#elif defined( UNDER_CE )
+#if defined( UNDER_CE )
#elif defined( WIN32 )
if( IsDebuggerPresent() )
{
- /* SignalObjectAndWait() API is problematic under a debugger */
- b_fast_mutex = VLC_TRUE;
- i_win9x_cv = 0;
- }
- else
- {
- b_fast_mutex = VLC_FALSE;
+ /* SignalObjectAndWait() is problematic under a debugger */
+ b_fast_mutex = true;
i_win9x_cv = 1;
}
#elif defined( HAVE_KERNEL_SCHEDULER_H )
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+#elif defined( LIBVLC_USE_PTHREAD )
pthread_mutex_lock( &once_mutex );
-#elif defined( HAVE_CTHREADS_H )
#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_global->b_ready = VLC_FALSE;
-
-#if defined( PTH_INIT_IN_PTH_H )
- i_ret = ( pth_init() == FALSE );
+ p_libvlc_global->b_ready = false;
-#elif defined( ST_INIT_IN_ST_H )
- i_ret = st_init();
-
-#elif defined( UNDER_CE )
+#if defined( UNDER_CE )
/* Nothing to initialize */
#elif defined( WIN32 )
HINSTANCE hInstLib;
/* We are running on NT/2K/XP, we can use SignalObjectAndWait */
- hInstLib = LoadLibrary( "kernel32" );
+ hInstLib = LoadLibrary(_T("kernel32"));
if( hInstLib )
{
pf_SignalObjectAndWait =
(SIGNALOBJECTANDWAIT)GetProcAddress( hInstLib,
- "SignalObjectAndWait" );
+ _T("SignalObjectAndWait") );
}
}
#elif defined( HAVE_KERNEL_SCHEDULER_H )
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
-#elif defined( HAVE_CTHREADS_H )
+#elif defined( LIBVLC_USE_PTHREAD )
#endif
- p_root = vlc_object_create( p_libvlc_global, VLC_OBJECT_GLOBAL );
+ p_root = vlc_custom_create( VLC_OBJECT(p_libvlc_global), 0,
+ VLC_OBJECT_GLOBAL, "global" );
if( p_root == NULL )
i_ret = VLC_ENOMEM;
/* If we have lazy mutex initialization support, unlock the mutex;
* otherwize, do a naive wait loop. */
-#if defined( PTH_INIT_IN_PTH_H )
- while( i_status == VLC_THREADS_PENDING ) msleep( THREAD_SLEEP );
-#elif defined( ST_INIT_IN_ST_H )
- while( i_status == VLC_THREADS_PENDING ) msleep( THREAD_SLEEP );
-#elif defined( UNDER_CE )
+#if defined( UNDER_CE )
while( i_status == VLC_THREADS_PENDING ) msleep( THREAD_SLEEP );
#elif defined( WIN32 )
while( i_status == VLC_THREADS_PENDING ) msleep( THREAD_SLEEP );
#elif defined( HAVE_KERNEL_SCHEDULER_H )
while( i_status == VLC_THREADS_PENDING ) msleep( THREAD_SLEEP );
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+#elif defined( LIBVLC_USE_PTHREAD )
pthread_mutex_unlock( &once_mutex );
-#elif defined( HAVE_CTHREADS_H )
- while( i_status == VLC_THREADS_PENDING ) msleep( THREAD_SLEEP );
#endif
if( i_status != VLC_THREADS_READY )
int __vlc_threads_end( vlc_object_t *p_this )
{
(void)p_this;
-#if defined( PTH_INIT_IN_PTH_H )
-#elif defined( ST_INIT_IN_ST_H )
-#elif defined( UNDER_CE )
+#if defined( UNDER_CE )
#elif defined( WIN32 )
#elif defined( HAVE_KERNEL_SCHEDULER_H )
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+#elif defined( LIBVLC_USE_PTHREAD )
pthread_mutex_lock( &once_mutex );
-#elif defined( HAVE_CTHREADS_H )
#endif
if( i_initializations == 0 )
if( i_initializations == 0 )
{
i_status = VLC_THREADS_UNINITIALIZED;
- vlc_object_destroy( p_root );
- }
-
-#if defined( PTH_INIT_IN_PTH_H )
- if( i_initializations == 0 )
- {
- return ( pth_kill() == FALSE );
+ vlc_object_release( p_root );
}
-#elif defined( ST_INIT_IN_ST_H )
-#elif defined( UNDER_CE )
+#if defined( UNDER_CE )
#elif defined( WIN32 )
#elif defined( HAVE_KERNEL_SCHEDULER_H )
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+#elif defined( LIBVLC_USE_PTHREAD )
pthread_mutex_unlock( &once_mutex );
-#elif defined( HAVE_CTHREADS_H )
#endif
return VLC_SUCCESS;
}
+#ifdef __linux__
+/* This is not prototyped under Linux, though it exists. */
+int pthread_mutexattr_setkind_np( pthread_mutexattr_t *attr, int kind );
+#endif
+
/*****************************************************************************
* vlc_mutex_init: initialize a mutex
*****************************************************************************/
-int __vlc_mutex_init( vlc_object_t *p_this, vlc_mutex_t *p_mutex )
+int __vlc_mutex_init( vlc_mutex_t *p_mutex )
{
- p_mutex->p_this = p_this;
-
-#if defined( PTH_INIT_IN_PTH_H )
- return ( pth_mutex_init( &p_mutex->mutex ) == FALSE );
-
-#elif defined( ST_INIT_IN_ST_H )
- p_mutex->mutex = st_mutex_new();
- return ( p_mutex->mutex == NULL ) ? errno : 0;
-
-#elif defined( UNDER_CE )
+#if defined( UNDER_CE )
InitializeCriticalSection( &p_mutex->csection );
return 0;
p_mutex->init = 9999;
return B_OK;
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
-# if defined(DEBUG) && defined(SYS_LINUX)
+#elif defined( LIBVLC_USE_PTHREAD )
+# ifndef NDEBUG
{
/* Create error-checking mutex to detect problems more easily. */
pthread_mutexattr_t attr;
int i_result;
pthread_mutexattr_init( &attr );
+# if defined(SYS_LINUX)
pthread_mutexattr_setkind_np( &attr, PTHREAD_MUTEX_ERRORCHECK_NP );
+# else
+ pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_ERRORCHECK );
+# endif
+
i_result = pthread_mutex_init( &p_mutex->mutex, &attr );
pthread_mutexattr_destroy( &attr );
return( i_result );
}
-# endif
+# endif /* NDEBUG */
return pthread_mutex_init( &p_mutex->mutex, NULL );
-#elif defined( HAVE_CTHREADS_H )
- mutex_init( p_mutex );
- return 0;
-
#endif
}
/*****************************************************************************
- * vlc_mutex_destroy: destroy a mutex, inner version
+ * vlc_mutex_init: initialize a recursive mutex (Do not use)
*****************************************************************************/
-int __vlc_mutex_destroy( const char * psz_file, int i_line, vlc_mutex_t *p_mutex )
+int __vlc_mutex_init_recursive( vlc_mutex_t *p_mutex )
{
- int i_result;
- /* In case of error : */
- int i_thread = -1;
- const char * psz_error = "";
+#if defined( WIN32 )
+ /* Create mutex returns a recursive mutex */
+ p_mutex->mutex = CreateMutex( 0, FALSE, 0 );
+ return ( p_mutex->mutex != NULL ? 0 : 1 );
+#elif defined( LIBVLC_USE_PTHREAD )
+ pthread_mutexattr_t attr;
+ int i_result;
+
+ pthread_mutexattr_init( &attr );
+# ifndef NDEBUG
+ /* Create error-checking mutex to detect problems more easily. */
+# if defined(SYS_LINUX)
+ pthread_mutexattr_setkind_np( &attr, PTHREAD_MUTEX_ERRORCHECK_NP );
+# else
+ pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_ERRORCHECK );
+# endif
+# endif
+ pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_RECURSIVE );
+ i_result = pthread_mutex_init( &p_mutex->mutex, &attr );
+ pthread_mutexattr_destroy( &attr );
+ return( i_result );
+#else
+# error Unimplemented!
+#endif
+}
-#if defined( PTH_INIT_IN_PTH_H )
- return 0;
-#elif defined( ST_INIT_IN_ST_H )
- i_result = st_mutex_destroy( p_mutex->mutex );
+/*****************************************************************************
+ * vlc_mutex_destroy: destroy a mutex, inner version
+ *****************************************************************************/
+void __vlc_mutex_destroy( const char * psz_file, int i_line, vlc_mutex_t *p_mutex )
+{
+#if defined( UNDER_CE )
+ VLC_UNUSED( psz_file); VLC_UNUSED( i_line );
-#elif defined( UNDER_CE )
DeleteCriticalSection( &p_mutex->csection );
- return 0;
#elif defined( WIN32 )
+ VLC_UNUSED( psz_file); VLC_UNUSED( i_line );
+
if( p_mutex->mutex )
- {
CloseHandle( p_mutex->mutex );
- }
else
- {
DeleteCriticalSection( &p_mutex->csection );
- }
- return 0;
#elif defined( HAVE_KERNEL_SCHEDULER_H )
if( p_mutex->init == 9999 )
- {
delete_sem( p_mutex->lock );
- }
p_mutex->init = 0;
- return B_OK;
-
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
- i_result = pthread_mutex_destroy( &p_mutex->mutex );
- if( i_result )
- {
- i_thread = CAST_PTHREAD_TO_INT(pthread_self());
- psz_error = strerror(i_result);
- }
-#elif defined( HAVE_CTHREADS_H )
- return 0;
+#elif defined( LIBVLC_USE_PTHREAD )
+ int val = pthread_mutex_destroy( &p_mutex->mutex );
+ VLC_THREAD_ASSERT ("destroying mutex");
#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;
}
/*****************************************************************************
* vlc_cond_init: initialize a condition
*****************************************************************************/
-int __vlc_cond_init( vlc_object_t *p_this, vlc_cond_t *p_condvar )
+int __vlc_cond_init( vlc_cond_t *p_condvar )
{
- p_condvar->p_this = p_this;
-
-#if defined( PTH_INIT_IN_PTH_H )
- return ( pth_cond_init( &p_condvar->cond ) == FALSE );
-
-#elif defined( ST_INIT_IN_ST_H )
- p_condvar->cond = st_cond_new();
- return ( p_condvar->cond == NULL ) ? errno : 0;
-
-#elif defined( UNDER_CE )
+#if defined( UNDER_CE )
/* Initialize counter */
p_condvar->i_waiting_threads = 0;
p_condvar->init = 9999;
return 0;
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
- return pthread_cond_init( &p_condvar->cond, NULL );
+#elif defined( LIBVLC_USE_PTHREAD )
+ pthread_condattr_t attr;
+ int ret;
-#elif defined( HAVE_CTHREADS_H )
- /* condition_init() */
- spin_lock_init( &p_condvar->lock );
- cthread_queue_init( &p_condvar->queue );
- p_condvar->name = 0;
- p_condvar->implications = 0;
+ ret = pthread_condattr_init (&attr);
+ if (ret)
+ return ret;
- return 0;
+# if !defined (_POSIX_CLOCK_SELECTION)
+ /* Fairly outdated POSIX support (that was defined in 2001) */
+# define _POSIX_CLOCK_SELECTION (-1)
+# endif
+# if (_POSIX_CLOCK_SELECTION >= 0)
+ /* NOTE: This must be the same clock as the one in mtime.c */
+ pthread_condattr_setclock (&attr, CLOCK_MONOTONIC);
+# endif
+
+ ret = pthread_cond_init (&p_condvar->cond, &attr);
+ pthread_condattr_destroy (&attr);
+ return ret;
#endif
}
/*****************************************************************************
* vlc_cond_destroy: destroy a condition, inner version
*****************************************************************************/
-int __vlc_cond_destroy( const char * psz_file, int i_line, vlc_cond_t *p_condvar )
+void __vlc_cond_destroy( const 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 )
- i_result = st_cond_destroy( p_condvar->cond );
+#if defined( UNDER_CE )
+ VLC_UNUSED( psz_file); VLC_UNUSED( i_line );
-#elif defined( UNDER_CE )
- i_result = !CloseHandle( p_condvar->event );
+ CloseHandle( p_condvar->event );
#elif defined( WIN32 )
+ VLC_UNUSED( psz_file); VLC_UNUSED( i_line );
+
if( !p_condvar->semaphore )
- i_result = !CloseHandle( p_condvar->event );
+ CloseHandle( p_condvar->event );
else
- i_result = !CloseHandle( p_condvar->event )
- || !CloseHandle( p_condvar->semaphore );
+ {
+ CloseHandle( p_condvar->event );
+ CloseHandle( p_condvar->semaphore );
+ }
if( p_condvar->semaphore != NULL )
- DeleteCriticalSection( &p_condvar->csection );
+ DeleteCriticalSection( &p_condvar->csection );
#elif defined( HAVE_KERNEL_SCHEDULER_H )
p_condvar->init = 0;
- return 0;
-
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
- i_result = pthread_cond_destroy( &p_condvar->cond );
- if( i_result )
- {
- i_thread = CAST_PTHREAD_TO_INT(pthread_self());
- psz_error = strerror(i_result);
- }
-#elif defined( HAVE_CTHREADS_H )
- return 0;
+#elif defined( LIBVLC_USE_PTHREAD )
+ int val = pthread_cond_destroy( &p_condvar->cond );
+ VLC_THREAD_ASSERT ("destroying condition");
#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_tls_create: create a thread-local variable
*****************************************************************************/
-int __vlc_threadvar_create( vlc_object_t *p_this, vlc_threadvar_t *p_tls )
+int __vlc_threadvar_create( vlc_threadvar_t *p_tls )
{
int i_ret = -1;
- (void)p_this;
-#if defined( PTH_INIT_IN_PTH_H )
- i_ret = pth_key_create( &p_tls->handle, NULL );
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
- msg_Err( p_this, "TLS not implemented" );
- i_ret VLC_EGENERIC;
-#elif defined( ST_INIT_IN_ST_H )
- i_ret = st_key_create( &p_tls->handle, NULL );
+
+#if defined( HAVE_KERNEL_SCHEDULER_H )
+# error Unimplemented!
#elif defined( UNDER_CE ) || defined( WIN32 )
#elif defined( WIN32 )
p_tls->handle = TlsAlloc();
i_ret = !( p_tls->handle == 0xFFFFFFFF );
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+#elif defined( LIBVLC_USE_PTHREAD )
i_ret = pthread_key_create( &p_tls->handle, NULL );
-#elif defined( HAVE_CTHREADS_H )
- i_ret = cthread_keycreate( &p_tls-handle );
#endif
return i_ret;
}
*****************************************************************************/
int __vlc_thread_create( vlc_object_t *p_this, const char * psz_file, int i_line,
const char *psz_name, void * ( *func ) ( void * ),
- int i_priority, vlc_bool_t b_wait )
+ int i_priority, bool b_wait )
{
int i_ret;
void *p_data = (void *)p_this;
+ vlc_object_internals_t *p_priv = p_this->p_internals;
vlc_mutex_lock( &p_this->object_lock );
-#if defined( PTH_INIT_IN_PTH_H )
- 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, p_data, 1, 0 );
- i_ret = 0;
-
-#elif defined( WIN32 ) || defined( UNDER_CE )
+#if 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 (see Microsoft
* Knowledge Base, article 104641) */
- p_this->thread_id =
#if defined( UNDER_CE )
- (HANDLE)CreateThread( NULL, 0, (PTHREAD_START) func,
- p_data, 0, &threadID );
+ DWORD threadId;
+ HANDLE hThread = CreateThread( NULL, 0, (LPTHREAD_START_ROUTINE)func,
+ (LPVOID)p_data, CREATE_SUSPENDED,
+ &threadId );
#else
- (HANDLE)_beginthreadex( NULL, 0, (PTHREAD_START) func,
- p_data, 0, &threadID );
+ unsigned threadId;
+ uintptr_t hThread = _beginthreadex( NULL, 0,
+ (LPTHREAD_START_ROUTINE)func,
+ (void*)p_data, CREATE_SUSPENDED,
+ &threadId );
#endif
+ p_priv->thread_id.id = (DWORD)threadId;
+ p_priv->thread_id.hThread = (HANDLE)hThread;
+ ResumeThread((HANDLE)hThread);
}
- if( p_this->thread_id && i_priority )
+ i_ret = ( p_priv->thread_id.hThread ? 0 : 1 );
+
+ if( !i_ret && i_priority )
{
- if( !SetThreadPriority(p_this->thread_id, i_priority) )
+ if( !SetThreadPriority(p_priv->thread_id.hThread, 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( HAVE_KERNEL_SCHEDULER_H )
- p_this->thread_id = spawn_thread( (thread_func)func, psz_name,
+ p_priv->thread_id = spawn_thread( (thread_func)func, psz_name,
i_priority, p_data );
- i_ret = resume_thread( p_this->thread_id );
+ i_ret = resume_thread( p_priv->thread_id );
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
- i_ret = pthread_create( &p_this->thread_id, NULL, func, p_data );
+#elif defined( LIBVLC_USE_PTHREAD )
+ i_ret = pthread_create( &p_priv->thread_id, NULL, func, p_data );
#ifndef __APPLE__
if( config_GetInt( p_this, "rt-priority" ) )
param.sched_priority = i_priority;
i_policy = SCHED_RR;
}
- if( (i_error = pthread_setschedparam( p_this->thread_id,
+ if( (i_error = pthread_setschedparam( p_priv->thread_id,
i_policy, ¶m )) )
{
- msg_Warn( p_this, "couldn't set thread priority (%s:%d): %s",
- psz_file, i_line, strerror(i_error) );
+ errno = i_error;
+ msg_Warn( p_this, "couldn't set thread priority (%s:%d): %m",
+ psz_file, i_line );
i_priority = 0;
}
}
}
#endif
-#elif defined( HAVE_CTHREADS_H )
- p_this->thread_id = cthread_fork( (cthread_fn_t)func, (any_t)p_data );
- i_ret = 0;
-
#endif
if( i_ret == 0 )
if( b_wait )
{
msg_Dbg( p_this, "waiting for thread completion" );
- vlc_cond_wait( &p_this->object_wait, &p_this->object_lock );
+ vlc_object_wait( p_this );
}
- p_this->b_thread = 1;
+ p_priv->b_thread = true;
+#if defined( WIN32 ) || defined( UNDER_CE )
+ msg_Dbg( p_this, "thread %u (%s) created at priority %d (%s:%d)",
+ (unsigned int)p_priv->thread_id.id, psz_name,
+ i_priority, psz_file, i_line );
+#else
msg_Dbg( p_this, "thread %u (%s) created at priority %d (%s:%d)",
- (unsigned int)p_this->thread_id, psz_name, i_priority,
+ (unsigned int)p_priv->thread_id, psz_name, i_priority,
psz_file, i_line );
+#endif
+
vlc_mutex_unlock( &p_this->object_lock );
}
else
{
- msg_Err( p_this, "%s thread could not be created at %s:%d (%s)",
- psz_name, psz_file, i_line, strerror(i_ret) );
+ errno = i_ret;
+ msg_Err( p_this, "%s thread could not be created at %s:%d (%m)",
+ psz_name, psz_file, i_line );
vlc_mutex_unlock( &p_this->object_lock );
}
int __vlc_thread_set_priority( vlc_object_t *p_this, const 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) )
+ vlc_object_internals_t *p_priv = p_this->p_internals;
+#if defined( WIN32 ) || defined( UNDER_CE )
+ VLC_UNUSED( psz_file); VLC_UNUSED( i_line );
+
+ if( !p_priv->thread_id.hThread )
+ p_priv->thread_id.hThread = GetCurrentThread();
+ if( !SetThreadPriority(p_priv->thread_id.hThread, i_priority) )
{
msg_Warn( p_this, "couldn't set a faster priority" );
return 1;
}
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
-#ifndef __APPLE__
- if( config_GetInt( p_this, "rt-priority" ) )
-#endif
+#elif defined( LIBVLC_USE_PTHREAD )
+# ifndef __APPLE__
+ if( config_GetInt( p_this, "rt-priority" ) > 0 )
+# endif
{
int i_error, i_policy;
struct sched_param param;
param.sched_priority = i_priority;
i_policy = SCHED_RR;
}
- if( !p_this->thread_id )
- p_this->thread_id = pthread_self();
- if( (i_error = pthread_setschedparam( p_this->thread_id,
+ if( !p_priv->thread_id )
+ p_priv->thread_id = pthread_self();
+ if( (i_error = pthread_setschedparam( p_priv->thread_id,
i_policy, ¶m )) )
{
- msg_Warn( p_this, "couldn't set thread priority (%s:%d): %s",
- psz_file, i_line, strerror(i_error) );
+ errno = i_error;
+ msg_Warn( p_this, "couldn't set thread priority (%s:%d): %m",
+ psz_file, i_line );
i_priority = 0;
}
}
*****************************************************************************/
void __vlc_thread_ready( vlc_object_t *p_this )
{
- vlc_mutex_lock( &p_this->object_lock );
- vlc_cond_signal( &p_this->object_wait );
- vlc_mutex_unlock( &p_this->object_lock );
+ vlc_object_signal( p_this );
}
/*****************************************************************************
*****************************************************************************/
void __vlc_thread_join( vlc_object_t *p_this, const char * psz_file, int i_line )
{
- int i_ret = 0;
+ vlc_object_internals_t *p_priv = p_this->p_internals;
-#if defined( PTH_INIT_IN_PTH_H )
- 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 ) || defined( WIN32 )
+#if defined( UNDER_CE ) || defined( WIN32 )
HMODULE hmodule;
BOOL (WINAPI *OurGetThreadTimes)( HANDLE, FILETIME*, FILETIME*,
FILETIME*, FILETIME* );
FILETIME create_ft, exit_ft, kernel_ft, user_ft;
int64_t real_time, kernel_time, user_time;
-
- WaitForSingleObject( p_this->thread_id, INFINITE );
-
+ HANDLE hThread;
+
+ /*
+ ** object will close its thread handle when destroyed, duplicate it here
+ ** to be on the safe side
+ */
+ if( ! DuplicateHandle(GetCurrentProcess(),
+ p_priv->thread_id.hThread,
+ GetCurrentProcess(),
+ &hThread,
+ 0,
+ FALSE,
+ DUPLICATE_SAME_ACCESS) )
+ {
+ msg_Err( p_this, "thread_join(%u) failed at %s:%d (%u)",
+ (unsigned int)p_priv->thread_id.id,
+ psz_file, i_line, (unsigned int)GetLastError() );
+ p_priv->b_thread = false;
+ return;
+ }
+
+ WaitForSingleObject( hThread, INFINITE );
+
+ msg_Dbg( p_this, "thread %u joined (%s:%d)",
+ (unsigned int)p_priv->thread_id.id,
+ psz_file, i_line );
#if defined( UNDER_CE )
hmodule = GetModuleHandle( _T("COREDLL") );
#else
GetProcAddress( hmodule, _T("GetThreadTimes") );
if( OurGetThreadTimes &&
- OurGetThreadTimes( p_this->thread_id,
+ OurGetThreadTimes( hThread,
&create_ft, &exit_ft, &kernel_ft, &user_ft ) )
{
real_time =
user_time/60/1000000,
(double)((user_time%(60*1000000))/1000000.0) );
}
- CloseHandle( p_this->thread_id );
+ CloseHandle( hThread );
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
- int32_t exit_value;
- wait_for_thread( p_this->thread_id, &exit_value );
+#else /* !defined(WIN32) */
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
- i_ret = pthread_join( p_this->thread_id, NULL );
+ int i_ret = 0;
-#elif defined( HAVE_CTHREADS_H )
- cthread_join( p_this->thread_id );
- i_ret = 1;
+#if defined( HAVE_KERNEL_SCHEDULER_H )
+ int32_t exit_value;
+ i_ret = (B_OK == wait_for_thread( p_priv->thread_id, &exit_value ));
+#elif defined( LIBVLC_USE_PTHREAD )
+ /* Make sure we do return if we are calling vlc_thread_join()
+ * from the joined thread */
+ if (pthread_equal (pthread_self (), p_priv->thread_id))
+ i_ret = pthread_detach (p_priv->thread_id);
+ else
+ i_ret = pthread_join (p_priv->thread_id, NULL);
#endif
if( i_ret )
{
- msg_Err( p_this, "thread_join(%u) failed at %s:%d (%s)",
- (unsigned int)p_this->thread_id, psz_file, i_line,
- strerror(i_ret) );
+ errno = i_ret;
+ msg_Err( p_this, "thread_join(%u) failed at %s:%d (%m)",
+ (unsigned int)p_priv->thread_id, psz_file, i_line );
}
else
{
msg_Dbg( p_this, "thread %u joined (%s:%d)",
- (unsigned int)p_this->thread_id, psz_file, i_line );
+ (unsigned int)p_priv->thread_id, psz_file, i_line );
}
- p_this->b_thread = 0;
+#endif
+
+ p_priv->b_thread = false;
}
projects / vlc / blobdiff