* src/video_output/vout_intf.c: new vout_ControlWindow() function.

[vlc] / include / vlc_threads_funcs.h

diff --git a/include/vlc_threads_funcs.h b/include/vlc_threads_funcs.h
index c3996b6e00baff055d2b1a613c242392e2fab63c..51d71c6847b4c63b32fca7ec0816050fa7325dbe 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.11 2002/12/18 11:47:35 sam Exp $
+ * $Id: vlc_threads_funcs.h,v 1.16 2003/11/22 00:41:07 titer Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -73,14 +73,14 @@ 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 );
-    return 0;
+    i_result = 0;
 
 #elif defined( WIN32 )
     if( p_mutex->mutex )
@@ -91,19 +91,7 @@ static inline int __vlc_mutex_lock( char * psz_file, int i_line,
     {
         EnterCriticalSection( &p_mutex->csection );
     }
-    return 0;
-
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
-    i_result = pthread_mutex_lock( &p_mutex->mutex );
-    if ( i_result )
-    {
-        i_thread = (int)pthread_self();
-        psz_error = strerror(i_result);
-    }
-
-#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 )
@@ -118,6 +106,19 @@ static inline int __vlc_mutex_lock( char * psz_file, int i_line,
     {
         i_result = acquire_sem( p_mutex->lock );
     }
+
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+    i_result = pthread_mutex_lock( &p_mutex->mutex );
+    if ( i_result )
+    {
+        i_thread = (int)pthread_self();
+        psz_error = strerror(i_result);
+    }
+
+#elif defined( HAVE_CTHREADS_H )
+    mutex_lock( p_mutex->mutex );
+    i_result = 0;
+
 #endif
 
     if( i_result )
@@ -144,14 +145,14 @@ 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 );
-    return 0;
+    i_result = 0;
 
 #elif defined( WIN32 )
     if( p_mutex->mutex )
@@ -162,19 +163,7 @@ static inline int __vlc_mutex_unlock( char * psz_file, int i_line,
     {
         LeaveCriticalSection( &p_mutex->csection );
     }
-    return 0;
-
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
-    i_result = pthread_mutex_unlock( &p_mutex->mutex );
-    if ( i_result )
-    {
-        i_thread = (int)pthread_self();
-        psz_error = strerror(i_result);
-    }
-
-#elif defined( HAVE_CTHREADS_H )
-    mutex_unlock( p_mutex );
-    return 0;
+    i_result = 0;
 
 #elif defined( HAVE_KERNEL_SCHEDULER_H )
     if( p_mutex == NULL )
@@ -190,6 +179,19 @@ static inline int __vlc_mutex_unlock( char * psz_file, int i_line,
         release_sem( p_mutex->lock );
         return B_OK;
     }
+
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+    i_result = pthread_mutex_unlock( &p_mutex->mutex );
+    if ( i_result )
+    {
+        i_thread = (int)pthread_self();
+        psz_error = strerror(i_result);
+    }
+
+#elif defined( HAVE_CTHREADS_H )
+    mutex_unlock( p_mutex );
+    i_result = 0;
+
 #endif
 
     if( i_result )
@@ -229,14 +231,14 @@ 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 );
-    return 0;
+    i_result = 0;
 
 #elif defined( WIN32 )
     /* Release one waiting thread if one is available. */
@@ -277,23 +279,7 @@ static inline int __vlc_cond_signal( char * psz_file, int i_line,
             WaitForSingleObject( p_condvar->event, INFINITE );
         }
     }
-    return 0;
-
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
-    i_result = pthread_cond_signal( &p_condvar->cond );
-    if ( i_result )
-    {
-        i_thread = (int)pthread_self();
-        psz_error = strerror(i_result);
-    }
-
-#elif defined( HAVE_CTHREADS_H )
-    /* condition_signal() */
-    if ( p_condvar->queue.head || p_condvar->implications )
-    {
-        cond_signal( (condition_t)p_condvar );
-    }
-    return 0;
+    i_result = 0;
 
 #elif defined( HAVE_KERNEL_SCHEDULER_H )
     if( p_condvar == NULL )
