/*****************************************************************************
* threads.c : threads implementation for the VideoLAN client
*****************************************************************************
- * Copyright (C) 1999-2004 VideoLAN
+ * Copyright (C) 1999-2004 the VideoLAN team
* $Id$
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
*
* 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <vlc/vlc.h>
/*****************************************************************************
* Global mutex for lazy initialization of the threads system
*****************************************************************************/
-static volatile int i_initializations = 0;
+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 )
*****************************************************************************/
int __vlc_threads_init( vlc_object_t *p_this )
{
- static volatile int i_status = VLC_THREADS_UNINITIALIZED;
-
- libvlc_t *p_libvlc = (libvlc_t *)p_this;
+ 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
#elif defined( ST_INIT_IN_ST_H )
#elif defined( UNDER_CE )
#elif defined( WIN32 )
- HINSTANCE hInstLib;
#elif defined( HAVE_KERNEL_SCHEDULER_H )
#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
pthread_mutex_lock( &once_mutex );
i_status = VLC_THREADS_PENDING;
/* We should be safe now. Do all the initialization stuff we want. */
- p_libvlc->b_ready = VLC_FALSE;
+ p_libvlc_global->b_ready = VLC_FALSE;
#if defined( PTH_INIT_IN_PTH_H )
i_ret = ( pth_init() == FALSE );
/* 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 )
{
- p_libvlc->SignalObjectAndWait =
+ p_libvlc_global->SignalObjectAndWait =
(SIGNALOBJECTANDWAIT)GetProcAddress( hInstLib,
"SignalObjectAndWait" );
}
}
else
{
- p_libvlc->SignalObjectAndWait = NULL;
+ p_libvlc_global->SignalObjectAndWait = NULL;
}
- p_libvlc->b_fast_mutex = 0;
- p_libvlc->i_win9x_cv = 0;
+ p_libvlc_global->b_fast_mutex = 0;
+ p_libvlc_global->i_win9x_cv = 0;
#elif defined( HAVE_KERNEL_SCHEDULER_H )
#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
#elif defined( HAVE_CTHREADS_H )
#endif
- vlc_object_create( p_libvlc, VLC_OBJECT_ROOT );
+ p_root = vlc_object_create( p_libvlc_global, VLC_OBJECT_ROOT );
+ if( p_root == NULL )
+ i_ret = VLC_ENOMEM;
if( i_ret )
{
/*****************************************************************************
* 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.
+ * FIXME: This function is far from being threadsafe.
*****************************************************************************/
int __vlc_threads_end( vlc_object_t *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 )
+ 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 );
+ }
+
+#if defined( PTH_INIT_IN_PTH_H )
if( i_initializations == 0 )
{
return ( pth_kill() == FALSE );
}
#elif defined( ST_INIT_IN_ST_H )
- i_initializations--;
-
#elif defined( UNDER_CE )
- i_initializations--;
-
#elif defined( WIN32 )
- i_initializations--;
-
#elif defined( HAVE_KERNEL_SCHEDULER_H )
- i_initializations--;
-
#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
- pthread_mutex_lock( &once_mutex );
- i_initializations--;
pthread_mutex_unlock( &once_mutex );
-
#elif defined( HAVE_CTHREADS_H )
- i_initializations--;
-
#endif
return VLC_SUCCESS;
}
* 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_libvlc->SignalObjectAndWait &&
- !p_this->p_libvlc->b_fast_mutex )
+ if( p_this->p_libvlc_global->SignalObjectAndWait &&
+ !p_this->p_libvlc_global->b_fast_mutex )
{
/* We are running on NT/2K/XP, we can use SignalObjectAndWait */
p_mutex->mutex = CreateMutex( 0, FALSE, 0 );
#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
i_result = pthread_mutex_destroy( &p_mutex->mutex );
- if ( i_result )
+ if( i_result )
{
i_thread = (int)pthread_self();
psz_error = strerror(i_result);
p_condvar->i_waiting_threads = 0;
/* Misc init */
- p_condvar->i_win9x_cv = p_this->p_libvlc->i_win9x_cv;
- p_condvar->SignalObjectAndWait = p_this->p_libvlc->SignalObjectAndWait;
+ p_condvar->i_win9x_cv = p_this->p_libvlc_global->i_win9x_cv;
+ p_condvar->SignalObjectAndWait = p_this->p_libvlc_global->SignalObjectAndWait;
- if( (p_condvar->SignalObjectAndWait && !p_this->p_libvlc->b_fast_mutex)
+ if( (p_condvar->SignalObjectAndWait &&
+ !p_this->p_libvlc_global->b_fast_mutex)
|| p_condvar->i_win9x_cv == 0 )
{
/* Create an auto-reset event. */
i_result = !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 )
+ if( i_result )
{
i_thread = (int)pthread_self();
psz_error = strerror(i_result);
#endif
}
- if ( p_this->thread_id && i_priority )
+ if( p_this->thread_id && i_priority )
{
- if ( !SetThreadPriority(p_this->thread_id, i_priority) )
+ if( !SetThreadPriority(p_this->thread_id, i_priority) )
{
msg_Warn( p_this, "couldn't set a faster priority" );
i_priority = 0;
#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
i_ret = pthread_create( &p_this->thread_id, NULL, func, p_data );
-#ifndef SYS_DARWIN
- if ( config_GetInt( p_this, "rt-priority" ) )
+#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) );
- i_priority += config_GetInt( p_this, "rt-offset" );
- if ( i_priority <= 0 )
+ 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;
param.sched_priority = i_priority;
i_policy = SCHED_RR;
}
- if ( (i_error = pthread_setschedparam( p_this->thread_id,
+ if( (i_error = pthread_setschedparam( p_this->thread_id,
i_policy, ¶m )) )
{
msg_Warn( p_this, "couldn't set thread priority (%s:%d): %s",
i_priority = 0;
}
}
-#ifndef SYS_DARWIN
+#ifndef __APPLE__
else
{
i_priority = 0;
p_this->b_thread = 1;
- msg_Dbg( p_this, "thread %d (%s) created at priority %d (%s:%d)",
- (int)p_this->thread_id, psz_name, i_priority,
+ msg_Dbg( p_this, "thread %u (%s) created at priority %d (%s:%d)",
+ (unsigned int)p_this->thread_id, psz_name, i_priority,
psz_file, i_line );
vlc_mutex_unlock( &p_this->object_lock );
}
else
{
-#ifdef HAVE_STRERROR
msg_Err( p_this, "%s thread could not be created at %s:%d (%s)",
psz_name, psz_file, i_line, strerror(i_ret) );
-#else
- msg_Err( p_this, "%s thread could not be created at %s:%d",
- psz_name, psz_file, i_line );
-#endif
vlc_mutex_unlock( &p_this->object_lock );
}
{
#if defined( PTH_INIT_IN_PTH_H ) || defined( ST_INIT_IN_ST_H )
#elif defined( WIN32 ) || defined( UNDER_CE )
- if ( !SetThreadPriority(GetCurrentThread(), i_priority) )
+ if( !SetThreadPriority(GetCurrentThread(), i_priority) )
{
msg_Warn( p_this, "couldn't set a faster priority" );
return 1;
}
#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
-#ifndef SYS_DARWIN
- if ( config_GetInt( p_this, "rt-priority" ) )
+#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) );
- i_priority += config_GetInt( p_this, "rt-offset" );
- if ( i_priority <= 0 )
+ 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;
param.sched_priority = i_priority;
i_policy = SCHED_RR;
}
- if ( !p_this->thread_id )
+ if( !p_this->thread_id )
p_this->thread_id = pthread_self();
- if ( (i_error = pthread_setschedparam( p_this->thread_id,
+ if( (i_error = pthread_setschedparam( p_this->thread_id,
i_policy, ¶m )) )
{
msg_Warn( p_this, "couldn't set thread priority (%s:%d): %s",
i_ret = st_thread_join( p_this->thread_id, NULL );
#elif defined( UNDER_CE ) || defined( WIN32 )
+ HMODULE hmodule;
+ BOOL (WINAPI *OurGetThreadTimes)( HANDLE, FILETIME*, FILETIME*,
+ FILETIME*, FILETIME* );
+ FILETIME create_ft, exit_ft, kernel_ft, user_ft;
+ int64_t real_time, kernel_time, user_time;
+
WaitForSingleObject( p_this->thread_id, INFINITE );
+
+#if defined( UNDER_CE )
+ hmodule = GetModuleHandle( _T("COREDLL") );
+#else
+ hmodule = GetModuleHandle( _T("KERNEL32") );
+#endif
+ OurGetThreadTimes = (BOOL (WINAPI*)( HANDLE, FILETIME*, FILETIME*,
+ FILETIME*, FILETIME* ))
+ GetProcAddress( hmodule, _T("GetThreadTimes") );
+
+ if( OurGetThreadTimes &&
+ OurGetThreadTimes( p_this->thread_id,
+ &create_ft, &exit_ft, &kernel_ft, &user_ft ) )
+ {
+ 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 "I64Fd"m%fs, kernel "I64Fd"m%fs, user "I64Fd"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( p_this->thread_id );
#elif defined( HAVE_KERNEL_SCHEDULER_H )
if( i_ret )
{
-#ifdef HAVE_STRERROR
- msg_Err( p_this, "thread_join(%d) failed at %s:%d (%s)",
- (int)p_this->thread_id, psz_file, i_line,
+ 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) );
-#else
- msg_Err( p_this, "thread_join(%d) failed at %s:%d",
- (int)p_this->thread_id, psz_file, i_line );
-#endif
}
else
{
- msg_Dbg( p_this, "thread %d joined (%s:%d)",
- (int)p_this->thread_id, psz_file, i_line );
+ msg_Dbg( p_this, "thread %u joined (%s:%d)",
+ (unsigned int)p_this->thread_id, psz_file, i_line );
}
p_this->b_thread = 0;
projects / vlc / blobdiff