* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
-#include <stdlib.h>
#include "libvlc.h"
+#include <assert.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#include <signal.h>
#define VLC_THREADS_UNINITIALIZED 0
#define VLC_THREADS_PENDING 1
* Global mutex for lazy initialization of the threads system
*****************************************************************************/
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 )
-static SIGNALOBJECTANDWAIT pf_SignalObjectAndWait = NULL;
-static vlc_bool_t b_fast_mutex = 0;
-static int i_win9x_cv = 0;
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+#if defined( LIBVLC_USE_PTHREAD )
+# include <sched.h>
+
static pthread_mutex_t once_mutex = PTHREAD_MUTEX_INITIALIZER;
-#elif defined( HAVE_CTHREADS_H )
+#endif
+
+/**
+ * Global process-wide VLC object.
+ * Contains inter-instance data, such as the module cache and global mutexes.
+ */
+static libvlc_global_data_t *p_root;
+
+libvlc_global_data_t *vlc_global( void )
+{
+ assert( i_initializations > 0 );
+ 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;
+#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;
+}
+
+#if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE)
+# include <execinfo.h>
+#endif
+
+/*****************************************************************************
+ * vlc_thread_fatal: Report an error from the threading layer
+ *****************************************************************************
+ * This is mostly meant for debugging.
+ *****************************************************************************/
+void vlc_pthread_fatal (const char *action, int error,
+ const char *file, unsigned line)
+{
+ fprintf (stderr, "LibVLC fatal error %s in thread %lu at %s:%u: %d\n",
+ action, vlc_threadid (), file, line, error);
+
+ /* 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 at:\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);
+
+#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
*****************************************************************************
* keep the library really thread-safe. Some architectures don't support this
* and thus do not guarantee the complete reentrancy.
*****************************************************************************/
-int __vlc_threads_init( vlc_object_t *p_this )
+int vlc_threads_init( void )
{
- 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
* hope nothing wrong happens. */
-#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 )
+#if defined( LIBVLC_USE_PTHREAD )
pthread_mutex_lock( &once_mutex );
-#elif defined( HAVE_CTHREADS_H )
#endif
- if( i_status == VLC_THREADS_UNINITIALIZED )
+ if( i_initializations == 0 )
{
- 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( PTH_INIT_IN_PTH_H )
- i_ret = ( pth_init() == FALSE );
-
-#elif defined( ST_INIT_IN_ST_H )
- i_ret = st_init();
-
-#elif 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 )
-#elif defined( HAVE_CTHREADS_H )
-#endif
-
- p_root = vlc_object_create( p_libvlc_global, VLC_OBJECT_GLOBAL );
+ p_root = vlc_custom_create( (vlc_object_t *)NULL, sizeof( *p_root ),
+ VLC_OBJECT_GENERIC, "root" );
if( p_root == NULL )
- i_ret = VLC_ENOMEM;
-
- if( i_ret )
{
- i_status = VLC_THREADS_ERROR;
- }
- else
- {
- i_initializations++;
- i_status = VLC_THREADS_READY;
+ i_ret = VLC_ENOMEM;
+ goto out;
}
- vlc_threadvar_create( p_root, &msg_context_global_key );
- }
- else
- {
- /* Just increment the initialization count */
- i_initializations++;
+ /* We should be safe now. Do all the initialization stuff we want. */
+#ifndef NDEBUG
+ vlc_threadvar_create( &thread_object_key, NULL );
+#endif
+ vlc_threadvar_create( &msg_context_global_key, msg_StackDestroy );
}
+ i_initializations++;
- /* If we have lazy mutex initialization support, unlock the mutex;
- * otherwize, do a naive wait loop. */
-#if defined( PTH_INIT_IN_PTH_H )
- while( i_status == VLC_THREADS_PENDING ) msleep( THREAD_SLEEP );
-#elif defined( ST_INIT_IN_ST_H )
- while( i_status == VLC_THREADS_PENDING ) msleep( THREAD_SLEEP );
-#elif defined( UNDER_CE )
- 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 )
+out:
+ /* If we have lazy mutex initialization support, unlock the mutex.
+ * Otherwize, we are screwed. */
+#if defined( LIBVLC_USE_PTHREAD )
pthread_mutex_unlock( &once_mutex );
-#elif defined( HAVE_CTHREADS_H )
- while( i_status == VLC_THREADS_PENDING ) msleep( THREAD_SLEEP );
#endif
- if( i_status != VLC_THREADS_READY )
- {
- return VLC_ETHREAD;
- }
-
return i_ret;
}
*****************************************************************************
* FIXME: This function is far from being threadsafe.
*****************************************************************************/
-int __vlc_threads_end( vlc_object_t *p_this )
+void vlc_threads_end( void )
{
- (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 )
+#if defined( LIBVLC_USE_PTHREAD )
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 );
- }
+ assert( i_initializations > 0 );
-#if defined( PTH_INIT_IN_PTH_H )
- if( i_initializations == 0 )
+ if( i_initializations == 1 )
{
- return ( pth_kill() == FALSE );
+ vlc_object_release( p_root );
+ vlc_threadvar_delete( &msg_context_global_key );
+#ifndef NDEBUG
+ vlc_threadvar_delete( &thread_object_key );
+#endif
}
+ i_initializations--;
-#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 )
+#if defined( LIBVLC_USE_PTHREAD )
pthread_mutex_unlock( &once_mutex );
-#elif defined( HAVE_CTHREADS_H )
#endif
- return VLC_SUCCESS;
}
+#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
+
/*****************************************************************************
* 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( PTH_INIT_IN_PTH_H )
- return ( pth_mutex_init( &p_mutex->mutex ) == FALSE );
-
-#elif defined( ST_INIT_IN_ST_H )
- p_mutex->mutex = st_mutex_new();
- return ( p_mutex->mutex == NULL ) ? errno : 0;
-
+#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;
#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 )
- {
- /* 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 );
- }
- else
- {
- p_mutex->mutex = NULL;
- InitializeCriticalSection( &p_mutex->csection );
- return 0;
- }
+ *p_mutex = CreateMutex( 0, FALSE, 0 );
+ return (*p_mutex != NULL) ? 0 : ENOMEM;
#elif defined( HAVE_KERNEL_SCHEDULER_H )
/* check the arguments and whether it's already been initialized */
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
}
/*****************************************************************************
- * vlc_mutex_destroy: destroy a mutex, inner version
+ * vlc_mutex_init: initialize a recursive mutex (Do not use)
*****************************************************************************/
-int __vlc_mutex_destroy( const char * psz_file, int i_line, vlc_mutex_t *p_mutex )
+int vlc_mutex_init_recursive( vlc_mutex_t *p_mutex )
{
- int i_result;
- /* In case of error : */
- int i_thread = -1;
- const char * psz_error = "";
+#if defined( LIBVLC_USE_PTHREAD )
+ pthread_mutexattr_t attr;
+ int i_result;
+
+ pthread_mutexattr_init( &attr );
+# 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
+}
-#if defined( PTH_INIT_IN_PTH_H )
- return 0;
-#elif defined( ST_INIT_IN_ST_H )
- i_result = st_mutex_destroy( p_mutex->mutex );
+/*****************************************************************************
+ * vlc_mutex_destroy: destroy a mutex, inner version
+ *****************************************************************************/
+void __vlc_mutex_destroy( const char * psz_file, int i_line, vlc_mutex_t *p_mutex )
+{
+#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 );
- return 0;
#elif defined( WIN32 )
- if( p_mutex->mutex )
- {
- CloseHandle( p_mutex->mutex );
- }
- else
- {
- DeleteCriticalSection( &p_mutex->csection );
- }
- return 0;
+ VLC_UNUSED( psz_file); VLC_UNUSED( i_line );
+
+ CloseHandle( *p_mutex );
#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());
- psz_error = strerror(i_result);
- }
-
-#elif defined( HAVE_CTHREADS_H )
- return 0;
#endif
-
- if( i_result )
- {
- msg_Err( p_mutex->p_this,
- "thread %d: mutex_destroy failed at %s:%d (%d:%s)",
- i_thread, psz_file, i_line, i_result, psz_error );
- }
- 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( PTH_INIT_IN_PTH_H )
- return ( pth_cond_init( &p_condvar->cond ) == FALSE );
-
-#elif defined( ST_INIT_IN_ST_H )
- p_condvar->cond = st_cond_new();
- return ( p_condvar->cond == NULL ) ? errno : 0;
+#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 )
+#elif defined( UNDER_CE ) || defined( WIN32 )
/* Initialize counter */
p_condvar->i_waiting_threads = 0;
NULL ); /* unnamed */
return !p_condvar->event;
-#elif defined( WIN32 )
- /* 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 )
- {
- /* Create an auto-reset event. */
- p_condvar->event = CreateEvent( NULL, /* no security */
- FALSE, /* auto-reset event */
- FALSE, /* start non-signaled */
- NULL ); /* unnamed */
-
- p_condvar->semaphore = NULL;
- return !p_condvar->event;
- }
- else
- {
- p_condvar->semaphore = CreateSemaphore( NULL, /* no security */
- 0, /* initial count */
- 0x7fffffff, /* max count */
- NULL ); /* unnamed */
-
- if( p_condvar->i_win9x_cv == 1 )
- /* Create a manual-reset event initially signaled. */
- p_condvar->event = CreateEvent( NULL, TRUE, TRUE, NULL );
- else
- /* Create a auto-reset event. */
- p_condvar->event = CreateEvent( NULL, FALSE, FALSE, NULL );
-
- InitializeCriticalSection( &p_condvar->csection );
-
- return !p_condvar->semaphore || !p_condvar->event;
- }
-
#elif defined( HAVE_KERNEL_SCHEDULER_H )
if( !p_condvar )
{
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
}
/*****************************************************************************
* 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;
- const char * psz_error = "";
-
-#if defined( PTH_INIT_IN_PTH_H )
- return 0;
+#if defined( LIBVLC_USE_PTHREAD )
+ int val = pthread_cond_destroy( p_condvar );
+ VLC_THREAD_ASSERT ("destroying condition");
-#elif defined( ST_INIT_IN_ST_H )
- i_result = st_cond_destroy( p_condvar->cond );
-
-#elif defined( UNDER_CE )
- i_result = !CloseHandle( p_condvar->event );
-
-#elif defined( WIN32 )
- if( !p_condvar->semaphore )
- i_result = !CloseHandle( p_condvar->event );
- else
- i_result = !CloseHandle( p_condvar->event )
- || !CloseHandle( p_condvar->semaphore );
+#elif defined( UNDER_CE ) || defined( WIN32 )
+ VLC_UNUSED( psz_file); VLC_UNUSED( i_line );
- if( p_condvar->semaphore != NULL )
- DeleteCriticalSection( &p_condvar->csection );
+ CloseHandle( p_condvar->event );
#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());
- psz_error = strerror(i_result);
- }
-
-#elif defined( HAVE_CTHREADS_H )
- return 0;
#endif
-
- if( i_result )
- {
- msg_Err( p_condvar->p_this,
- "thread %d: cond_destroy failed at %s:%d (%d:%s)",
- i_thread, psz_file, i_line, i_result, psz_error );
- }
- 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, void (*destr) (void *) )
{
int i_ret;
- (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 );
+#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 == 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
*****************************************************************************
*****************************************************************************/
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;
+ 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 );
+#ifndef __APPLE__
+ if( config_GetInt( p_this, "rt-priority" ) > 0 )
+#endif
+ {
+ struct sched_param p = { .sched_priority = i_priority, };
+ int policy;
-#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;
+ /* 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);
-#elif defined( ST_INIT_IN_ST_H )
- p_this->thread_id = st_thread_create( func, p_data, 1, 0 );
- i_ret = 0;
+ pthread_attr_setschedpolicy (&attr, policy);
+ pthread_attr_setschedparam (&attr, &p);
+ }
+
+ i_ret = pthread_create( &p_priv->thread_id, &attr, thread_entry, boot );
+ pthread_sigmask (SIG_SETMASK, &oldset, NULL);
+ pthread_attr_destroy (&attr);
#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 =
+ /* 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)CreateThread( NULL, 0, (PTHREAD_START) func,
- p_data, 0, &threadID );
+ HANDLE hThread = CreateThread( NULL, 0, thread_entry,
+ (LPVOID)boot, CREATE_SUSPENDED, NULL );
#else
- (HANDLE)_beginthreadex( NULL, 0, (PTHREAD_START) func,
- p_data, 0, &threadID );
+ HANDLE hThread = (HANDLE)(uintptr_t)
+ _beginthreadex( NULL, 0, thread_entry, boot, CREATE_SUSPENDED, NULL );
#endif
- }
-
- if( p_this->thread_id && i_priority )
+ if( hThread )
{
- if( !SetThreadPriority(p_this->thread_id, 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;
}
}
-
- i_ret = ( p_this->thread_id ? 0 : 1 );
+ else
+ i_ret = errno;
#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)thread_entry, 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 );
-
-#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_this->thread_id,
- i_policy, ¶m )) )
- {
- msg_Warn( p_this, "couldn't set thread priority (%s:%d): %s",
- psz_file, i_line, strerror(i_error) );
- 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 );
- i_ret = 0;
+ i_ret = resume_thread( p_priv->thread_id );
#endif
if( b_wait )
{
msg_Dbg( p_this, "waiting for thread completion" );
- vlc_cond_wait( &p_this->object_wait, &p_this->object_lock );
+ vlc_object_wait( p_this );
}
- p_this->b_thread = 1;
-
- msg_Dbg( p_this, "thread %u (%s) created at priority %d (%s:%d)",
- (unsigned int)p_this->thread_id, psz_name, i_priority,
+ p_priv->b_thread = true;
+ 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 );
-
- vlc_mutex_unlock( &p_this->object_lock );
}
else
{
- msg_Err( p_this, "%s thread could not be created at %s:%d (%s)",
- psz_name, psz_file, i_line, strerror(i_ret) );
- vlc_mutex_unlock( &p_this->object_lock );
+ errno = i_ret;
+ msg_Err( p_this, "%s thread could not be created at %s:%d (%m)",
+ psz_name, psz_file, i_line );
}
+ 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;
}
int __vlc_thread_set_priority( vlc_object_t *p_this, const char * psz_file,
int i_line, int i_priority )
{
-#if defined( PTH_INIT_IN_PTH_H ) || defined( ST_INIT_IN_ST_H )
-#elif defined( WIN32 ) || defined( UNDER_CE )
- if( !SetThreadPriority(GetCurrentThread(), i_priority) )
+ vlc_object_internals_t *p_priv = vlc_internals( p_this );
+
+ 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( PTHREAD_COND_T_IN_PTHREAD_H )
-#ifndef __APPLE__
- if( config_GetInt( p_this, "rt-priority" ) )
-#endif
+#if defined( LIBVLC_USE_PTHREAD )
+# 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) );
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;
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,
- i_policy, ¶m )) )
+ if( (i_error = pthread_setschedparam( p_priv->thread_id,
+ i_policy, ¶m )) )
{
- msg_Warn( p_this, "couldn't set thread priority (%s:%d): %s",
- psz_file, i_line, strerror(i_error) );
+ errno = i_error;
+ msg_Warn( p_this, "couldn't set thread priority (%s:%d): %m",
+ psz_file, i_line );
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_mutex_lock( &p_this->object_lock );
- vlc_cond_signal( &p_this->object_wait );
- vlc_mutex_unlock( &p_this->object_lock );
-}
-
/*****************************************************************************
* 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( 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 );
+#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);
#elif defined( UNDER_CE ) || defined( WIN32 )
HMODULE hmodule;
FILETIME*, FILETIME* );
FILETIME create_ft, exit_ft, kernel_ft, user_ft;
int64_t real_time, kernel_time, user_time;
+ HANDLE hThread;
- WaitForSingleObject( p_this->thread_id, INFINITE );
+ /*
+ ** object will close its thread handle when destroyed, duplicate it here
+ ** to be on the safe side
+ */
+ if( ! DuplicateHandle(GetCurrentProcess(),
+ p_priv->thread_id,
+ GetCurrentProcess(),
+ &hThread,
+ 0,
+ FALSE,
+ DUPLICATE_SAME_ACCESS) )
+ {
+ p_priv->b_thread = false;
+ i_ret = GetLastError();
+ goto error;
+ }
+
+ WaitForSingleObject( hThread, INFINITE );
#if defined( UNDER_CE )
hmodule = GetModuleHandle( _T("COREDLL") );
GetProcAddress( hmodule, _T("GetThreadTimes") );
if( OurGetThreadTimes &&
- OurGetThreadTimes( p_this->thread_id,
+ OurGetThreadTimes( hThread,
&create_ft, &exit_ft, &kernel_ft, &user_ft ) )
{
real_time =
user_ft.dwLowDateTime) / 10;
msg_Dbg( p_this, "thread times: "
- "real "I64Fd"m%fs, kernel "I64Fd"m%fs, user "I64Fd"m%fs",
+ "real %"PRId64"m%fs, kernel %"PRId64"m%fs, user %"PRId64"m%fs",
real_time/60/1000000,
(double)((real_time%(60*1000000))/1000000.0),
kernel_time/60/1000000,
user_time/60/1000000,
(double)((user_time%(60*1000000))/1000000.0) );
}
- CloseHandle( p_this->thread_id );
+ CloseHandle( hThread );
+error:
#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 );
-
-#elif defined( HAVE_CTHREADS_H )
- cthread_join( p_this->thread_id );
- i_ret = 1;
+ i_ret = (B_OK == wait_for_thread( p_priv->thread_id, &exit_value ));
#endif
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,
- strerror(i_ret) );
+ errno = i_ret;
+ 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_this->thread_id, psz_file, i_line );
- }
+ msg_Dbg( p_this, "thread %lu joined (%s:%d)",
+ (unsigned long)p_priv->thread_id, psz_file, i_line );
- p_this->b_thread = 0;
+ p_priv->b_thread = false;
}
-
projects / vlc / blobdiff