X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fthreads.c;h=06d4d14e7f4b59d07977c0f71b44142672803cd6;hb=56040f0bb0de6f862deb28bcd62a1373403a6ce8;hp=33d3a0dd09758766357f2d5ab35cdf3e5937c16a;hpb=67c7d4fe76892819e8dc808ebe058d480099cf5b;p=vlc diff --git a/src/misc/threads.c b/src/misc/threads.c index 33d3a0dd09..06d4d14e7f 100644 --- a/src/misc/threads.c +++ b/src/misc/threads.c @@ -1,12 +1,13 @@ /***************************************************************************** * threads.c : threads implementation for the VideoLAN client ***************************************************************************** - * Copyright (C) 1999-2004 VideoLAN + * Copyright (C) 1999-2007 the VideoLAN team * $Id$ * * Authors: Jean-Marc Dressler * Samuel Hocevar * Gildas Bazin + * Clément Sténac * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,12 +21,13 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ #include #include +#include "libvlc.h" #define VLC_THREADS_UNINITIALIZED 0 #define VLC_THREADS_PENDING 1 @@ -35,30 +37,42 @@ /***************************************************************************** * 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 ) + +/* following is only available on NT/2000/XP and above */ +static SIGNALOBJECTANDWAIT pf_SignalObjectAndWait = NULL; + +/* +** 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 vlc_bool_t b_fast_mutex = VLC_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 ) - static pthread_mutex_t once_mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t once_mutex = PTHREAD_MUTEX_INITIALIZER; #elif defined( HAVE_CTHREADS_H ) #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_threadvar_t msg_context_global_key; /***************************************************************************** * vlc_threads_init: initialize threads system @@ -69,9 +83,7 @@ struct vlc_namedmutex_t *****************************************************************************/ 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; + libvlc_global_data_t *p_libvlc_global = (libvlc_global_data_t *)p_this; int i_ret = VLC_SUCCESS; /* If we have lazy mutex initialization, use it. Otherwise, we just @@ -80,7 +92,12 @@ int __vlc_threads_init( vlc_object_t *p_this ) #elif defined( ST_INIT_IN_ST_H ) #elif defined( UNDER_CE ) #elif defined( WIN32 ) - HINSTANCE hInstLib; + if( IsDebuggerPresent() ) + { + /* SignalObjectAndWait() is problematic under a debugger */ + b_fast_mutex = VLC_TRUE; + i_win9x_cv = 1; + } #elif defined( HAVE_KERNEL_SCHEDULER_H ) #elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) pthread_mutex_lock( &once_mutex ); @@ -92,7 +109,7 @@ int __vlc_threads_init( vlc_object_t *p_this ) i_status = VLC_THREADS_PENDING; /* We should be safe now. Do all the initialization stuff we want. */ - p_libvlc->b_ready = VLC_FALSE; + p_libvlc_global->b_ready = VLC_FALSE; #if defined( PTH_INIT_IN_PTH_H ) i_ret = ( pth_init() == FALSE ); @@ -107,29 +124,26 @@ int __vlc_threads_init( vlc_object_t *p_this ) /* 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->SignalObjectAndWait = + pf_SignalObjectAndWait = (SIGNALOBJECTANDWAIT)GetProcAddress( hInstLib, "SignalObjectAndWait" ); } } - else - { - p_libvlc->SignalObjectAndWait = NULL; - } - - 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 ) #endif - vlc_object_create( p_libvlc, VLC_OBJECT_ROOT ); + p_root = vlc_object_create( p_libvlc_global, VLC_OBJECT_GLOBAL ); + if( p_root == NULL ) + i_ret = VLC_ENOMEM; if( i_ret ) { @@ -140,6 +154,8 @@ int __vlc_threads_init( vlc_object_t *p_this ) i_initializations++; i_status = VLC_THREADS_READY; } + + vlc_threadvar_create( p_root, &msg_context_global_key ); } else { @@ -176,38 +192,44 @@ int __vlc_threads_init( vlc_object_t *p_this ) /***************************************************************************** * 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 ) { + (void)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 ) - i_initializations--; - #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--; - #endif return VLC_SUCCESS; } @@ -235,8 +257,7 @@ int __vlc_mutex_init( vlc_object_t *p_this, vlc_mutex_t *p_mutex ) * 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_libvlc->SignalObjectAndWait && - !p_this->p_libvlc->b_fast_mutex ) + if( pf_SignalObjectAndWait && !b_fast_mutex ) { /* We are running on NT/2K/XP, we can use SignalObjectAndWait */ p_mutex->mutex = CreateMutex( 0, FALSE, 0 ); @@ -296,7 +317,7 @@ int __vlc_mutex_init( vlc_object_t *p_this, vlc_mutex_t *p_mutex ) /***************************************************************************** * vlc_mutex_destroy: destroy a mutex, inner version *****************************************************************************/ -int __vlc_mutex_destroy( char * psz_file, int i_line, vlc_mutex_t *p_mutex ) +int __vlc_mutex_destroy( const char * psz_file, int i_line, vlc_mutex_t *p_mutex ) { int i_result; /* In case of error : */ @@ -335,9 +356,9 @@ int __vlc_mutex_destroy( char * psz_file, int i_line, vlc_mutex_t *p_mutex ) #elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) i_result = pthread_mutex_destroy( &p_mutex->mutex ); - if ( i_result ) + if( i_result ) { - i_thread = (int)pthread_self(); + i_thread = CAST_PTHREAD_TO_INT(pthread_self()); psz_error = strerror(i_result); } @@ -385,10 +406,10 @@ int __vlc_cond_init( vlc_object_t *p_this, vlc_cond_t *p_condvar ) p_condvar->i_waiting_threads = 0; /* Misc init */ - p_condvar->i_win9x_cv = p_this->p_libvlc->i_win9x_cv; - p_condvar->SignalObjectAndWait = p_this->p_libvlc->SignalObjectAndWait; + p_condvar->i_win9x_cv = i_win9x_cv; + p_condvar->SignalObjectAndWait = pf_SignalObjectAndWait; - if( (p_condvar->SignalObjectAndWait && !p_this->p_libvlc->b_fast_mutex) + if( (p_condvar->SignalObjectAndWait && !b_fast_mutex) || p_condvar->i_win9x_cv == 0 ) { /* Create an auto-reset event. */ @@ -452,7 +473,7 @@ int __vlc_cond_init( vlc_object_t *p_this, vlc_cond_t *p_condvar ) /***************************************************************************** * vlc_cond_destroy: destroy a condition, inner version *****************************************************************************/ -int __vlc_cond_destroy( char * psz_file, int i_line, vlc_cond_t *p_condvar ) +int __vlc_cond_destroy( const char * psz_file, int i_line, vlc_cond_t *p_condvar ) { int i_result; /* In case of error : */ @@ -475,15 +496,18 @@ int __vlc_cond_destroy( char * psz_file, int i_line, vlc_cond_t *p_condvar ) i_result = !CloseHandle( p_condvar->event ) || !CloseHandle( p_condvar->semaphore ); + if( p_condvar->semaphore != NULL ) + 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 ) + if( i_result ) { - i_thread = (int)pthread_self(); + i_thread = CAST_PTHREAD_TO_INT(pthread_self()); psz_error = strerror(i_result); } @@ -501,75 +525,112 @@ int __vlc_cond_destroy( char * psz_file, int i_line, vlc_cond_t *p_condvar ) 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 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 ); +#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 ) + 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_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 * ), +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_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; + 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_this->thread_id = st_thread_create( func, p_data, 1, 0 ); + p_priv->thread_id = st_thread_create( func, p_data, 1, 0 ); i_ret = 0; #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 (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 ); + i_ret = pthread_create( &p_priv->thread_id, NULL, func, p_data ); -#ifndef SYS_DARWIN - if ( config_GetInt( p_this, "rt-priority" ) ) +#ifndef __APPLE__ + if( config_GetInt( p_this, "rt-priority" ) ) #endif { int i_error, i_policy; struct sched_param param; memset( ¶m, 0, sizeof(struct sched_param) ); - i_priority += config_GetInt( p_this, "rt-offset" ); - if ( i_priority <= 0 ) + if( config_GetType( p_this, "rt-offset" ) ) + { + i_priority += config_GetInt( p_this, "rt-offset" ); + } + if( i_priority <= 0 ) { param.sched_priority = (-1) * i_priority; i_policy = SCHED_OTHER; @@ -579,7 +640,7 @@ int __vlc_thread_create( vlc_object_t *p_this, char * psz_file, int i_line, 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", @@ -587,13 +648,15 @@ int __vlc_thread_create( vlc_object_t *p_this, char * psz_file, int i_line, i_priority = 0; } } +#ifndef __APPLE__ else { i_priority = 0; } +#endif #elif defined( HAVE_CTHREADS_H ) - p_this->thread_id = cthread_fork( (cthread_fn_t)func, (any_t)p_data ); + p_priv->thread_id = cthread_fork( (cthread_fn_t)func, (any_t)p_data ); i_ret = 0; #endif @@ -606,23 +669,25 @@ int __vlc_thread_create( vlc_object_t *p_this, char * psz_file, int i_line, vlc_cond_wait( &p_this->object_wait, &p_this->object_lock ); } - p_this->b_thread = 1; + p_priv->b_thread = VLC_TRUE; - msg_Dbg( p_this, "thread %d (%s) created at priority %d (%s:%d)", - (int)p_this->thread_id, psz_name, i_priority, +#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_priv->thread_id, psz_name, i_priority, psz_file, i_line ); +#endif + 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 ); } @@ -633,28 +698,34 @@ int __vlc_thread_create( vlc_object_t *p_this, char * psz_file, int i_line, * 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 __vlc_thread_set_priority( vlc_object_t *p_this, const char * psz_file, 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 ( !SetThreadPriority(GetCurrentThread(), i_priority) ) + 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 SYS_DARWIN - if ( config_GetInt( p_this, "rt-priority" ) ) -#endif +# ifndef __APPLE__ + if( config_GetInt( p_this, "rt-priority" ) > 0 ) +# endif { int i_error, i_policy; struct sched_param param; memset( ¶m, 0, sizeof(struct sched_param) ); - i_priority += config_GetInt( p_this, "rt-offset" ); - if ( i_priority <= 0 ) + if( config_GetType( p_this, "rt-offset" ) ) + { + i_priority += config_GetInt( p_this, "rt-offset" ); + } + if( i_priority <= 0 ) { param.sched_priority = (-1) * i_priority; i_policy = SCHED_OTHER; @@ -664,9 +735,9 @@ int __vlc_thread_set_priority( vlc_object_t *p_this, char * psz_file, 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", @@ -692,50 +763,116 @@ void __vlc_thread_ready( vlc_object_t *p_this ) /***************************************************************************** * vlc_thread_join: wait until a thread exits, inner version *****************************************************************************/ -void __vlc_thread_join( vlc_object_t *p_this, char * psz_file, int i_line ) +void __vlc_thread_join( vlc_object_t *p_this, const char * psz_file, int i_line ) { + vlc_object_internals_t *p_priv = p_this->p_internals; + +#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; + 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 (%s)", + (unsigned int)p_priv->thread_id.id, + psz_file, i_line, GetLastError() ); + p_priv->b_thread = VLC_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 + hmodule = GetModuleHandle( _T("KERNEL32") ); +#endif + OurGetThreadTimes = (BOOL (WINAPI*)( HANDLE, FILETIME*, FILETIME*, + FILETIME*, FILETIME* )) + GetProcAddress( hmodule, _T("GetThreadTimes") ); + + if( OurGetThreadTimes && + OurGetThreadTimes( hThread, + &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( hThread ); + +#else /* !defined(WIN32) */ + int i_ret = 0; #if defined( PTH_INIT_IN_PTH_H ) - i_ret = ( pth_join( p_this->thread_id, NULL ) == FALSE ); + i_ret = ( pth_join( p_priv->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 ) - WaitForSingleObject( p_this->thread_id, INFINITE ); - CloseHandle( p_this->thread_id ); + i_ret = st_thread_join( p_priv->thread_id, NULL ); #elif defined( HAVE_KERNEL_SCHEDULER_H ) int32_t exit_value; - wait_for_thread( p_this->thread_id, &exit_value ); + i_ret = (B_OK == wait_for_thread( p_priv->thread_id, &exit_value )); #elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) - i_ret = pthread_join( p_this->thread_id, NULL ); + i_ret = pthread_join( p_priv->thread_id, NULL ); #elif defined( HAVE_CTHREADS_H ) - cthread_join( p_this->thread_id ); + cthread_join( p_priv->thread_id ); i_ret = 1; #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_priv->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)", - (int)p_this->thread_id, psz_file, i_line ); + msg_Dbg( p_this, "thread %u joined (%s:%d)", + (unsigned int)p_priv->thread_id, psz_file, i_line ); } - p_this->b_thread = 0; +#endif + + p_priv->b_thread = VLC_FALSE; }