* include/configuration.h: bug fix for add_string_from_list()

[vlc] / include / vlc_threads_funcs.h

diff --git a/include/vlc_threads_funcs.h b/include/vlc_threads_funcs.h
index d9586bde593996fa41788524f8ad8cc27dbc2fe1..932cd0cd0af8e8990a5e10134c676cadf1c53bc5 100644 (file)
--- a/include/vlc_threads_funcs.h
+++ b/include/vlc_threads_funcs.h
@@ -3,7 +3,7 @@
  * This header provides a portable threads implementation.
  *****************************************************************************
  * Copyright (C) 1999, 2002 VideoLAN
- * $Id: vlc_threads_funcs.h,v 1.4 2002/10/03 17:01:59 gbazin Exp $
+ * $Id: vlc_threads_funcs.h,v 1.15 2003/03/02 01:35:30 gbazin Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -14,7 +14,7 @@
  * 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
@@ -35,9 +35,11 @@ VLC_EXPORT( int,  __vlc_mutex_destroy, ( char *, int, vlc_mutex_t * ) );
 VLC_EXPORT( int,  __vlc_cond_init,     ( vlc_object_t *, vlc_cond_t * ) );
 VLC_EXPORT( int,  __vlc_cond_destroy,  ( char *, int, vlc_cond_t * ) );
 VLC_EXPORT( int,  __vlc_thread_create, ( vlc_object_t *, char *, int, char *, void * ( * ) ( void * ), int, vlc_bool_t ) );
+VLC_EXPORT( int,  __vlc_thread_set_priority, ( vlc_object_t *, char *, int, int ) );
 VLC_EXPORT( void, __vlc_thread_ready,  ( vlc_object_t * ) );
 VLC_EXPORT( void, __vlc_thread_join,   ( vlc_object_t *, char *, int ) );
 
+
 /*****************************************************************************
  * vlc_threads_init: initialize threads system
  *****************************************************************************/
