#if 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;
+static bool b_fast_mutex = false;
/*
** On Windows 9x/Me you can use a fast but incorrect condition variables
** implementation (more precisely there is a possibility for a race
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;
#endif
vlc_threadvar_t msg_context_global_key;
-#ifndef NDEBUG
+#if defined(LIBVLC_USE_PTHREAD)
+static inline unsigned long vlc_threadid (void)
+{
+ union { pthread_t th; unsigned long int i; } v = { };
+ v.th = pthread_self ();
+ return v.i;
+}
+
+
/*****************************************************************************
- * vlc_threads_error: Report an error from the threading mecanism
+ * vlc_thread_fatal: Report an error from the threading layer
*****************************************************************************
- * This is especially useful to debug those errors, as this is a nice symbol
- * on which you can break.
+ * This is mostly meant for debugging.
*****************************************************************************/
-void vlc_threads_error( vlc_object_t *p_this )
+void vlc_pthread_fatal (const char *action, int error,
+ const char *file, unsigned line)
{
- msg_Err( p_this, "Error detected. Put a breakpoint in '%s' to debug.",
- __func__ );
+ 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");
+#else
+ char buf[1000];
+ const char *msg;
+
+ switch (strerror_r (error, buf, sizeof (buf)))
+ {
+ case 0:
+ msg = buf;
+ break;
+ case ERANGE: /* should never happen */
+ msg = "unknwon (too big to display)";
+ break;
+ default:
+ msg = "unknown (invalid error number)";
+ break;
+ }
+ fprintf (stderr, " Error message: %s\n", msg);
+#endif
+
+ fflush (stderr);
+ abort ();
}
#endif
+
/*****************************************************************************
* vlc_threads_init: initialize threads system
*****************************************************************************
if( IsDebuggerPresent() )
{
/* SignalObjectAndWait() is problematic under a debugger */
- b_fast_mutex = VLC_TRUE;
+ b_fast_mutex = true;
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 );
#endif
i_status = VLC_THREADS_PENDING;
/* We should be safe now. Do all the initialization stuff we want. */
- p_libvlc_global->b_ready = VLC_FALSE;
-
-#if defined( UNDER_CE )
- /* Nothing to initialize */
-
-#elif defined( WIN32 )
- /* 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 )
- {
- pf_SignalObjectAndWait =
- (SIGNALOBJECTANDWAIT)GetProcAddress( hInstLib,
- "SignalObjectAndWait" );
- }
- }
-
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
-#endif
+ p_libvlc_global->b_ready = false;
- p_root = vlc_object_create( p_libvlc_global, VLC_OBJECT_GLOBAL );
+ p_root = vlc_custom_create( VLC_OBJECT(p_libvlc_global), 0,
+ VLC_OBJECT_GLOBAL, "global" );
if( p_root == NULL )
i_ret = VLC_ENOMEM;
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 );
#endif
#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 );
#endif
if( i_initializations == 0 )
{
i_status = VLC_THREADS_UNINITIALIZED;
- vlc_object_destroy( p_root );
+ vlc_object_release( p_root );
}
#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 );
#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 )
+int __vlc_mutex_init( vlc_mutex_t *p_mutex )
{
- p_mutex->p_this = p_this;
-
#if defined( UNDER_CE )
InitializeCriticalSection( &p_mutex->csection );
return 0;
#elif defined( WIN32 )
- /* We use mutexes on WinNT/2K/XP because we can use the SignalObjectAndWait
- * 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( pf_SignalObjectAndWait && !b_fast_mutex )
+ if( !b_fast_mutex )
{
- /* We are running on NT/2K/XP, we can use SignalObjectAndWait */
p_mutex->mutex = CreateMutex( 0, FALSE, 0 );
return ( p_mutex->mutex != NULL ? 0 : 1 );
}
p_mutex->init = 9999;
return B_OK;
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
-# if defined(DEBUG)
- {
- /* Create error-checking mutex to detect problems more easily. */
- pthread_mutexattr_t attr;
- int i_result;
+#elif defined( LIBVLC_USE_PTHREAD )
+ pthread_mutexattr_t attr;
+ int i_result;
- pthread_mutexattr_init( &attr );
-# if defined(SYS_LINUX)
- pthread_mutexattr_setkind_np( &attr, PTHREAD_MUTEX_ERRORCHECK_NP );
-# else
- pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_ERRORCHECK );
-# endif
+ pthread_mutexattr_init( &attr );
- i_result = pthread_mutex_init( &p_mutex->mutex, &attr );
- pthread_mutexattr_destroy( &attr );
- return( i_result );
- }
+# 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
- return pthread_mutex_init( &p_mutex->mutex, NULL );
-
+ i_result = pthread_mutex_init( p_mutex, &attr );
+ pthread_mutexattr_destroy( &attr );
+ return i_result;
#endif
}
/*****************************************************************************
* vlc_mutex_init: initialize a recursive mutex (Do not use)
*****************************************************************************/
-int __vlc_mutex_init_recursive( vlc_object_t *p_this, 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->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 );
# endif
# endif
pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_RECURSIVE );
- i_result = pthread_mutex_init( &p_mutex->mutex, &attr );
+ i_result = pthread_mutex_init( p_mutex, &attr );
pthread_mutexattr_destroy( &attr );
return( i_result );
#else
- msg_Err(p_this, "no recursive mutex found. Falling back to regular mutex.\n"
- "Expect hangs\n")
- return __vlc_mutex_init( p_this, p_mutex );
+# error Unimplemented!
#endif
}
/*****************************************************************************
* vlc_mutex_destroy: destroy a mutex, inner version
*****************************************************************************/
-int __vlc_mutex_destroy( const char * psz_file, int i_line, vlc_mutex_t *p_mutex )
+void __vlc_mutex_destroy( const char * psz_file, int i_line, vlc_mutex_t *p_mutex )
{
- int i_result;
- /* In case of error : */
- int i_thread = -1;
-
#if defined( UNDER_CE )
+ VLC_UNUSED( psz_file); VLC_UNUSED( i_line );
+
DeleteCriticalSection( &p_mutex->csection );
- return 0;
#elif defined( WIN32 )
+ VLC_UNUSED( psz_file); VLC_UNUSED( i_line );
+
if( p_mutex->mutex )
- {
CloseHandle( p_mutex->mutex );
- }
else
- {
DeleteCriticalSection( &p_mutex->csection );
- }
- 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 )
- {
- i_thread = CAST_PTHREAD_TO_INT(pthread_self());
- errno = i_result;
- }
+#elif defined( LIBVLC_USE_PTHREAD )
+ int val = pthread_mutex_destroy( p_mutex );
+ VLC_THREAD_ASSERT ("destroying mutex");
#endif
-
- if( i_result )
- {
- msg_Err( p_mutex->p_this,
- "thread %d: mutex_destroy failed at %s:%d (%d:%m)",
- i_thread, psz_file, i_line, i_result );
- vlc_threads_error( p_mutex->p_this );
- }
- return i_result;
}
/*****************************************************************************
* vlc_cond_init: initialize a condition
*****************************************************************************/
-int __vlc_cond_init( vlc_object_t *p_this, vlc_cond_t *p_condvar )
+int __vlc_cond_init( vlc_cond_t *p_condvar )
{
- p_condvar->p_this = p_this;
-
#if defined( UNDER_CE )
/* Initialize counter */
p_condvar->i_waiting_threads = 0;
/* Misc init */
p_condvar->i_win9x_cv = i_win9x_cv;
- p_condvar->SignalObjectAndWait = pf_SignalObjectAndWait;
- if( (p_condvar->SignalObjectAndWait && !b_fast_mutex)
- || p_condvar->i_win9x_cv == 0 )
+ if( !b_fast_mutex || p_condvar->i_win9x_cv == 0 )
{
/* Create an auto-reset event. */
p_condvar->event = CreateEvent( NULL, /* no security */
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_setclock (&attr, CLOCK_MONOTONIC);
# endif
- ret = pthread_cond_init (&p_condvar->cond, &attr);
+ ret = pthread_cond_init (p_condvar, &attr);
pthread_condattr_destroy (&attr);
return ret;
/*****************************************************************************
* vlc_cond_destroy: destroy a condition, inner version
*****************************************************************************/
-int __vlc_cond_destroy( const char * psz_file, int i_line, vlc_cond_t *p_condvar )
+void __vlc_cond_destroy( const char * psz_file, int i_line, vlc_cond_t *p_condvar )
{
- int i_result;
- /* In case of error : */
- int i_thread = -1;
-
#if defined( UNDER_CE )
- i_result = !CloseHandle( p_condvar->event );
+ VLC_UNUSED( psz_file); VLC_UNUSED( i_line );
+
+ CloseHandle( p_condvar->event );
#elif defined( WIN32 )
+ VLC_UNUSED( psz_file); VLC_UNUSED( i_line );
+
if( !p_condvar->semaphore )
- i_result = !CloseHandle( p_condvar->event );
+ CloseHandle( p_condvar->event );
else
- i_result = !CloseHandle( p_condvar->event )
- || !CloseHandle( p_condvar->semaphore );
+ {
+ 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 )
- {
- i_thread = CAST_PTHREAD_TO_INT(pthread_self());
- errno = i_result;
- }
+#elif defined( LIBVLC_USE_PTHREAD )
+ int val = pthread_cond_destroy( p_condvar );
+ VLC_THREAD_ASSERT ("destroying condition");
#endif
-
- if( i_result )
- {
- msg_Err( p_condvar->p_this,
- "thread %d: cond_destroy failed at %s:%d (%d:%m)",
- i_thread, psz_file, i_line, i_result );
- vlc_threads_error( p_condvar->p_this );
- }
- 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 __vlc_threadvar_create( vlc_threadvar_t *p_tls )
{
int i_ret = -1;
- (void)p_this;
#if defined( HAVE_KERNEL_SCHEDULER_H )
- msg_Err( p_this, "TLS not implemented" );
- i_ret VLC_EGENERIC;
+# error Unimplemented!
#elif defined( UNDER_CE ) || defined( WIN32 )
#elif defined( WIN32 )
- p_tls->handle = TlsAlloc();
- i_ret = !( p_tls->handle == 0xFFFFFFFF );
+ *p_tls = TlsAlloc();
+ i_ret = (*p_tls == INVALID_HANDLE_VALUE) ? EAGAIN : 0;
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
- i_ret = pthread_key_create( &p_tls->handle, NULL );
+#elif defined( LIBVLC_USE_PTHREAD )
+ i_ret = pthread_key_create( p_tls, NULL );
#endif
return i_ret;
}
*****************************************************************************/
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_priority, bool b_wait )
{
int i_ret;
void *p_data = (void *)p_this;
#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__
vlc_object_wait( p_this );
}
- p_priv->b_thread = VLC_TRUE;
+ p_priv->b_thread = true;
#if defined( WIN32 ) || defined( UNDER_CE )
msg_Dbg( p_this, "thread %u (%s) created at priority %d (%s:%d)",
errno = i_ret;
msg_Err( p_this, "%s thread could not be created at %s:%d (%m)",
psz_name, psz_file, i_line );
- vlc_threads_error( p_this );
vlc_mutex_unlock( &p_this->object_lock );
}
{
vlc_object_internals_t *p_priv = p_this->p_internals;
#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) )
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
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
FALSE,
DUPLICATE_SAME_ACCESS) )
{
- msg_Err( p_this, "thread_join(%u) failed at %s:%d (%s)",
+ msg_Err( p_this, "thread_join(%u) failed at %s:%d (%u)",
(unsigned int)p_priv->thread_id.id,
- psz_file, i_line, GetLastError() );
- vlc_threads_error( p_this );
- p_priv->b_thread = VLC_FALSE;
+ psz_file, i_line, (unsigned int)GetLastError() );
+ p_priv->b_thread = false;
return;
}
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 )
- i_ret = pthread_join( p_priv->thread_id, NULL );
-
+#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 );
- vlc_threads_error( p_this );
}
else
{
#endif
- p_priv->b_thread = VLC_FALSE;
+ p_priv->b_thread = false;
}
projects / vlc / blobdiff