X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fthreads.c;h=9cac384deb65caebc5a68ef1508e18699abf5e15;hb=848489c3863b1b7ddbe542aa3e746063722b9280;hp=8b0b3b9e5629a584f6a42f9760fb2cca2b1d3504;hpb=38276a4632c98f6e98186adbb1a1538168e1a697;p=vlc diff --git a/src/misc/threads.c b/src/misc/threads.c index 8b0b3b9e56..9cac384deb 100644 --- a/src/misc/threads.c +++ b/src/misc/threads.c @@ -28,13 +28,14 @@ # include "config.h" #endif -#include +#include #include "libvlc.h" #include #ifdef HAVE_UNISTD_H # include #endif +#include #define VLC_THREADS_UNINITIALIZED 0 #define VLC_THREADS_PENDING 1 @@ -46,10 +47,9 @@ *****************************************************************************/ static volatile unsigned i_initializations = 0; -#if defined( UNDER_CE ) -#elif defined( WIN32 ) -#elif defined( HAVE_KERNEL_SCHEDULER_H ) -#elif defined( LIBVLC_USE_PTHREAD ) +#if defined( LIBVLC_USE_PTHREAD ) +# include + static pthread_mutex_t once_mutex = PTHREAD_MUTEX_INITIALIZER; #endif @@ -65,6 +65,17 @@ libvlc_global_data_t *vlc_global( void ) return p_root; } +#ifndef NDEBUG +/** + * Object running the current thread + */ +static vlc_threadvar_t thread_object_key; + +vlc_object_t *vlc_threadobj (void) +{ + return vlc_threadvar_get (&thread_object_key); +} +#endif vlc_threadvar_t msg_context_global_key; @@ -76,6 +87,9 @@ static inline unsigned long vlc_threadid (void) return v.i; } +#if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) +# include +#endif /***************************************************************************** * vlc_thread_fatal: Report an error from the threading layer @@ -87,14 +101,13 @@ void vlc_pthread_fatal (const char *action, int error, { 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"); + fprintf (stderr, " Error message: %m at:\n"); #else char buf[1000]; const char *msg; @@ -113,13 +126,25 @@ void vlc_pthread_fatal (const char *action, int error, } fprintf (stderr, " Error message: %s\n", msg); #endif - fflush (stderr); + +#ifdef HAVE_BACKTRACE + void *stack[20]; + int len = backtrace (stack, sizeof (stack) / sizeof (stack[0])); + backtrace_symbols_fd (stack, len, 2); +#endif + abort (); } +#else +void vlc_pthread_fatal (const char *action, int error, + const char *file, unsigned line) +{ + (void)action; (void)error; (void)file; (void)line; + abort(); +} #endif - /***************************************************************************** * vlc_threads_init: initialize threads system ***************************************************************************** @@ -133,16 +158,13 @@ int vlc_threads_init( void ) /* If we have lazy mutex initialization, use it. Otherwise, we just * hope nothing wrong happens. */ -#if defined( UNDER_CE ) -#elif defined( WIN32 ) -#elif defined( HAVE_KERNEL_SCHEDULER_H ) -#elif defined( LIBVLC_USE_PTHREAD ) +#if defined( LIBVLC_USE_PTHREAD ) pthread_mutex_lock( &once_mutex ); #endif if( i_initializations == 0 ) { - p_root = vlc_custom_create( NULL, sizeof( *p_root ), + p_root = vlc_custom_create( (vlc_object_t *)NULL, sizeof( *p_root ), VLC_OBJECT_GENERIC, "root" ); if( p_root == NULL ) { @@ -151,18 +173,17 @@ int vlc_threads_init( void ) } /* We should be safe now. Do all the initialization stuff we want. */ - p_root->b_ready = false; - vlc_threadvar_create( p_root, &msg_context_global_key ); +#ifndef NDEBUG + vlc_threadvar_create( &thread_object_key, NULL ); +#endif + vlc_threadvar_create( &msg_context_global_key, msg_StackDestroy ); } i_initializations++; out: /* If we have lazy mutex initialization support, unlock the mutex. * Otherwize, we are screwed. */ -#if defined( UNDER_CE ) -#elif defined( WIN32 ) -#elif defined( HAVE_KERNEL_SCHEDULER_H ) -#elif defined( LIBVLC_USE_PTHREAD ) +#if defined( LIBVLC_USE_PTHREAD ) pthread_mutex_unlock( &once_mutex ); #endif @@ -176,28 +197,29 @@ out: *****************************************************************************/ void vlc_threads_end( void ) { -#if defined( UNDER_CE ) -#elif defined( WIN32 ) -#elif defined( HAVE_KERNEL_SCHEDULER_H ) -#elif defined( LIBVLC_USE_PTHREAD ) +#if defined( LIBVLC_USE_PTHREAD ) pthread_mutex_lock( &once_mutex ); #endif assert( i_initializations > 0 ); - if( i_initializations == 0 ) + + if( i_initializations == 1 ) + { vlc_object_release( p_root ); + vlc_threadvar_delete( &msg_context_global_key ); +#ifndef NDEBUG + vlc_threadvar_delete( &thread_object_key ); +#endif + } i_initializations--; -#if defined( UNDER_CE ) -#elif defined( WIN32 ) -#elif defined( HAVE_KERNEL_SCHEDULER_H ) -#elif defined( LIBVLC_USE_PTHREAD ) +#if defined( LIBVLC_USE_PTHREAD ) pthread_mutex_unlock( &once_mutex ); #endif } -#ifdef __linux__ -/* This is not prototyped under Linux, though it exists. */ +#if defined (__GLIBC__) && (__GLIBC_MINOR__ < 6) +/* This is not prototyped under glibc, though it exists. */ int pthread_mutexattr_setkind_np( pthread_mutexattr_t *attr, int kind ); #endif @@ -206,7 +228,24 @@ int pthread_mutexattr_setkind_np( pthread_mutexattr_t *attr, int kind ); *****************************************************************************/ int vlc_mutex_init( vlc_mutex_t *p_mutex ) { -#if defined( UNDER_CE ) +#if 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 (__GLIBC__) && (__GLIBC_MINOR__ < 6) + pthread_mutexattr_setkind_np( &attr, PTHREAD_MUTEX_ERRORCHECK_NP ); +# else + pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_ERRORCHECK ); +# endif +# endif + i_result = pthread_mutex_init( p_mutex, &attr ); + pthread_mutexattr_destroy( &attr ); + return i_result; +#elif defined( UNDER_CE ) InitializeCriticalSection( &p_mutex->csection ); return 0; @@ -235,23 +274,6 @@ int vlc_mutex_init( vlc_mutex_t *p_mutex ) p_mutex->init = 9999; return B_OK; -#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 - i_result = pthread_mutex_init( p_mutex, &attr ); - pthread_mutexattr_destroy( &attr ); - return i_result; #endif } @@ -260,27 +282,23 @@ int vlc_mutex_init( vlc_mutex_t *p_mutex ) *****************************************************************************/ int vlc_mutex_init_recursive( vlc_mutex_t *p_mutex ) { -#if defined( WIN32 ) - /* Create mutex returns a recursive mutex */ - *p_mutex = CreateMutex( 0, FALSE, 0 ); - return (*p_mutex != NULL) ? 0 : ENOMEM; -#elif defined( LIBVLC_USE_PTHREAD ) +#if 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 +# if defined (__GLIBC__) && (__GLIBC_MINOR__ < 6) + pthread_mutexattr_setkind_np( &attr, PTHREAD_MUTEX_RECURSIVE_NP ); +# else pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_RECURSIVE ); +# endif i_result = pthread_mutex_init( p_mutex, &attr ); pthread_mutexattr_destroy( &attr ); return( i_result ); +#elif defined( WIN32 ) + /* Create mutex returns a recursive mutex */ + *p_mutex = CreateMutex( 0, FALSE, 0 ); + return (*p_mutex != NULL) ? 0 : ENOMEM; #else # error Unimplemented! #endif @@ -292,7 +310,11 @@ int vlc_mutex_init_recursive( vlc_mutex_t *p_mutex ) *****************************************************************************/ void __vlc_mutex_destroy( const char * psz_file, int i_line, vlc_mutex_t *p_mutex ) { -#if defined( UNDER_CE ) +#if defined( LIBVLC_USE_PTHREAD ) + int val = pthread_mutex_destroy( p_mutex ); + VLC_THREAD_ASSERT ("destroying mutex"); + +#elif defined( UNDER_CE ) VLC_UNUSED( psz_file); VLC_UNUSED( i_line ); DeleteCriticalSection( &p_mutex->csection ); @@ -308,10 +330,6 @@ void __vlc_mutex_destroy( const char * psz_file, int i_line, vlc_mutex_t *p_mute p_mutex->init = 0; -#elif defined( LIBVLC_USE_PTHREAD ) - int val = pthread_mutex_destroy( p_mutex ); - VLC_THREAD_ASSERT ("destroying mutex"); - #endif } @@ -320,7 +338,28 @@ void __vlc_mutex_destroy( const char * psz_file, int i_line, vlc_mutex_t *p_mute *****************************************************************************/ int __vlc_cond_init( vlc_cond_t *p_condvar ) { -#if defined( UNDER_CE ) || defined( WIN32 ) +#if defined( LIBVLC_USE_PTHREAD ) + pthread_condattr_t attr; + int ret; + + ret = pthread_condattr_init (&attr); + if (ret) + return ret; + +# 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, &attr); + pthread_condattr_destroy (&attr); + return ret; + +#elif defined( UNDER_CE ) || defined( WIN32 ) /* Initialize counter */ p_condvar->i_waiting_threads = 0; @@ -346,27 +385,6 @@ int __vlc_cond_init( vlc_cond_t *p_condvar ) p_condvar->init = 9999; return 0; -#elif defined( LIBVLC_USE_PTHREAD ) - pthread_condattr_t attr; - int ret; - - ret = pthread_condattr_init (&attr); - if (ret) - return ret; - -# 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, &attr); - pthread_condattr_destroy (&attr); - return ret; - #endif } @@ -375,7 +393,11 @@ int __vlc_cond_init( vlc_cond_t *p_condvar ) *****************************************************************************/ void __vlc_cond_destroy( const char * psz_file, int i_line, vlc_cond_t *p_condvar ) { -#if defined( UNDER_CE ) || defined( WIN32 ) +#if defined( LIBVLC_USE_PTHREAD ) + int val = pthread_cond_destroy( p_condvar ); + VLC_THREAD_ASSERT ("destroying condition"); + +#elif defined( UNDER_CE ) || defined( WIN32 ) VLC_UNUSED( psz_file); VLC_UNUSED( i_line ); CloseHandle( p_condvar->event ); @@ -383,33 +405,76 @@ void __vlc_cond_destroy( const char * psz_file, int i_line, vlc_cond_t *p_condva #elif defined( HAVE_KERNEL_SCHEDULER_H ) p_condvar->init = 0; -#elif defined( LIBVLC_USE_PTHREAD ) - int val = pthread_cond_destroy( p_condvar ); - VLC_THREAD_ASSERT ("destroying condition"); - #endif } /***************************************************************************** * vlc_tls_create: create a thread-local variable *****************************************************************************/ -int __vlc_threadvar_create( vlc_threadvar_t *p_tls ) +int vlc_threadvar_create( vlc_threadvar_t *p_tls, void (*destr) (void *) ) { - int i_ret = -1; + int i_ret; -#if defined( HAVE_KERNEL_SCHEDULER_H ) -# error Unimplemented! +#if defined( LIBVLC_USE_PTHREAD ) + i_ret = pthread_key_create( p_tls, destr ); #elif defined( UNDER_CE ) + i_ret = ENOSYS; #elif defined( WIN32 ) *p_tls = TlsAlloc(); - i_ret = (*p_tls == INVALID_HANDLE_VALUE) ? EAGAIN : 0; - -#elif defined( LIBVLC_USE_PTHREAD ) - i_ret = pthread_key_create( p_tls, NULL ); + i_ret = (*p_tls == TLS_OUT_OF_INDEXES) ? EAGAIN : 0; +#else +# error Unimplemented! #endif return i_ret; } +void vlc_threadvar_delete (vlc_threadvar_t *p_tls) +{ +#if defined( LIBVLC_USE_PTHREAD ) + pthread_key_delete (*p_tls); +#elif defined( UNDER_CE ) +#elif defined( WIN32 ) + TlsFree (*p_tls); +#else +# error Unimplemented! +#endif +} + +struct vlc_thread_boot +{ + void * (*entry) (void *); + vlc_object_t *object; +}; + +#if defined (LIBVLC_USE_PTHREAD) +# define THREAD_RTYPE void * +# define THREAD_RVAL NULL +#elif defined (WIN32) +# define THREAD_RTYPE __stdcall unsigned +# define THREAD_RVAL 0 +#endif + +static THREAD_RTYPE thread_entry (void *data) +{ + vlc_object_t *obj = ((struct vlc_thread_boot *)data)->object; + void *(*func) (void *) = ((struct vlc_thread_boot *)data)->entry; + + free (data); +#ifndef NDEBUG + vlc_threadvar_set (&thread_object_key, obj); +#endif + msg_Dbg (obj, "thread started"); + func (obj); + msg_Dbg (obj, "thread ended"); + + libvlc_priv_t *libpriv = libvlc_priv (obj->p_libvlc); + vlc_mutex_lock (&libpriv->threads_lock); + if (--libpriv->threads_count == 0) + vlc_cond_signal (&libpriv->threads_wait); + vlc_mutex_unlock (&libpriv->threads_lock); + return THREAD_RVAL; +} + /***************************************************************************** * vlc_thread_create: create a thread, inner version ***************************************************************************** @@ -421,91 +486,102 @@ int __vlc_thread_create( vlc_object_t *p_this, const char * psz_file, int i_line int i_priority, bool b_wait ) { int i_ret; - void *p_data = (void *)p_this; vlc_object_internals_t *p_priv = vlc_internals( p_this ); + libvlc_priv_t *libpriv = libvlc_priv (p_this->p_libvlc); + + struct vlc_thread_boot *boot = malloc (sizeof (*boot)); + if (boot == NULL) + return errno; + boot->entry = func; + boot->object = p_this; + + vlc_mutex_lock (&libpriv->threads_lock); + libpriv->threads_count++; + vlc_mutex_unlock (&libpriv->threads_lock); + + vlc_object_lock( p_this ); + + /* Make sure we don't re-create a thread if the object has already one */ + assert( !p_priv->b_thread ); + +#if defined( LIBVLC_USE_PTHREAD ) + pthread_attr_t attr; + pthread_attr_init (&attr); + + /* Block the signals that signals interface plugin handles. + * If the LibVLC caller wants to handle some signals by itself, it should + * block these before whenever invoking LibVLC. And it must obviously not + * start the VLC signals interface plugin. + * + * LibVLC will normally ignore any interruption caused by an asynchronous + * signal during a system call. But there may well be some buggy cases + * where it fails to handle EINTR (bug reports welcome). Some underlying + * libraries might also not handle EINTR properly. + */ + sigset_t set, oldset; + sigemptyset (&set); + sigdelset (&set, SIGHUP); + sigaddset (&set, SIGINT); + sigaddset (&set, SIGQUIT); + sigaddset (&set, SIGTERM); + + sigaddset (&set, SIGPIPE); /* We don't want this one, really! */ + pthread_sigmask (SIG_BLOCK, &set, &oldset); - vlc_mutex_lock( &p_this->object_lock ); - -#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 - * memory leaks and the signal functions not working (see Microsoft - * Knowledge Base, article 104641) */ -#if defined( UNDER_CE ) - DWORD threadId; - HANDLE hThread = CreateThread( NULL, 0, (LPTHREAD_START_ROUTINE)func, - (LPVOID)p_data, CREATE_SUSPENDED, - &threadId ); -#else - unsigned threadId; - uintptr_t hThread = _beginthreadex( NULL, 0, - (LPTHREAD_START_ROUTINE)func, - (void*)p_data, CREATE_SUSPENDED, - &threadId ); +#ifndef __APPLE__ + if( config_GetInt( p_this, "rt-priority" ) > 0 ) #endif - p_priv->thread_id.id = (DWORD)threadId; - p_priv->thread_id.hThread = (HANDLE)hThread; - ResumeThread((HANDLE)hThread); + { + struct sched_param p = { .sched_priority = i_priority, }; + int policy; + + /* Hack to avoid error msg */ + if( config_GetType( p_this, "rt-offset" ) ) + p.sched_priority += config_GetInt( p_this, "rt-offset" ); + if( p.sched_priority <= 0 ) + p.sched_priority += sched_get_priority_max (policy = SCHED_OTHER); + else + p.sched_priority += sched_get_priority_min (policy = SCHED_RR); + + pthread_attr_setschedpolicy (&attr, policy); + pthread_attr_setschedparam (&attr, &p); } - i_ret = ( p_priv->thread_id.hThread ? 0 : 1 ); + i_ret = pthread_create( &p_priv->thread_id, &attr, thread_entry, boot ); + pthread_sigmask (SIG_SETMASK, &oldset, NULL); + pthread_attr_destroy (&attr); - if( !i_ret && i_priority ) +#elif 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 + * memory leaks and the signal functions not working (see Microsoft + * Knowledge Base, article 104641) */ +#if defined( UNDER_CE ) + HANDLE hThread = CreateThread( NULL, 0, thread_entry, + (LPVOID)boot, CREATE_SUSPENDED, NULL ); +#else + HANDLE hThread = (HANDLE)(uintptr_t) + _beginthreadex( NULL, 0, thread_entry, boot, CREATE_SUSPENDED, NULL ); +#endif + if( hThread ) { - if( !SetThreadPriority(p_priv->thread_id.hThread, i_priority) ) + p_priv->thread_id = hThread; + ResumeThread (hThread); + i_ret = 0; + if( i_priority && !SetThreadPriority (hThread, i_priority) ) { msg_Warn( p_this, "couldn't set a faster priority" ); i_priority = 0; } } + else + i_ret = errno; #elif defined( HAVE_KERNEL_SCHEDULER_H ) - p_priv->thread_id = spawn_thread( (thread_func)func, psz_name, + p_priv->thread_id = spawn_thread( (thread_func)thread_entry, psz_name, i_priority, p_data ); i_ret = resume_thread( p_priv->thread_id ); -#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" ) ) -#endif - { - int i_error, i_policy; - struct sched_param param; - - memset( ¶m, 0, sizeof(struct sched_param) ); - 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; - } - else - { - param.sched_priority = i_priority; - i_policy = SCHED_RR; - } - if( (i_error = pthread_setschedparam( p_priv->thread_id, - i_policy, ¶m )) ) - { - errno = i_error; - msg_Warn( p_this, "couldn't set thread priority (%s:%d): %m", - psz_file, i_line ); - i_priority = 0; - } - } -#ifndef __APPLE__ - else - { - i_priority = 0; - } -#endif - #endif if( i_ret == 0 ) @@ -517,28 +593,26 @@ int __vlc_thread_create( vlc_object_t *p_this, const char * psz_file, int i_line } 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_priv->thread_id, psz_name, i_priority, + msg_Dbg( p_this, "thread %lu (%s) created at priority %d (%s:%d)", + (unsigned long)p_priv->thread_id, psz_name, i_priority, psz_file, i_line ); -#endif - - - vlc_mutex_unlock( &p_this->object_lock ); } else { 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 ); } + vlc_object_unlock( p_this ); + + if (i_ret) + { + vlc_mutex_lock (&libpriv->threads_lock); + if (--libpriv->threads_count == 0) + vlc_cond_signal (&libpriv->threads_wait); + vlc_mutex_unlock (&libpriv->threads_lock); + } return i_ret; } @@ -550,18 +624,14 @@ 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 = vlc_internals( p_this ); -#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) ) + if( !p_priv->b_thread ) { - msg_Warn( p_this, "couldn't set a faster priority" ); - return 1; + msg_Err( p_this, "couldn't set priority of non-existent thread" ); + return ESRCH; } -#elif defined( LIBVLC_USE_PTHREAD ) +#if defined( LIBVLC_USE_PTHREAD ) # ifndef __APPLE__ if( config_GetInt( p_this, "rt-priority" ) > 0 ) # endif @@ -571,9 +641,7 @@ int __vlc_thread_set_priority( vlc_object_t *p_this, const char * psz_file, memset( ¶m, 0, sizeof(struct sched_param) ); 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; @@ -584,10 +652,8 @@ 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_priv->thread_id ) - p_priv->thread_id = pthread_self(); if( (i_error = pthread_setschedparam( p_priv->thread_id, - i_policy, ¶m )) ) + i_policy, ¶m )) ) { errno = i_error; msg_Warn( p_this, "couldn't set thread priority (%s:%d): %m", @@ -595,27 +661,41 @@ int __vlc_thread_set_priority( vlc_object_t *p_this, const char * psz_file, i_priority = 0; } } + +#elif defined( WIN32 ) || defined( UNDER_CE ) + VLC_UNUSED( psz_file); VLC_UNUSED( i_line ); + + if( !SetThreadPriority(p_priv->thread_id, i_priority) ) + { + msg_Warn( p_this, "couldn't set a faster priority" ); + return 1; + } + #endif return 0; } -/***************************************************************************** - * vlc_thread_ready: tell the parent thread we were successfully spawned - *****************************************************************************/ -void __vlc_thread_ready( vlc_object_t *p_this ) -{ - vlc_object_signal( p_this ); -} - /***************************************************************************** * vlc_thread_join: wait until a thread exits, inner version *****************************************************************************/ void __vlc_thread_join( vlc_object_t *p_this, const char * psz_file, int i_line ) { vlc_object_internals_t *p_priv = vlc_internals( p_this ); + int i_ret = 0; + +#if 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)) + { + msg_Warn (p_this, "joining the active thread (VLC might crash)"); + i_ret = pthread_detach (p_priv->thread_id); + } + else + i_ret = pthread_join (p_priv->thread_id, NULL); -#if defined( UNDER_CE ) || defined( WIN32 ) +#elif defined( UNDER_CE ) || defined( WIN32 ) HMODULE hmodule; BOOL (WINAPI *OurGetThreadTimes)( HANDLE, FILETIME*, FILETIME*, FILETIME*, FILETIME* ); @@ -628,25 +708,20 @@ void __vlc_thread_join( vlc_object_t *p_this, const char * psz_file, int i_line ** to be on the safe side */ if( ! DuplicateHandle(GetCurrentProcess(), - p_priv->thread_id.hThread, + p_priv->thread_id, 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; + i_ret = GetLastError(); + goto error; } 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 @@ -683,38 +758,23 @@ void __vlc_thread_join( vlc_object_t *p_this, const char * psz_file, int i_line (double)((user_time%(60*1000000))/1000000.0) ); } CloseHandle( hThread ); +error: -#else /* !defined(WIN32) */ - - int i_ret = 0; - -#if defined( HAVE_KERNEL_SCHEDULER_H ) +#elif 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 ) { 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 ); + msg_Err( p_this, "thread_join(%lu) failed at %s:%d (%m)", + (unsigned long)p_priv->thread_id, psz_file, i_line ); } else - { - msg_Dbg( p_this, "thread %u joined (%s:%d)", - (unsigned int)p_priv->thread_id, psz_file, i_line ); - } - -#endif + msg_Dbg( p_this, "thread %lu joined (%s:%d)", + (unsigned long)p_priv->thread_id, psz_file, i_line ); p_priv->b_thread = false; } -