@@ -71,11 +73,15 @@ static inline int __vlc_mutex_lock( char * psz_file, int i_line,
     const char * psz_error = "";
 
 #if defined( PTH_INIT_IN_PTH_H )
-    i_result = pth_mutex_acquire( &p_mutex->mutex, TRUE, NULL );
+    i_result = ( pth_mutex_acquire( &p_mutex->mutex, FALSE, NULL ) == FALSE );
 
 #elif defined( ST_INIT_IN_ST_H )
     i_result = st_mutex_lock( p_mutex->mutex );
 
+#elif defined( UNDER_CE )
+    EnterCriticalSection( &p_mutex->csection );
+    i_result = 0;
+
 #elif defined( WIN32 )
     if( p_mutex->mutex )
     {
@@ -85,7 +91,7 @@ static inline int __vlc_mutex_lock( char * psz_file, int i_line,
     {
         EnterCriticalSection( &p_mutex->csection );
     }
-    return 0;
+    i_result = 0;
 
 #elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
     i_result = pthread_mutex_lock( &p_mutex->mutex );
@@ -97,7 +103,7 @@ static inline int __vlc_mutex_lock( char * psz_file, int i_line,
 
 #elif defined( HAVE_CTHREADS_H )
     mutex_lock( p_mutex->mutex );
-    return 0;
+    i_result = 0;
 
 #elif defined( HAVE_KERNEL_SCHEDULER_H )
     if( p_mutex == NULL )
@@ -138,11 +144,15 @@ static inline int __vlc_mutex_unlock( char * psz_file, int i_line,
     const char * psz_error = "";
 
 #if defined( PTH_INIT_IN_PTH_H )
-    i_result = pth_mutex_release( &p_mutex->mutex );
+    i_result = ( pth_mutex_release( &p_mutex->mutex ) == FALSE );
 
 #elif defined( ST_INIT_IN_ST_H )
     i_result = st_mutex_unlock( p_mutex->mutex );
 
+#elif defined( UNDER_CE )
+    LeaveCriticalSection( &p_mutex->csection );
+    i_result = 0;
+
 #elif defined( WIN32 )
     if( p_mutex->mutex )
     {
@@ -152,7 +162,7 @@ static inline int __vlc_mutex_unlock( char * psz_file, int i_line,
     {
         LeaveCriticalSection( &p_mutex->csection );
     }
-    return 0;
+    i_result = 0;
 
 #elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
     i_result = pthread_mutex_unlock( &p_mutex->mutex );
@@ -164,7 +174,7 @@ static inline int __vlc_mutex_unlock( char * psz_file, int i_line,
 
 #elif defined( HAVE_CTHREADS_H )
     mutex_unlock( p_mutex );
-    return 0;
+    i_result = 0;
 
 #elif defined( HAVE_KERNEL_SCHEDULER_H )
     if( p_mutex == NULL )
@@ -219,11 +229,15 @@ static inline int __vlc_cond_signal( char * psz_file, int i_line,
     const char * psz_error = "";
 
 #if defined( PTH_INIT_IN_PTH_H )
-    i_result = pth_cond_notify( &p_condvar->cond, FALSE );
+    i_result = ( pth_cond_notify( &p_condvar->cond, FALSE ) == FALSE );
 
 #elif defined( ST_INIT_IN_ST_H )
     i_result = st_cond_signal( p_condvar->cond );
 
+#elif defined( UNDER_CE )
+    PulseEvent( p_condvar->event );
+    i_result = 0;
+
 #elif defined( WIN32 )
     /* Release one waiting thread if one is available. */
     /* For this trick to work properly, the vlc_cond_signal must be surrounded
@@ -263,7 +277,7 @@ static inline int __vlc_cond_signal( char * psz_file, int i_line,
             WaitForSingleObject( p_condvar->event, INFINITE );
         }
     }
-    return 0;
+    i_result = 0;
 
 #elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
     i_result = pthread_cond_signal( &p_condvar->cond );
@@ -279,7 +293,7 @@ static inline int __vlc_cond_signal( char * psz_file, int i_line,
     {
         cond_signal( (condition_t)p_condvar );
     }
-    return 0;
+    i_result = 0;
 
 #elif defined( HAVE_KERNEL_SCHEDULER_H )
     if( p_condvar == NULL )
@@ -315,6 +329,7 @@ static inline int __vlc_cond_signal( char * psz_file, int i_line,
                 return 0;
             }
         }
+        i_result = 0;
     }
 #endif
 
@@ -349,11 +364,21 @@ static inline int __vlc_cond_broadcast( char * psz_file, int i_line,
     const char * psz_error = "";
 
 #if defined( PTH_INIT_IN_PTH_H )
-    i_result = pth_cond_notify( &p_condvar->cond, FALSE );
+    i_result = ( pth_cond_notify( &p_condvar->cond, TRUE ) == FALSE );
 
 #elif defined( ST_INIT_IN_ST_H )
     i_result = st_cond_broadcast( p_condvar->cond );
 
+#elif defined( UNDER_CE )
+    int i;
+
+    /* Release all waiting threads. */
+    for( i = p_condvar->i_waiting_threads; i > 0; i-- )
+    {
+        PulseEvent( p_condvar->event );
+    }
+    i_result = 0;
+
 #elif defined( WIN32 )
     int i;
 
@@ -398,7 +423,7 @@ static inline int __vlc_cond_broadcast( char * psz_file, int i_line,
             WaitForSingleObject( p_condvar->event, INFINITE );
         }
     }
-    return 0;
+    i_result = 0;
 
 #elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
     i_result = pthread_cond_broadcast( &p_condvar->cond );
@@ -414,7 +439,7 @@ static inline int __vlc_cond_broadcast( char * psz_file, int i_line,
     {
         cond_signal( (condition_t)p_condvar );
     }
-    return 0;
+    i_result = 0;
 
 #elif defined( HAVE_KERNEL_SCHEDULER_H )
     if( p_condvar == NULL )
@@ -450,6 +475,7 @@ static inline int __vlc_cond_broadcast( char * psz_file, int i_line,
                 return 0;
             }
         }
+        i_result = 0;
     }
 #endif
 
@@ -478,13 +504,25 @@ static inline int __vlc_cond_wait( char * psz_file, int i_line,
     const char * psz_error = "";
 
 #if defined( PTH_INIT_IN_PTH_H )
-    i_result = pth_cond_await( &p_condvar->cond, &p_mutex->mutex, NULL );
+    i_result = ( pth_cond_await( &p_condvar->cond, &p_mutex->mutex, NULL )
+                 == FALSE );
 
 #elif defined( ST_INIT_IN_ST_H )
     st_mutex_unlock( p_mutex->mutex );
     i_result = st_cond_wait( p_condvar->cond );
     st_mutex_lock( p_mutex->mutex );
 
+#elif defined( UNDER_CE )
+    p_condvar->i_waiting_threads++;
+    LeaveCriticalSection( &p_mutex->csection );
+    WaitForSingleObject( p_condvar->event, INFINITE );
+    p_condvar->i_waiting_threads--;
+
+    /* Reacquire the mutex before returning. */
+    vlc_mutex_lock( p_mutex );
+
+    i_result = 0;
+
 #elif defined( WIN32 )
     if( !p_condvar->semaphore )
     {
@@ -559,7 +597,7 @@ static inline int __vlc_cond_wait( char * psz_file, int i_line,
     /* Reacquire the mutex before returning. */
     vlc_mutex_lock( p_mutex );
 
-    return 0;
+    i_result = 0;
 
 #elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
 
@@ -568,24 +606,24 @@ static inline int __vlc_cond_wait( char * psz_file, int i_line,
     struct timeval now;
     struct timespec timeout;
 
-    for( ; ; )
-    {
-        gettimeofday( &now, NULL );
-        timeout.tv_sec = now.tv_sec + THREAD_COND_TIMEOUT;
-        timeout.tv_nsec = now.tv_usec * 1000;
+    gettimeofday( &now, NULL );
+    timeout.tv_sec = now.tv_sec + THREAD_COND_TIMEOUT;
+    timeout.tv_nsec = now.tv_usec * 1000;
 
-        i_result = pthread_cond_timedwait( &p_condvar->cond, &p_mutex->mutex,
-                                           &timeout );
+    i_result = pthread_cond_timedwait( &p_condvar->cond, &p_mutex->mutex,
+                                       &timeout );
 
-        if( i_result == ETIMEDOUT )
-        {
-            msg_Warn( p_condvar->p_this,
-                      "thread %d: possible deadlock detected "
-                      "in cond_wait at %s:%d (%s)", pthread_self(),
-                      psz_file, i_line, strerror(i_result) );
-        }
-        else break;
+    if( i_result == ETIMEDOUT )
+    {
+        /* People keep pissing me off with this. --Meuuh */
+        msg_Dbg( p_condvar->p_this,
+                  "thread %d: secret message triggered "
+                  "at %s:%d (%s)", (int)pthread_self(),
+                  psz_file, i_line, strerror(i_result) );
+
+        i_result = pthread_cond_wait( &p_condvar->cond, &p_mutex->mutex );
     }
+
 #   else
     i_result = pthread_cond_wait( &p_condvar->cond, &p_mutex->mutex );
 #   endif
@@ -598,7 +636,7 @@ static inline int __vlc_cond_wait( char * psz_file, int i_line,
 
 #elif defined( HAVE_CTHREADS_H )
     condition_wait( (condition_t)p_condvar, (mutex_t)p_mutex );
-    return 0;
+    i_result = 0;
 
 #elif defined( HAVE_KERNEL_SCHEDULER_H )
     if( p_condvar == NULL )
@@ -623,7 +661,7 @@ static inline int __vlc_cond_wait( char * psz_file, int i_line,
     p_condvar->thread = -1;
 
     vlc_mutex_lock( p_mutex );
-    return 0;
+    i_result = 0;
 
 #endif
 
@@ -649,6 +687,12 @@ static inline int __vlc_cond_wait( char * psz_file, int i_line,
 #define vlc_thread_create( P_THIS, PSZ_NAME, FUNC, PRIORITY, WAIT )         \
     __vlc_thread_create( VLC_OBJECT(P_THIS), __FILE__, __LINE__, PSZ_NAME, (void * ( * ) ( void * ))FUNC, PRIORITY, WAIT )
 
+/*****************************************************************************
+ * vlc_thread_set_priority: set the priority of the calling thread
+ *****************************************************************************/
+#define vlc_thread_set_priority( P_THIS, PRIORITY )                         \
+    __vlc_thread_set_priority( VLC_OBJECT(P_THIS), __FILE__, __LINE__, PRIORITY )
+
 /*****************************************************************************
  * vlc_thread_ready: tell the parent thread we were successfully spawned
  *****************************************************************************/
@@ -659,4 +703,4 @@ static inline int __vlc_cond_wait( char * psz_file, int i_line,
  * vlc_thread_join: wait until a thread exits
  *****************************************************************************/
 #define vlc_thread_join( P_THIS )                                           \
-    __vlc_thread_join( VLC_OBJECT(P_THIS), __FILE__, __LINE__ ) 
+    __vlc_thread_join( VLC_OBJECT(P_THIS), __FILE__, __LINE__ )