Changeset 7fd77d963a10bba8397593a48a23b970665a9d91

Timestamp:

01/27/08 16:56:24 (7 months ago)

Author:

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

git-committer:

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

git-parent:

[37bc09bf45ed85666de87b46718f69b5c1fb46bd]

git-author:

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

Message:

Default to using pthread instead of exploding.
This fixes the single largest source of problems when including vlc/*.h out of the box.

Files:

• configure.ac (modified) (1 diff)
• include/vlc_threads.h (modified) (4 diffs)
• include/vlc_threads_funcs.h (modified) (8 diffs)
• src/libvlc-module.c (modified) (2 diffs)
• src/misc/threads.c (modified) (15 diffs)

configure.ac

@@ -765 +765 @@
-  AC_DEFINE(HAVE_NANOSLEEP, 1, [Define if nanosleep is available.])
-fi
+fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" 
-
-dnl Check for misc headers
-AC_MSG_CHECKING(for pthread_cond_t in pthread.h)
-AC_EGREP_HEADER(pthread_cond_t,pthread.h,[
-  AC_MSG_RESULT(yes)
-  AC_DEFINE(PTHREAD_COND_T_IN_PTHREAD_H, 1,
-            Define if <pthread.h> defines pthread_cond_t.)],[
-  AC_MSG_RESULT(no)])
-
-AC_MSG_CHECKING(for strncasecmp in strings.h)
-AC_EGREP_HEADER(strncasecmp,strings.h,[

include/vlc_threads.h

@@ -45 +45 @@
-#   include <byteorder.h>
-
-if defined( PTHREAD_COND_T_IN_PTHREAD_H )
+se                                       
-#   define LIBVLC_USE_PTHREAD 1
-#   define _APPLE_C_SOURCE    1 /* Proper pthread semantics on OSX */
@@ -56 +56 @@
-#      include <time.h>
-#   endif
-
-#else
-#   error no threads available on your system !
-
-#endif
@@ -83 +80 @@
-#   define VLC_THREAD_PRIORITY_HIGHEST 15
-
-PTHREAD_COND_T_IN_PTHREAD_H
+LIBVLC_USE_PTHREAD
-#   define VLC_THREAD_PRIORITY_LOW 0
-#   define VLC_THREAD_PRIORITY_INPUT 20
@@ -190 +187 @@
-
-
-if defined( PTHREAD_COND_T_IN_PTHREAD_H )
+se
-typedef pthread_t       vlc_thread_t;
-typedef struct

include/vlc_threads_funcs.h

@@ -85 +85 @@
-    __vlc_mutex_lock( __FILE__, __LINE__, P_MUTEX )
-
- PTHREAD_COND_T_IN_PTHREAD_H 
+LIBVLC_USE_PTHREAD
-static inline unsigned long int CAST_PTHREAD_TO_INT (pthread_t th)
-{
@@ -130 +130 @@
-    }
-
- PTHREAD_COND_T_IN_PTHREAD_H 
+LIBVLC_USE_PTHREAD
-#   define vlc_assert_locked( m ) \
-           assert (pthread_mutex_lock (&((m)->mutex)) == EDEADLK)
@@ -200 +200 @@
-    }
-
- PTHREAD_COND_T_IN_PTHREAD_H 
+LIBVLC_USE_PTHREAD
-    i_result = pthread_mutex_unlock( &p_mutex->mutex );
-    if ( i_result )
@@ -333 +333 @@
-    }
-
- PTHREAD_COND_T_IN_PTHREAD_H 
+LIBVLC_USE_PTHREAD
-    i_result = pthread_cond_signal( &p_condvar->cond );
-    if ( i_result )
@@ -479 +479 @@
-    i_result = 0;
-
- PTHREAD_COND_T_IN_PTHREAD_H 
+LIBVLC_USE_PTHREAD
-
-#   ifdef DEBUG
@@ -655 +655 @@
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
-#   error Unimplemented
- PTHREAD_COND_T_IN_PTHREAD_H 
+LIBVLC_USE_PTHREAD
-    lldiv_t d = lldiv( deadline, 1000000 );
-    struct timespec ts = { d.quot, d.rem * 1000 };
@@ -707 +707 @@
-    i_ret = ( TlsSetValue( p_tls->handle, p_value ) != 0 );
-
- PTHREAD_COND_T_IN_PTHREAD_H 
+LIBVLC_USE_PTHREAD
-    i_ret = pthread_setspecific( p_tls->handle, p_value );
-
@@ -727 +727 @@
-    p_ret = TlsGetValue( p_tls->handle );
-
- PTHREAD_COND_T_IN_PTHREAD_H 
+LIBVLC_USE_PTHREAD
-    p_ret = pthread_getspecific( p_tls->handle );
-

