X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fthreads.c;h=ffd09f683f92708df4529114a33db85edaaee465;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=3b0e054813387472323cedd99076efa8ec38fd91;hpb=7ff7896fe05363cb13db1d3b3dfbd313df7cc63e;p=vlc diff --git a/src/misc/threads.c b/src/misc/threads.c index 3b0e054813..ffd09f683f 100644 --- a/src/misc/threads.c +++ b/src/misc/threads.c @@ -26,7 +26,6 @@ #include -#include #include "libvlc.h" #define VLC_THREADS_UNINITIALIZED 0 @@ -497,7 +496,7 @@ int __vlc_cond_destroy( const char * psz_file, int i_line, vlc_cond_t *p_condvar || !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; @@ -564,52 +563,59 @@ int __vlc_thread_create( vlc_object_t *p_this, const char * psz_file, int i_line { 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 __APPLE__ if( config_GetInt( p_this, "rt-priority" ) ) @@ -633,7 +639,7 @@ int __vlc_thread_create( vlc_object_t *p_this, const 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", @@ -649,7 +655,7 @@ int __vlc_thread_create( vlc_object_t *p_this, const char * psz_file, int i_line #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 @@ -662,11 +668,18 @@ int __vlc_thread_create( vlc_object_t *p_this, const char * psz_file, int i_line vlc_cond_wait( &p_this->object_wait, &p_this->object_lock ); } - p_this->b_thread = VLC_TRUE; + p_priv->b_thread = VLC_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 ); } @@ -687,18 +700,21 @@ int __vlc_thread_create( vlc_object_t *p_this, const char * psz_file, int i_line 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 __APPLE__ - 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; @@ -718,9 +734,9 @@ int __vlc_thread_set_priority( vlc_object_t *p_this, const 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", @@ -748,23 +764,40 @@ void __vlc_thread_ready( vlc_object_t *p_this ) *****************************************************************************/ void __vlc_thread_join( vlc_object_t *p_this, const char * psz_file, int i_line ) { - int i_ret = 0; - -#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 ); + vlc_object_internals_t *p_priv = p_this->p_internals; -#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; + 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( p_this->thread_id, INFINITE ); + 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 @@ -775,7 +808,7 @@ void __vlc_thread_join( vlc_object_t *p_this, const char * psz_file, int i_line GetProcAddress( hmodule, _T("GetThreadTimes") ); if( OurGetThreadTimes && - OurGetThreadTimes( p_this->thread_id, + OurGetThreadTimes( hThread, &create_ft, &exit_ft, &kernel_ft, &user_ft ) ) { real_time = @@ -800,17 +833,27 @@ void __vlc_thread_join( vlc_object_t *p_this, const char * psz_file, int i_line user_time/60/1000000, (double)((user_time%(60*1000000))/1000000.0) ); } - CloseHandle( p_this->thread_id ); + CloseHandle( hThread ); + +#else /* !defined(WIN32) */ + + 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 ) 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 @@ -818,15 +861,17 @@ void __vlc_thread_join( vlc_object_t *p_this, const char * psz_file, int i_line 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, + (unsigned int)p_priv->thread_id, psz_file, i_line, strerror(i_ret) ); } 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 = VLC_FALSE; +#endif + + p_priv->b_thread = VLC_FALSE; }