* 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 "libvlc.h"
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 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;
+#ifndef NDEBUG
/*****************************************************************************
* vlc_threads_error: Report an error from the threading mecanism
*****************************************************************************
* This is especially useful to debug those errors, as this is a nice symbol
* on which you can break.
*****************************************************************************/
-void
-__vlc_threads_error( vlc_object_t *p_this )
+void vlc_threads_error( vlc_object_t *p_this )
{
msg_Err( p_this, "Error detected. Put a breakpoint in '%s' to debug.",
__func__ );
}
+#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() )
{
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 )
/* 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 );
-
-#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 )
}
#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 );
/* 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 )
vlc_object_destroy( p_root );
}
-#if defined( PTH_INIT_IN_PTH_H )
- if( i_initializations == 0 )
- {
- return ( pth_kill() == FALSE );
- }
-
-#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 )
{
- assert( p_this );
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)
+#elif defined( LIBVLC_USE_PTHREAD )
+# ifndef NDEBUG
{
/* Create error-checking mutex to detect problems more easily. */
pthread_mutexattr_t 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
}
/* Create mutex returns a recursive mutex */
p_mutex->mutex = CreateMutex( 0, FALSE, 0 );
return ( p_mutex->mutex != NULL ? 0 : 1 );
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+#elif defined( LIBVLC_USE_PTHREAD )
pthread_mutexattr_t attr;
int i_result;
pthread_mutexattr_init( &attr );
-# if defined(DEBUG)
+# ifndef NDEBUG
/* Create error-checking mutex to detect problems more easily. */
# if defined(SYS_LINUX)
pthread_mutexattr_setkind_np( &attr, PTHREAD_MUTEX_ERRORCHECK_NP );
/* In case of error : */
int i_thread = -1;
-#if defined( PTH_INIT_IN_PTH_H )
- return 0;
-
-#elif defined( ST_INIT_IN_ST_H )
- i_result = st_mutex_destroy( p_mutex->mutex );
-
-#elif defined( UNDER_CE )
+#if defined( UNDER_CE )
DeleteCriticalSection( &p_mutex->csection );
return 0;
p_mutex->init = 0;
return B_OK;
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+#elif defined( LIBVLC_USE_PTHREAD )
i_result = pthread_mutex_destroy( &p_mutex->mutex );
if( i_result )
{
errno = i_result;
}
-#elif defined( HAVE_CTHREADS_H )
- return 0;
-
#endif
if( i_result )
{
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 )
+#elif defined( LIBVLC_USE_PTHREAD )
pthread_condattr_t attr;
int ret;
pthread_condattr_destroy (&attr);
return 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;
-
- return 0;
-
#endif
}
/* In case of error : */
int i_thread = -1;
-#if defined( PTH_INIT_IN_PTH_H )
- return 0;
-
-#elif defined( ST_INIT_IN_ST_H )
- i_result = st_cond_destroy( p_condvar->cond );
-
-#elif defined( UNDER_CE )
+#if defined( UNDER_CE )
i_result = !CloseHandle( p_condvar->event );
#elif defined( WIN32 )
p_condvar->init = 0;
return 0;
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+#elif defined( LIBVLC_USE_PTHREAD )
i_result = pthread_cond_destroy( &p_condvar->cond );
if( i_result )
{
errno = i_result;
}
-#elif defined( HAVE_CTHREADS_H )
- return 0;
-
#endif
if( i_result )
{
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 )
+
+#if 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 );
#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;
}
vlc_mutex_lock( &p_this->object_lock );
-#if defined( PTH_INIT_IN_PTH_H )
- p_priv->thread_id = pth_spawn( PTH_ATTR_DEFAULT, func, p_data );
- i_ret = p_priv->thread_id == NULL;
-
-#elif defined( ST_INIT_IN_ST_H )
- p_priv->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 )
{
/* When using the MSVCRT C library you have to use the _beginthreadex
* function instead of CreateThread, otherwise you'll end up with
#endif
p_priv->thread_id.id = (DWORD)threadId;
p_priv->thread_id.hThread = (HANDLE)hThread;
- ResumeThread((HANDLE)hThread);
+ ResumeThread((HANDLE)hThread);
}
i_ret = ( p_priv->thread_id.hThread ? 0 : 1 );
- if( i_ret && i_priority )
+ if( !i_ret && i_priority )
{
if( !SetThreadPriority(p_priv->thread_id.hThread, i_priority) )
{
i_priority, p_data );
i_ret = resume_thread( p_priv->thread_id );
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+#elif defined( LIBVLC_USE_PTHREAD )
i_ret = pthread_create( &p_priv->thread_id, NULL, func, p_data );
#ifndef __APPLE__
}
#endif
-#elif defined( HAVE_CTHREADS_H )
- p_priv->thread_id = cthread_fork( (cthread_fn_t)func, (any_t)p_data );
- i_ret = 0;
-
#endif
if( i_ret == 0 )
int i_line, int i_priority )
{
vlc_object_internals_t *p_priv = p_this->p_internals;
-#if defined( PTH_INIT_IN_PTH_H ) || defined( ST_INIT_IN_ST_H )
-#elif defined( WIN32 ) || defined( UNDER_CE )
+#if defined( WIN32 ) || defined( UNDER_CE )
if( !p_priv->thread_id.hThread )
p_priv->thread_id.hThread = GetCurrentThread();
if( !SetThreadPriority(p_priv->thread_id.hThread, i_priority) )
return 1;
}
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+#elif defined( LIBVLC_USE_PTHREAD )
# ifndef __APPLE__
if( config_GetInt( p_this, "rt-priority" ) > 0 )
# endif
int i_ret = 0;
-#if defined( PTH_INIT_IN_PTH_H )
- i_ret = ( pth_join( p_priv->thread_id, NULL ) == FALSE );
-
-#elif defined( ST_INIT_IN_ST_H )
- i_ret = st_thread_join( p_priv->thread_id, NULL );
-
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
+#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( PTHREAD_COND_T_IN_PTHREAD_H )
+#elif defined( LIBVLC_USE_PTHREAD )
i_ret = pthread_join( p_priv->thread_id, NULL );
-#elif defined( HAVE_CTHREADS_H )
- cthread_join( p_priv->thread_id );
- i_ret = 1;
-
#endif
if( i_ret )
projects / vlc / blobdiff