src/libvlc-module.c

@@ -1814 +1814 @@
-        change_need_restart();
-
-PTHREAD_COND_T_IN_PTHREAD_H
+LIBVLC_USE_PTHREAD
-    add_bool( "rt-priority", VLC_FALSE, NULL, RT_PRIORITY_TEXT,
-              RT_PRIORITY_LONGTEXT, VLC_TRUE );
@@ -1820 +1820 @@
-#endif
-
-PTHREAD_COND_T_IN_PTHREAD_H
+LIBVLC_USE_PTHREAD
-    add_integer( "rt-offset", 0, NULL, RT_OFFSET_TEXT,
-                 RT_OFFSET_LONGTEXT, VLC_TRUE );

src/misc/threads.c

@@ -73 +73 @@
-
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
-PTHREAD_COND_T_IN_PTHREAD_H
+LIBVLC_USE_PTHREAD
-static pthread_mutex_t once_mutex = PTHREAD_MUTEX_INITIALIZER;
-#endif
@@ -116 +116 @@
-    }
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
-PTHREAD_COND_T_IN_PTHREAD_H
+LIBVLC_USE_PTHREAD
-    pthread_mutex_lock( &once_mutex );
-#endif
@@ -147 +147 @@
-
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
-PTHREAD_COND_T_IN_PTHREAD_H
+LIBVLC_USE_PTHREAD
-#endif
-
@@ -180 +180 @@
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
-    while( i_status == VLC_THREADS_PENDING ) msleep( THREAD_SLEEP );
-PTHREAD_COND_T_IN_PTHREAD_H
+LIBVLC_USE_PTHREAD
-    pthread_mutex_unlock( &once_mutex );
-#endif
@@ -203 +203 @@
-#elif defined( WIN32 )
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
-PTHREAD_COND_T_IN_PTHREAD_H
+LIBVLC_USE_PTHREAD
-    pthread_mutex_lock( &once_mutex );
-#endif
@@ -220 +220 @@
-#elif defined( WIN32 )
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
-PTHREAD_COND_T_IN_PTHREAD_H
+LIBVLC_USE_PTHREAD
-    pthread_mutex_unlock( &once_mutex );
-#endif
@@ -281 +281 @@
-    return B_OK;
-
-PTHREAD_COND_T_IN_PTHREAD_H
+LIBVLC_USE_PTHREAD
-# if defined(DEBUG)
-    {
@@ -314 +314 @@
-    p_mutex->mutex = CreateMutex( 0, FALSE, 0 );
-    return ( p_mutex->mutex != NULL ? 0 : 1 );
-PTHREAD_COND_T_IN_PTHREAD_H
+LIBVLC_USE_PTHREAD
-    pthread_mutexattr_t attr;
-    int                 i_result;
@@ -372 +372 @@
-    return B_OK;
-
-PTHREAD_COND_T_IN_PTHREAD_H
+LIBVLC_USE_PTHREAD
-    i_result = pthread_mutex_destroy( &p_mutex->mutex );
-    if( i_result )
@@ -464 +464 @@
-    return 0;
-
-PTHREAD_COND_T_IN_PTHREAD_H
+LIBVLC_USE_PTHREAD
-    pthread_condattr_t attr;
-    int ret;
@@ -514 +514 @@
-    return 0;
-
-PTHREAD_COND_T_IN_PTHREAD_H
+LIBVLC_USE_PTHREAD
-    i_result = pthread_cond_destroy( &p_condvar->cond );
-    if( i_result )
@@ -550 +550 @@
-    i_ret = !( p_tls->handle == 0xFFFFFFFF );
-
-PTHREAD_COND_T_IN_PTHREAD_H
+LIBVLC_USE_PTHREAD
-    i_ret =  pthread_key_create( &p_tls->handle, NULL );
-#endif
@@ -611 +611 @@
-    i_ret = resume_thread( p_priv->thread_id );
-
-PTHREAD_COND_T_IN_PTHREAD_H
+LIBVLC_USE_PTHREAD
-    i_ret = pthread_create( &p_priv->thread_id, NULL, func, p_data );
-
@@ -706 +706 @@
-    }
-
-PTHREAD_COND_T_IN_PTHREAD_H
+LIBVLC_USE_PTHREAD
-# ifndef __APPLE__
-    if( config_GetInt( p_this, "rt-priority" ) > 0 )
@@ -838 +838 @@
-    i_ret = (B_OK == wait_for_thread( p_priv->thread_id, &exit_value ));
-
-PTHREAD_COND_T_IN_PTHREAD_H
+LIBVLC_USE_PTHREAD
-    i_ret = pthread_join( p_priv->thread_id, NULL );
-