/*****************************************************************************
* threads.c : threads implementation for the VideoLAN client
*****************************************************************************
- * Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
- * $Id: threads.c,v 1.41 2003/08/28 17:19:41 sam Exp $
+ * Copyright (C) 1999-2004 VideoLAN
+ * $Id$
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
/*****************************************************************************
* Global mutex for lazy initialization of the threads system
*****************************************************************************/
-static volatile int i_initializations = 0;
+static volatile unsigned i_initializations = 0;
+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 )
#elif defined( WIN32 )
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
static pthread_mutex_t once_mutex = PTHREAD_MUTEX_INITIALIZER;
#elif defined( HAVE_CTHREADS_H )
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
#endif
/*****************************************************************************
*****************************************************************************/
int __vlc_threads_init( vlc_object_t *p_this )
{
- static volatile int i_status = VLC_THREADS_UNINITIALIZED;
-
libvlc_t *p_libvlc = (libvlc_t *)p_this;
int i_ret = VLC_SUCCESS;
#elif defined( ST_INIT_IN_ST_H )
#elif defined( UNDER_CE )
#elif defined( WIN32 )
- HINSTANCE hInstLib;
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
pthread_mutex_lock( &once_mutex );
#elif defined( HAVE_CTHREADS_H )
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
#endif
if( i_status == VLC_THREADS_UNINITIALIZED )
/* Dynamically get the address of SignalObjectAndWait */
if( GetVersion() < 0x80000000 )
{
+ HINSTANCE hInstLib;
+
/* We are running on NT/2K/XP, we can use SignalObjectAndWait */
hInstLib = LoadLibrary( "kernel32" );
if( hInstLib )
p_libvlc->b_fast_mutex = 0;
p_libvlc->i_win9x_cv = 0;
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
#elif defined( HAVE_CTHREADS_H )
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
#endif
- vlc_object_create( p_libvlc, VLC_OBJECT_ROOT );
+ p_root = vlc_object_create( p_libvlc, VLC_OBJECT_ROOT );
+ if( p_root == NULL )
+ i_ret = VLC_ENOMEM;
if( i_ret )
{
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 )
pthread_mutex_unlock( &once_mutex );
#elif defined( HAVE_CTHREADS_H )
while( i_status == VLC_THREADS_PENDING ) msleep( THREAD_SLEEP );
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
- while( i_status == VLC_THREADS_PENDING ) msleep( THREAD_SLEEP );
#endif
if( i_status != VLC_THREADS_READY )
/*****************************************************************************
* vlc_threads_end: stop threads system
*****************************************************************************
- * FIXME: This function is far from being threadsafe. We should undo exactly
- * what we did above in vlc_threads_init.
+ * FIXME: This function is far from being threadsafe.
*****************************************************************************/
int __vlc_threads_end( vlc_object_t *p_this )
{
#if defined( PTH_INIT_IN_PTH_H )
+#elif defined( ST_INIT_IN_ST_H )
+#elif defined( UNDER_CE )
+#elif defined( WIN32 )
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+ pthread_mutex_lock( &once_mutex );
+#elif defined( HAVE_CTHREADS_H )
+#endif
+
+ if( i_initializations == 0 )
+ return VLC_EGENERIC;
+
i_initializations--;
+ 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 );
}
#elif defined( ST_INIT_IN_ST_H )
- i_initializations--;
-
#elif defined( UNDER_CE )
- i_initializations--;
-
#elif defined( WIN32 )
- i_initializations--;
-
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
- pthread_mutex_lock( &once_mutex );
- i_initializations--;
pthread_mutex_unlock( &once_mutex );
-
#elif defined( HAVE_CTHREADS_H )
- i_initializations--;
-
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
- i_initializations--;
-
#endif
return VLC_SUCCESS;
}
return 0;
}
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
-# if defined(DEBUG) && defined(SYS_LINUX)
- {
- /* 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->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 )
p_mutex->init = 9999;
return B_OK;
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+# if defined(DEBUG) && defined(SYS_LINUX)
+ {
+ /* 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->mutex, NULL );
+
+#elif defined( HAVE_CTHREADS_H )
+ mutex_init( p_mutex );
+ return 0;
+
#endif
}
}
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 )
#elif defined( HAVE_CTHREADS_H )
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;
#endif
if( i_result )
return !p_condvar->semaphore || !p_condvar->event;
}
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
- return pthread_cond_init( &p_condvar->cond, NULL );
-
-#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;
-
#elif defined( HAVE_KERNEL_SCHEDULER_H )
if( !p_condvar )
{
p_condvar->thread = -1;
p_condvar->init = 9999;
return 0;
+
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+ return pthread_cond_init( &p_condvar->cond, NULL );
+
+#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
}
i_result = !CloseHandle( p_condvar->event )
|| !CloseHandle( p_condvar->semaphore );
+#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 )
#elif defined( HAVE_CTHREADS_H )
return 0;
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
- p_condvar->init = 0;
- return 0;
#endif
if( i_result )
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,
+ i_priority, p_data );
+ i_ret = resume_thread( p_this->thread_id );
+
#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
i_ret = pthread_create( &p_this->thread_id, NULL, func, p_data );
-#ifdef SYS_DARWIN
- if ( i_priority )
+#ifndef SYS_DARWIN
+ if ( config_GetInt( p_this, "rt-priority" ) )
+#endif
{
int i_error, i_policy;
struct sched_param param;
+
memset( ¶m, 0, sizeof(struct sched_param) );
- if ( i_priority < 0 )
+ i_priority += config_GetInt( p_this, "rt-offset" );
+ if ( i_priority <= 0 )
{
param.sched_priority = (-1) * i_priority;
i_policy = SCHED_OTHER;
i_priority = 0;
}
}
+#ifndef SYS_DARWIN
+ else
+ {
+ 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;
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
- p_this->thread_id = spawn_thread( (thread_func)func, psz_name,
- i_priority, p_data );
- i_ret = resume_thread( p_this->thread_id );
-
#endif
if( i_ret == 0 )
p_this->b_thread = 1;
- msg_Dbg( p_this, "thread %d (%s) created at priority %d (%s:%d)",
- (int)p_this->thread_id, psz_name, i_priority,
+ msg_Dbg( p_this, "thread %u (%s) created at priority %d (%s:%d)",
+ (unsigned int)p_this->thread_id, psz_name, i_priority,
psz_file, i_line );
vlc_mutex_unlock( &p_this->object_lock );
}
#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
-
-#ifdef SYS_DARWIN
- if ( i_priority )
+#ifndef SYS_DARWIN
+ if ( config_GetInt( p_this, "rt-priority" ) )
+#endif
{
int i_error, i_policy;
struct sched_param param;
+
memset( ¶m, 0, sizeof(struct sched_param) );
- if ( i_priority < 0 )
+ i_priority += config_GetInt( p_this, "rt-offset" );
+ if ( i_priority <= 0 )
{
param.sched_priority = (-1) * i_priority;
i_policy = SCHED_OTHER;
param.sched_priority = i_priority;
i_policy = SCHED_RR;
}
- if ( (i_error = pthread_setschedparam( pthread_self(),
+ if ( !p_this->thread_id )
+ p_this->thread_id = pthread_self();
+ if ( (i_error = pthread_setschedparam( p_this->thread_id,
i_policy, ¶m )) )
{
- msg_Warn( p_this, "couldn't set thread priority (%s:%d): %s",
+ 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;
#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( 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;
-#elif defined( WIN32 )
WaitForSingleObject( p_this->thread_id, INFINITE );
+#if defined( UNDER_CE )
+ hmodule = GetModuleHandle( _T("COREDLL") );
+#else
+ hmodule = GetModuleHandle( _T("KERNEL32") );
+#endif
+ OurGetThreadTimes = (BOOL (WINAPI*)( HANDLE, FILETIME*, FILETIME*,
+ FILETIME*, FILETIME* ))
+ GetProcAddress( hmodule, _T("GetThreadTimes") );
+
+ if( OurGetThreadTimes &&
+ OurGetThreadTimes( p_this->thread_id,
+ &create_ft, &exit_ft, &kernel_ft, &user_ft ) )
+ {
+ real_time =
+ ((((int64_t)exit_ft.dwHighDateTime)<<32)| exit_ft.dwLowDateTime) -
+ ((((int64_t)create_ft.dwHighDateTime)<<32)| create_ft.dwLowDateTime);
+ real_time /= 10;
+
+ kernel_time =
+ ((((int64_t)kernel_ft.dwHighDateTime)<<32)|
+ kernel_ft.dwLowDateTime) / 10;
+
+ user_time =
+ ((((int64_t)user_ft.dwHighDateTime)<<32)|
+ user_ft.dwLowDateTime) / 10;
+
+ msg_Dbg( p_this, "thread times: "
+ "real "I64Fd"m%fs, kernel "I64Fd"m%fs, user "I64Fd"m%fs",
+ real_time/60/1000000,
+ (double)((real_time%(60*1000000))/1000000.0),
+ kernel_time/60/1000000,
+ (double)((kernel_time%(60*1000000))/1000000.0),
+ user_time/60/1000000,
+ (double)((user_time%(60*1000000))/1000000.0) );
+ }
+ CloseHandle( p_this->thread_id );
+
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
+ int32_t exit_value;
+ wait_for_thread( p_this->thread_id, &exit_value );
+
#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
i_ret = pthread_join( p_this->thread_id, NULL );
cthread_join( p_this->thread_id );
i_ret = 1;
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
- int32 exit_value;
- wait_for_thread( p_this->thread_id, &exit_value );
-
#endif
if( i_ret )
{
#ifdef HAVE_STRERROR
- msg_Err( p_this, "thread_join(%d) failed at %s:%d (%s)",
- (int)p_this->thread_id, psz_file, i_line,
+ 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) );
#else
- msg_Err( p_this, "thread_join(%d) failed at %s:%d",
- (int)p_this->thread_id, psz_file, i_line );
+ msg_Err( p_this, "thread_join(%u) failed at %s:%d",
+ (unsigned int)p_this->thread_id, psz_file, i_line );
#endif
}
else
{
- msg_Dbg( p_this, "thread %d joined (%s:%d)",
- (int)p_this->thread_id, psz_file, i_line );
+ msg_Dbg( p_this, "thread %u joined (%s:%d)",
+ (unsigned int)p_this->thread_id, psz_file, i_line );
}
p_this->b_thread = 0;
projects / vlc / blobdiff