Changeset 3afd1ff1ab186f1f550469e9d4f656eff566ecbf

Timestamp:

05/08/08 20:55:05 (2 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1210272905 +0300

git-parent:

[55aeca35b861a188c4447349fb9c189a1304d4f5]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1210272905 +0300

Message:

Move pthread to the front.

If anyone wants to try on Win32, that's going to help.

Files:

• src/misc/threads.c (modified) (24 diffs)

src/misc/threads.c

@@ -47 +47 @@
-static volatile unsigned i_initializations = 0;
-
-
-
-
-
+
-static pthread_mutex_t once_mutex = PTHREAD_MUTEX_INITIALIZER;
-#endif
@@ -134 +131 @@
-    /* If we have lazy mutex initialization, use it. Otherwise, we just
-     * hope nothing wrong happens. */
-
-
-
-
+
-    pthread_mutex_lock( &once_mutex );
-#endif
@@ -159 +153 @@
-    /* If we have lazy mutex initialization support, unlock the mutex.
-     * Otherwize, we are screwed. */
-
-
-
-
+
-    pthread_mutex_unlock( &once_mutex );
-#endif
@@ -176 +167 @@
-void vlc_threads_end( void )
-{
-
-
-
-
+
-    pthread_mutex_lock( &once_mutex );
-#endif
@@ -189 +177 @@
-    i_initializations--;
-
-
-
-
-
+
-    pthread_mutex_unlock( &once_mutex );
-#endif
@@ -207 +192 @@
-int vlc_mutex_init( vlc_mutex_t *p_mutex )
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    pthread_mutexattr_t attr;
-    int                 i_result;
@@ -253 +209 @@
-    pthread_mutexattr_destroy( &attr );
-    return i_result;
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    *p_mutex = CreateMutex( 0, FALSE, 0 );
-    return (*p_mutex != NULL) ? 0 : ENOMEM;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    pthread_mutexattr_t attr;
-    int                 i_result;
@@ -274 +255 @@
-    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!
@@ -285 +270 @@
-void __vlc_mutex_destroy( const char * psz_file, int i_line, vlc_mutex_t *p_mutex )
-{
-
+
+
+
+
+
-    VLC_UNUSED( psz_file); VLC_UNUSED( i_line );
-
@@ -301 +290 @@
-    p_mutex->init = 0;
-
-#elif defined( LIBVLC_USE_PTHREAD )
-    int val = pthread_mutex_destroy( p_mutex );
-    VLC_THREAD_ASSERT ("destroying mutex");
-
-#endif
-}
@@ -313 +298 @@
-int __vlc_cond_init( vlc_cond_t *p_condvar )
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    pthread_condattr_t attr;
-    int ret;
@@ -360 +319 @@
-    return ret;
-
+#elif defined( UNDER_CE ) || defined( WIN32 )
+    /* Initialize counter */
+    p_condvar->i_waiting_threads = 0;
+
+    /* Create an auto-reset event. */
+    p_condvar->event = CreateEvent( NULL,   /* no security */
+                                    FALSE,  /* auto-reset event */
+                                    FALSE,  /* start non-signaled */
+                                    NULL ); /* unnamed */
+    return !p_condvar->event;
+
+#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
-}
@@ -368 +353 @@
-void __vlc_cond_destroy( const char * psz_file, int i_line, vlc_cond_t *p_condvar )
-{
-
+
+
+
+
+
-    VLC_UNUSED( psz_file); VLC_UNUSED( i_line );
-
@@ -376 +365 @@
-    p_condvar->init = 0;
-
-#elif defined( LIBVLC_USE_PTHREAD )
-    int val = pthread_cond_destroy( p_condvar );
-    VLC_THREAD_ASSERT ("destroying condition");
-
-#endif
-}
@@ -390 +375 @@
-    int i_ret = -1;
-
-HAVE_KERNEL_SCHEDULER_H
-
+LIBVLC_USE_PTHREAD
+
-#elif defined( UNDER_CE )
-#elif defined( WIN32 )
-    *p_tls = TlsAlloc();
-    i_ret = (*p_tls == INVALID_HANDLE_VALUE) ? EAGAIN : 0;
-
-
-
+
+
-#endif
-    return i_ret;
@@ -419 +403 @@
-    vlc_mutex_lock( &p_this->object_lock );
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-        /* When using the MSVCRT C library you have to use the _beginthreadex
@@ -458 +479 @@
-    i_ret = resume_thread( p_priv->thread_id );
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-        int i_error, i_policy;
@@ -470 +531 @@
-        memset( &param, 0, sizeof(struct sched_param) );
-        if( config_GetType( p_this, "rt-offset" ) )
-        {
-            i_priority += config_GetInt( p_this, "rt-offset" );
-        }
-        if( i_priority <= 0 )
-        {
@@ -483 +542 @@
-            i_policy = SCHED_RR;
-        }
+        if( !p_priv->thread_id )
+            p_priv->thread_id = pthread_self();
-        if( (i_error = pthread_setschedparam( p_priv->thread_id,
-                                               i_policy, &param )) )
@@ -492 +553 @@
-        }
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    VLC_UNUSED( psz_file); VLC_UNUSED( i_line );
-
@@ -554 +565 @@
-    }
-
-#elif 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( &param, 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( !p_priv->thread_id )
-            p_priv->thread_id = pthread_self();
-        if( (i_error = pthread_setschedparam( p_priv->thread_id,
-                                               i_policy, &param )) )
-        {
-            errno = i_error;
-            msg_Warn( p_this, "couldn't set thread priority (%s:%d): %m",
-                      psz_file, i_line );
-            i_priority = 0;
-        }
-    }
-#endif
-
@@ -607 +584 @@
-{
-    vlc_object_internals_t *p_priv = vlc_internals( p_this );
-
-
+
+
+
+
+
+
+
+
+
+
+
-    HMODULE hmodule;
-    BOOL (WINAPI *OurGetThreadTimes)( HANDLE, FILETIME*, FILETIME*,
@@ -677 +663 @@
-    CloseHandle( hThread );
-
-
-
-
-
-
+
-    int32_t exit_value;
-    i_ret = (B_OK == wait_for_thread( p_priv->thread_id, &exit_value ));
-
-#elif 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))
-        i_ret = pthread_detach (p_priv->thread_id);
-    else
-        i_ret = pthread_join (p_priv->thread_id, NULL);
-#endif
-
@@ -701 +676 @@
-    }
-    else
-    {
-        msg_Dbg( p_this, "thread %u joined (%s:%d)",
-                         (unsigned int)p_priv->thread_id, psz_file, i_line );
-    }
-
-#endif
-
-    p_priv->b_thread = false;
-}
-