/*****************************************************************************
* threads.c : threads implementation for the VideoLAN client
*****************************************************************************
- * Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
- * $Id: threads.c,v 1.16 2002/09/17 14:56:13 sam Exp $
+ * Copyright (C) 1999-2008 the VideoLAN team
+ * $Id$
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
* Gildas Bazin <gbazin@netcourrier.com>
+ * Clément Sténac
+ * Rémi Denis-Courmont
*
* 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
*
* 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.
- *****************************************************************************/
-
-#include <vlc/vlc.h>
-
-#define VLC_THREADS_UNINITIALIZED 0
-#define VLC_THREADS_PENDING 1
-#define VLC_THREADS_ERROR 2
-#define VLC_THREADS_READY 3
-
-/*****************************************************************************
- * Prototype for GPROF wrapper
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#ifdef GPROF
-/* Wrapper function for profiling */
-static void * vlc_thread_wrapper ( void *p_wrapper );
-
-# ifdef WIN32
-
-# define ITIMER_REAL 1
-# define ITIMER_PROF 2
-struct itimerval
-{
- struct timeval it_value;
- struct timeval it_interval;
-};
-
-int setitimer(int kind, const struct itimerval* itnew, struct itimerval* itold);
-# endif /* WIN32 */
-
-typedef struct wrapper_t
-{
- /* Data lock access */
- vlc_mutex_t lock;
- vlc_cond_t wait;
-
- /* Data used to spawn the real thread */
- vlc_thread_func_t func;
- void *p_data;
-
- /* Profiling timer passed to the thread */
- struct itimerval itimer;
-
-} wrapper_t;
-
-#endif /* GPROF */
-
-/*****************************************************************************
- * Global mutexes for lazy initialization of the threads system
- *****************************************************************************/
-static volatile int i_initializations = 0;
-
-#if defined( PTH_INIT_IN_PTH_H )
- /* Unimplemented */
-#elif defined( ST_INIT_IN_ST_H )
- /* Unimplemented */
-#elif defined( WIN32 )
- /* Unimplemented */
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
- static pthread_mutex_t once_mutex = PTHREAD_MUTEX_INITIALIZER;
-#elif defined( HAVE_CTHREADS_H )
- /* Unimplemented */
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
- /* Unimplemented */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
#endif
-/*****************************************************************************
- * vlc_threads_init: initialize threads system
- *****************************************************************************
- * This function requires lazy initialization of a global lock in order to
- * 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 )
-{
- static volatile int i_status = VLC_THREADS_UNINITIALIZED;
- int i_ret = 0;
-
-#if defined( PTH_INIT_IN_PTH_H )
- /* Unimplemented */
-#elif defined( ST_INIT_IN_ST_H )
- /* Unimplemented */
-#elif defined( WIN32 )
- HINSTANCE hInstLib;
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
- pthread_mutex_lock( &once_mutex );
-#elif defined( HAVE_CTHREADS_H )
- /* Unimplemented */
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
- /* Unimplemented */
-#endif
-
- if( i_status == VLC_THREADS_UNINITIALIZED )
- {
- i_status = VLC_THREADS_PENDING;
-
-#if defined( PTH_INIT_IN_PTH_H )
- i_ret = pth_init();
-#elif defined( ST_INIT_IN_ST_H )
- i_ret = st_init();
-#elif defined( WIN32 )
- /* dynamically get the address of SignalObjectAndWait */
- if( GetVersion() < 0x80000000 )
- {
- /* We are running on NT/2K/XP, we can use SignalObjectAndWait */
- hInstLib = LoadLibrary( "kernel32" );
- if( hInstLib )
- {
- p_this->p_vlc->SignalObjectAndWait =
- (SIGNALOBJECTANDWAIT)GetProcAddress( hInstLib,
- "SignalObjectAndWait" );
- }
- }
- else
- {
- p_this->p_vlc->SignalObjectAndWait = NULL;
- }
-
- p_this->p_vlc->b_fast_mutex = 0;
- p_this->p_vlc->i_win9x_cv = 0;
+#include <vlc_common.h>
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
- /* Unimplemented */
-#elif defined( HAVE_CTHREADS_H )
- /* Unimplemented */
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
- /* Unimplemented */
+#include "libvlc.h"
+#include <assert.h>
+#include <errno.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
#endif
- if( i_ret )
- {
- i_status = VLC_THREADS_ERROR;
- }
- else
- {
- vlc_mutex_init( p_this, p_this->p_vlc->p_global_lock );
- i_status = VLC_THREADS_READY;
- }
- }
- else
- {
- i_ret = ( i_status == VLC_THREADS_READY );
- }
-
- i_initializations++;
-
-#if defined( PTH_INIT_IN_PTH_H )
- /* Unimplemented */
-#elif defined( ST_INIT_IN_ST_H )
- /* Unimplemented */
-#elif defined( WIN32 )
- /* Unimplemented */
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
- pthread_mutex_unlock( &once_mutex );
- return i_ret;
-#elif defined( HAVE_CTHREADS_H )
- /* Unimplemented */
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
- /* Unimplemented */
+#if defined( LIBVLC_USE_PTHREAD )
+# include <sched.h>
#endif
- /* Wait until the other thread has initialized the thread library */
- while( i_status == VLC_THREADS_PENDING )
- {
- msleep( THREAD_SLEEP );
- }
-
- return i_status == VLC_THREADS_READY;
-}
-
-/*****************************************************************************
- * 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.
- *****************************************************************************/
-int __vlc_threads_end( vlc_object_t *p_this )
+struct vlc_thread_boot
{
-#if defined( PTH_INIT_IN_PTH_H )
- i_initializations--;
- if( i_initializations == 0 )
- {
- return pth_kill();
- }
- return 0;
-
-#elif defined( ST_INIT_IN_ST_H )
- i_initializations--;
- return 0;
-
-#elif defined( WIN32 )
- i_initializations--;
- return 0;
-
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
- pthread_mutex_lock( &once_mutex );
- i_initializations--;
- pthread_mutex_unlock( &once_mutex );
- return 0;
+ void * (*entry) (vlc_object_t *);
+ vlc_object_t *object;
+};
-#elif defined( HAVE_CTHREADS_H )
- i_initializations--;
- return 0;
-
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
- i_initializations--;
- return 0;
-
-#endif
-}
-
-/*****************************************************************************
- * vlc_mutex_init: initialize a mutex
- *****************************************************************************/
-int __vlc_mutex_init( vlc_object_t *p_this, 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 );
-
-#elif defined( ST_INIT_IN_ST_H )
- p_mutex->mutex = st_mutex_new();
- return ( p_mutex == NULL ) ? errno : 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( p_this->p_vlc->SignalObjectAndWait && !p_this->p_vlc->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;
- }
-
-#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;
-
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
- /* check the arguments and whether it's already been initialized */
- if( p_mutex == NULL )
- {
- return B_BAD_VALUE;
- }
-
- if( p_mutex->init == 9999 )
- {
- return EALREADY;
- }
-
- p_mutex->lock = create_sem( 1, "BeMutex" );
- if( p_mutex->lock < B_NO_ERROR )
- {
- return( -1 );
- }
-
- p_mutex->init = 9999;
- return B_OK;
-
-#endif
-}
-
-/*****************************************************************************
- * vlc_mutex_destroy: destroy a mutex, inner version
- *****************************************************************************/
-int __vlc_mutex_destroy( char * psz_file, int i_line, vlc_mutex_t *p_mutex )
+static void *thread_entry (void *data)
{
- int i_result;
- /* In case of error : */
- int i_thread = -1;
- const char * psz_error = "";
-
-#if defined( PTH_INIT_IN_PTH_H )
- return 0;
-
-#elif defined( ST_INIT_IN_ST_H )
- i_result = st_mutex_destroy( p_mutex->mutex );
-
-#elif defined( WIN32 )
- if( p_mutex->mutex )
- {
- CloseHandle( p_mutex->mutex );
- }
- else
- {
- DeleteCriticalSection( &p_mutex->csection );
- }
- return 0;
-
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
- i_result = pthread_mutex_destroy( &p_mutex->mutex );
- if ( i_result )
- {
- i_thread = (int)pthread_self();
- psz_error = strerror(i_result);
- }
-
-#elif defined( HAVE_CTHREADS_H )
- return 0;
-
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
- if( p_mutex->init == 9999 )
- {
- delete_sem( p_mutex->lock );
- }
+ vlc_object_t *obj = ((struct vlc_thread_boot *)data)->object;
+ void *(*func) (vlc_object_t *) = ((struct vlc_thread_boot *)data)->entry;
- p_mutex->init = 0;
- return B_OK;
-#endif
+ free (data);
+ msg_Dbg (obj, "thread started");
+ func (obj);
+ msg_Dbg (obj, "thread ended");
- 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;
+ return NULL;
}
+#undef vlc_thread_create
/*****************************************************************************
- * vlc_cond_init: initialize a condition
+ * vlc_thread_create: create a thread
+ *****************************************************************************
+ * Note that i_priority is only taken into account on platforms supporting
+ * userland real-time priority threads.
*****************************************************************************/
-int __vlc_cond_init( vlc_object_t *p_this, vlc_cond_t *p_condvar )
+int vlc_thread_create( vlc_object_t *p_this, const char * psz_file, int i_line,
+ const char *psz_name, void *(*func) ( vlc_object_t * ),
+ int i_priority )
{
- p_condvar->p_this = p_this;
-
-#if defined( PTH_INIT_IN_PTH_H )
- return pth_cond_init( &p_condvar->cond );
-
-#elif defined( ST_INIT_IN_ST_H )
- p_condvar->cond = st_cond_new();
- return ( p_condvar->cond == NULL ) ? errno : 0;
+ int i_ret;
+ vlc_object_internals_t *p_priv = vlc_internals( p_this );
-#elif defined( WIN32 )
- /* Initialize counter */
- p_condvar->i_waiting_threads = 0;
+ struct vlc_thread_boot *boot = malloc (sizeof (*boot));
+ if (boot == NULL)
+ return errno;
+ boot->entry = func;
+ boot->object = p_this;
- /* Misc init */
- p_condvar->i_win9x_cv = p_this->p_vlc->i_win9x_cv;
- p_condvar->SignalObjectAndWait = p_this->p_vlc->SignalObjectAndWait;
+ /* Make sure we don't re-create a thread if the object has already one */
+ assert( !p_priv->b_thread );
- if( p_this->p_vlc->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;
- }
+ p_priv->b_thread = true;
+ i_ret = vlc_clone( &p_priv->thread_id, thread_entry, boot, i_priority );
+ if( i_ret == 0 )
+ msg_Dbg( p_this, "thread (%s) created at priority %d (%s:%d)",
+ psz_name, i_priority, psz_file, i_line );
else
{
- p_condvar->semaphore = CreateSemaphore( NULL, /* no security */
- 0, /* initial count */
- 0x7fffffff, /* max count */
- NULL ); /* unnamed */
-
- if( p_this->p_vlc->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;
+ p_priv->b_thread = false;
+ errno = i_ret;
+ msg_Err( p_this, "%s thread could not be created at %s:%d (%m)",
+ psz_name, psz_file, i_line );
}
-#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;
-
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
- if( !p_condvar )
- {
- return B_BAD_VALUE;
- }
-
- if( p_condvar->init == 9999 )
- {
- return EALREADY;
- }
-
- p_condvar->thread = -1;
- p_condvar->init = 9999;
- return 0;
-#endif
+ return i_ret;
}
+#undef vlc_thread_set_priority
/*****************************************************************************
- * vlc_cond_destroy: destroy a condition, inner version
+ * 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_cond_destroy( char * psz_file, int i_line, vlc_cond_t *p_condvar )
+int vlc_thread_set_priority( vlc_object_t *p_this, const char * psz_file,
+ int i_line, int i_priority )
{
- int i_result;
- /* In case of error : */
- int i_thread = -1;
- const char * psz_error = "";
+ vlc_object_internals_t *p_priv = vlc_internals( p_this );
-#if defined( PTH_INIT_IN_PTH_H )
- return 0;
-
-#elif defined( ST_INIT_IN_ST_H )
- i_result = st_cond_destroy( p_condvar->cond );
-
-#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( PTHREAD_COND_T_IN_PTHREAD_H )
- i_result = pthread_cond_destroy( &p_condvar->cond );
- if ( i_result )
- {
- i_thread = (int)pthread_self();
- psz_error = strerror(i_result);
- }
-
-#elif defined( HAVE_CTHREADS_H )
- return 0;
-
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
- p_condvar->init = 0;
- return 0;
-#endif
-
- if( i_result )
+ if( !p_priv->b_thread )
{
- 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 );
+ msg_Err( p_this, "couldn't set priority of non-existent thread" );
+ return ESRCH;
}
- return i_result;
-}
-
-/*****************************************************************************
- * 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 i_priority, vlc_bool_t b_wait )
-{
- int i_ret;
- vlc_mutex_lock( &p_this->object_lock );
-
-#ifdef GPROF
- wrapper_t wrapper;
-
- /* Initialize the wrapper structure */
- wrapper.func = func;
- wrapper.p_data = (void *)p_this;
- getitimer( ITIMER_PROF, &wrapper.itimer );
- vlc_mutex_init( p_this, &wrapper.lock );
- vlc_cond_init( p_this, &wrapper.wait );
- vlc_mutex_lock( &wrapper.lock );
-
- /* Alter user-passed data so that we call the wrapper instead
- * of the real function */
- p_data = &wrapper;
- func = vlc_thread_wrapper;
-#endif
-
-#if defined( PTH_INIT_IN_PTH_H )
- p_this->thread_id = pth_spawn( PTH_ATTR_DEFAULT, func, (void *)p_this );
- i_ret = 0;
-
-#elif defined( ST_INIT_IN_ST_H )
- p_this->thread_id = st_thread_create( func, (void *)p_this, 1, 0 );
- i_ret = 0;
-
-#elif defined( WIN32 )
+#if defined( LIBVLC_USE_PTHREAD )
+# ifndef __APPLE__
+ if( var_InheritBool( p_this, "rt-priority" ) )
+# endif
{
- 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 */
- p_this->thread_id =
- (HANDLE)_beginthreadex( NULL, 0, (PTHREAD_START) func,
- (void *)p_this, 0, &threadID );
- }
+ int i_error, i_policy;
+ struct sched_param param;
- if ( p_this->thread_id && i_priority )
- {
- if ( !SetThreadPriority(p_this->thread_id, i_priority) )
+ memset( ¶m, 0, sizeof(struct sched_param) );
+ if( config_GetType( p_this, "rt-offset" ) )
+ i_priority += var_InheritInteger( p_this, "rt-offset" );
+ if( i_priority <= 0 )
{
- msg_Warn( p_this, "couldn't set a faster priority" );
- i_priority = 0;
+ param.sched_priority = (-1) * i_priority;
+ i_policy = SCHED_OTHER;
}
- }
-
- i_ret = ( p_this->thread_id ? 0 : 1 );
-
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
- i_ret = pthread_create( &p_this->thread_id, NULL, func, (void *)p_this );
-
- if ( i_priority )
- {
- struct sched_param param;
- memset( ¶m, 0, sizeof(struct sched_param) );
- param.sched_priority = i_priority;
- if ( pthread_setschedparam( p_this->thread_id, SCHED_RR, ¶m ) )
+ else
+ {
+ param.sched_priority = i_priority;
+ i_policy = SCHED_RR;
+ }
+ if( (i_error = pthread_setschedparam( p_priv->thread_id,
+ i_policy, ¶m )) )
{
- msg_Warn( p_this, "couldn't go to real-time priority" );
+ errno = i_error;
+ msg_Warn( p_this, "couldn't set thread priority (%s:%d): %m",
+ psz_file, i_line );
i_priority = 0;
}
}
-#elif defined( HAVE_CTHREADS_H )
- p_this->thread_id = cthread_fork( (cthread_fn_t)func, (any_t)p_this );
- i_ret = 0;
-
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
- p_this->thread_id = spawn_thread( (thread_func)func, psz_name,
- B_NORMAL_PRIORITY, (void *)p_this );
- i_ret = resume_thread( p_this->thread_id );
+#elif defined( WIN32 ) || defined( UNDER_CE )
+ VLC_UNUSED( psz_file); VLC_UNUSED( i_line );
+#ifndef UNDER_CE
+ if( !SetThreadPriority(p_priv->thread_id, i_priority) )
+#else
+ if( !SetThreadPriority(p_priv->thread_id->handle, i_priority) )
#endif
-
-#ifdef GPROF
- if( i_ret == 0 )
{
- vlc_cond_wait( &wrapper.wait, &wrapper.lock );
+ msg_Warn( p_this, "couldn't set a faster priority" );
+ return 1;
}
- vlc_mutex_unlock( &wrapper.lock );
- vlc_mutex_destroy( &wrapper.lock );
- vlc_cond_destroy( &wrapper.wait );
#endif
- if( i_ret == 0 )
- {
- if( b_wait )
- {
- msg_Dbg( p_this, "waiting for thread completion" );
- vlc_cond_wait( &p_this->object_wait, &p_this->object_lock );
- }
-
- p_this->b_thread = 1;
-
- msg_Dbg( p_this, "thread %d (%s) created at priority %d (%s:%d)",
- p_this->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 );
- }
-
- return i_ret;
-}
-
-/*****************************************************************************
- * 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 );
+ return 0;
}
+#undef vlc_thread_join
/*****************************************************************************
* 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 )
{
- int i_ret = 0;
-
-#if defined( PTH_INIT_IN_PTH_H )
- i_ret = pth_join( p_this->thread_id, NULL );
-
-#elif defined( ST_INIT_IN_ST_H )
- i_ret = st_thread_join( p_this->thread_id, NULL );
-
-#elif defined( WIN32 )
- WaitForSingleObject( p_this->thread_id, INFINITE );
-
-#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;
-
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
- int32 exit_value;
- wait_for_thread( p_this->thread_id, &exit_value );
-
-#endif
-
- if( i_ret )
+ vlc_object_internals_t *p_priv = vlc_internals( p_this );
+
+#if defined( WIN32 ) && !defined( UNDER_CE )
+ HANDLE hThread;
+ FILETIME create_ft, exit_ft, kernel_ft, user_ft;
+ int64_t real_time, kernel_time, user_time;
+
+ if( ! DuplicateHandle(GetCurrentProcess(),
+ p_priv->thread_id,
+ GetCurrentProcess(),
+ &hThread,
+ 0,
+ FALSE,
+ DUPLICATE_SAME_ACCESS) )
{
- msg_Err( p_this, "thread_join(%d) failed at %s:%d (%s)",
- p_this->thread_id, psz_file, i_line, strerror(i_ret) );
+ p_priv->b_thread = false;
+ return; /* We have a problem! */
}
- else
+#endif
+
+ vlc_join( p_priv->thread_id, NULL );
+
+#if defined( WIN32 ) && !defined( UNDER_CE )
+ /* FIXME: this could work on WinCE too... except that it seems always to
+ * return 0 for exit_ft and kernel_ft */
+ if( GetThreadTimes( hThread, &create_ft, &exit_ft, &kernel_ft, &user_ft ) )
{
- msg_Dbg( p_this, "thread %d joined (%s:%d)",
- p_this->thread_id, psz_file, i_line );
+ 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 %"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,
+ (double)((kernel_time%(60*1000000))/1000000.0),
+ user_time/60/1000000,
+ (double)((user_time%(60*1000000))/1000000.0) );
}
+ CloseHandle( hThread );
+#endif
- p_this->b_thread = 0;
+ p_priv->b_thread = false;
}
-/*****************************************************************************
- * vlc_thread_wrapper: wrapper around thread functions used when profiling.
- *****************************************************************************/
-#ifdef GPROF
-static void *vlc_thread_wrapper( void *p_wrapper )
+void vlc_thread_cancel (vlc_object_t *obj)
{
- /* Put user data in thread-local variables */
- void * p_data = ((wrapper_t*)p_wrapper)->p_data;
- vlc_thread_func_t func = ((wrapper_t*)p_wrapper)->func;
+ vlc_object_internals_t *priv = vlc_internals (obj);
- /* Set the profile timer value */
- setitimer( ITIMER_PROF, &((wrapper_t*)p_wrapper)->itimer, NULL );
+ if (priv->b_thread)
+ vlc_cancel (priv->thread_id);
+}
- /* Tell the calling thread that we don't need its data anymore */
- vlc_mutex_lock( &((wrapper_t*)p_wrapper)->lock );
- vlc_cond_signal( &((wrapper_t*)p_wrapper)->wait );
- vlc_mutex_unlock( &((wrapper_t*)p_wrapper)->lock );
+/*** Global locks ***/
- /* Call the real function */
- return func( p_data );
+void vlc_global_mutex (unsigned n, bool acquire)
+{
+ static vlc_mutex_t locks[] = {
+ VLC_STATIC_MUTEX,
+ VLC_STATIC_MUTEX,
+ VLC_STATIC_MUTEX,
+ };
+ assert (n < (sizeof (locks) / sizeof (locks[0])));
+ vlc_mutex_t *lock = locks + n;
+
+ if (acquire)
+ vlc_mutex_lock (lock);
+ else
+ vlc_mutex_unlock (lock);
+
+ /* Compile-time assertion ;-) */
+ char enough_locks[(sizeof (locks) / sizeof (locks[0])) - VLC_MAX_MUTEX];
+ (void) enough_locks;
}
-#endif
projects / vlc / blobdiff