@@ -331,6 +317,23 @@ static inline int __vlc_cond_signal( char * psz_file, int i_line,
         }
         i_result = 0;
     }
+
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+    i_result = pthread_cond_signal( &p_condvar->cond );
+    if ( i_result )
+    {
+        i_thread = (int)pthread_self();
+        psz_error = strerror(i_result);
+    }
+
+#elif defined( HAVE_CTHREADS_H )
+    /* condition_signal() */
+    if ( p_condvar->queue.head || p_condvar->implications )
+    {
+        cond_signal( (condition_t)p_condvar );
+    }
+    i_result = 0;
+
 #endif
 
     if( i_result )
@@ -364,7 +367,7 @@ 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 );
@@ -377,7 +380,7 @@ static inline int __vlc_cond_broadcast( char * psz_file, int i_line,
     {
         PulseEvent( p_condvar->event );
     }
-    return 0;
+    i_result = 0;
 
 #elif defined( WIN32 )
     int i;
@@ -423,23 +426,7 @@ static inline int __vlc_cond_broadcast( char * psz_file, int i_line,
             WaitForSingleObject( p_condvar->event, INFINITE );
         }
     }
-    return 0;
-
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
-    i_result = pthread_cond_broadcast( &p_condvar->cond );
-    if ( i_result )
-    {
-        i_thread = (int)pthread_self();
-        psz_error = strerror(i_result);
-    }
-
-#elif defined( HAVE_CTHREADS_H )
-    /* condition_signal() */
-    if ( p_condvar->queue.head || p_condvar->implications )
-    {
-        cond_signal( (condition_t)p_condvar );
-    }
-    return 0;
+    i_result = 0;
 
 #elif defined( HAVE_KERNEL_SCHEDULER_H )
     if( p_condvar == NULL )
@@ -477,6 +464,23 @@ static inline int __vlc_cond_broadcast( char * psz_file, int i_line,
         }
         i_result = 0;
     }
+
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+    i_result = pthread_cond_broadcast( &p_condvar->cond );
+    if ( i_result )
+    {
+        i_thread = (int)pthread_self();
+        psz_error = strerror(i_result);
+    }
+
+#elif defined( HAVE_CTHREADS_H )
+    /* condition_signal() */
+    if ( p_condvar->queue.head || p_condvar->implications )
+    {
+        cond_signal( (condition_t)p_condvar );
+    }
+    i_result = 0;
+
 #endif
 
     if( i_result )
@@ -504,7 +508,8 @@ 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 );
@@ -520,7 +525,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( WIN32 )
     if( !p_condvar->semaphore )
@@ -596,46 +601,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;
-
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
-
-#   ifdef DEBUG
-    /* In debug mode, timeout */
-    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;
-
-        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)", (int)pthread_self(),
-                      psz_file, i_line, strerror(i_result) );
-        }
-        else break;
-    }
-#   else
-    i_result = pthread_cond_wait( &p_condvar->cond, &p_mutex->mutex );
-#   endif
-
-    if ( i_result )
-    {
-        i_thread = (int)pthread_self();
-        psz_error = strerror(i_result);
-    }
-
-#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 )
@@ -660,7 +626,46 @@ 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;
+
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+
+#   ifdef DEBUG
+    /* In debug mode, timeout */
+    struct timeval now;
+    struct timespec timeout;
+
+    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 );
+
+    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
+
+    if ( i_result )
+    {
+        i_thread = (int)pthread_self();
+        psz_error = strerror(i_result);
+    }
+
+#elif defined( HAVE_CTHREADS_H )
+    condition_wait( (condition_t)p_condvar, (mutex_t)p_mutex );
+    i_result = 0;
 
 #endif