Changeset 651078ecf9be6d0bb9c2323023ebb7fbd7f0d145

Timestamp:

12/18/06 22:40:12 (2 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1166478012 +0000

git-parent:

[965e95ec654de6c1f1067086e0f1e7da74a6ecad]

git-author:

Clément Stenac <zorglub@videolan.org> 1166478012 +0000

Message:

Added initial support for TLS (Thread Local Storage) variables

Files:

• include/vlc_threads.h (modified) (6 diffs)
• include/vlc_threads_funcs.h (modified) (2 diffs)
• src/misc/threads.c (modified) (1 diff)
• test/NativeLibvlcTest.py (modified) (1 diff)
• test/native/init.c (modified) (1 diff)
• test/native/tests.h (modified) (1 diff)
• test/native/threads.c (added)
• test/setup.py (modified) (1 diff)

include/vlc_threads.h

@@ -140 +140 @@
-    vlc_object_t * p_this;
-} vlc_cond_t;
+typedef struct
+{
+} vlc_threadvar_t;
-
-#elif defined( ST_INIT_IN_ST_H )
@@ -153 +156 @@
-    vlc_object_t * p_this;
-} vlc_cond_t;
+typedef struct
+{
+} vlc_threadvar_t;
-
-#elif defined( WIN32 ) || defined( UNDER_CE )
@@ -183 +189 @@
-} vlc_cond_t;
-
+typedef struct
+{
+    DWORD   handle;
+} vlc_threadvar_t;
+
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
-/* This is the BeOS implementation of the vlc threads, note that the mutex is
@@ -206 +217 @@
-} vlc_cond_t;
-
+typedef struct
+{
+} vlc_threadvar_t;
+
+
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
-typedef pthread_t       vlc_thread_t;
@@ -218 +234 @@
-    vlc_object_t * p_this;
-} vlc_cond_t;
+
+typedef struct
+{
+    pthread_key_t handle;
+} vlc_threadvar_t;
-
-#elif defined( HAVE_CTHREADS_H )
@@ -245 +266 @@
-} vlc_cond_t;
-
-
-
+
+
+
+
+
+
+

include/vlc_threads_funcs.h

@@ -39 +39 @@
-VLC_EXPORT( int,  __vlc_cond_init,     ( vlc_object_t *, vlc_cond_t * ) );
-VLC_EXPORT( int,  __vlc_cond_destroy,  ( const char *, int, vlc_cond_t * ) );
+VLC_EXPORT( int, __vlc_threadvar_create, (vlc_object_t *, vlc_threadvar_t * ) );
-VLC_EXPORT( int,  __vlc_thread_create, ( vlc_object_t *, const char *, int, const char *, void * ( * ) ( void * ), int, vlc_bool_t ) );
-VLC_EXPORT( int,  __vlc_thread_set_priority, ( vlc_object_t *, const char *, int, int ) );
@@ -549 +550 @@
-
-/*****************************************************************************
+ * vlc_threadvar_create: create a thread-local variable
+ *****************************************************************************/
+#define vlc_threadvar_create( PTHIS, P_TLS )                                 \
+   __vlc_threadvar_create( PTHIS, P_TLS )
+
+/*****************************************************************************
+ * vlc_threadvar_set: create: set the value of a thread-local variable
+ *****************************************************************************/
+#define vlc_threadvar_set( P_TLS , P_VAL )                                   \
+   __vlc_threadvar_set( __FILE__, __LINE__, P_TLS, P_VAL )
+
+static inline int __vlc_threadvar_set( char* psz_file, int line,
+                                        vlc_threadvar_t * p_tls, void *p_value )
+{
+    int i_ret;
+
+#if defined( PTH_INIT_IN_PTH_H ) || \
+    defined( ST_INIT_IN_ST_H ) || defined( HAVE_KERNEL_SCHEDULER_H )
+    return -1;
+
+#elif defined( UNDER_CE ) || defined( WIN32 )
+    i_ret = ( TlsSetValue( &p_tls->handle, p_value ) != 0 );
+
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+    i_ret = pthread_setspecific( p_tls->handle, p_value );
+
+#elif defined( HAVE_CTHREADS_H )
+    i_ret = cthread_setspecific( p_tls->handle, p_value );
+#endif
+
+    return i_ret;
+}
+
+/*****************************************************************************
+ * vlc_threadvar_get: create: get the value of a thread-local variable
+ *****************************************************************************/
+#define vlc_threadvar_get( P_TLS )                                         \
+   __vlc_threadvar_get( __FILE__, __LINE__, P_TLS )
+
+static inline void* __vlc_threadvar_get( char* psz_file, int line,
+                                         vlc_threadvar_t * p_tls )
+{
+    void* p_ret;
+
+#if defined( PTH_INIT_IN_PTH_H ) || \
+    defined( ST_INIT_IN_ST_H ) || defined( HAVE_KERNEL_SCHEDULER_H )
+    return NULL;
+
+#elif defined( UNDER_CE ) || defined( WIN32 )
+    p_ret = TlsGetValue( &p_tls->handle );
+
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+    p_ret = pthread_getspecific( p_tls->handle );
+
+#elif defined( HAVE_CTHREADS_H )
+    if ( !cthread_getspecific( p_tls->handle, &p_ret ) )
+    {
+        p_ret = NULL;
+    }
+#endif
+
+    return p_ret;
+}
+
+/*****************************************************************************
- * vlc_thread_create: create a thread
- *****************************************************************************/

src/misc/threads.c

@@ -502 +502 @@
-
-/*****************************************************************************
+ * vlc_tls_create: create a thread-local variable
+ *****************************************************************************/
+int __vlc_threadvar_create( vlc_object_t *p_this, vlc_threadvar_t *p_tls )
+{
+#if defined( PTH_INIT_IN_PTH_H )
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
+#elif defined( ST_INIT_IN_ST_H )
+    msg_Err( p_this, "TLS not implemented" );
+    return VLC_EGENERIC;
+
+#elif defined( UNDER_CE ) || defined( WIN32 )
+#elif defined( WIN32 )
+    p_tls->handle = TlsAlloc();
+    if( p_tls->handle == 0xFFFFFFFF )
+    {
+        return VLC_EGENERIC;
+    }
+
+    msg_Err( p_this, "TLS not implemented" );
+    return VLC_EGENERIC;
+
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+    return pthread_key_create( &p_tls->handle, NULL );
+
+#elif defined( HAVE_CTHREADS_H )
+    return cthread_keycreate( &p_tls-handle );
+#endif
+}
+
+/*****************************************************************************
- * vlc_thread_create: create a thread, inner version
- *****************************************************************************

test/NativeLibvlcTest.py

@@ -4 +4 @@
-
-class NativeLibvlcTestCase( unittest.TestCase ):
+    def testTls( self ):
+        """[Thread] Set TLS"""
+        native_libvlc_test.threadvar_test()
-    def test1Exception( self ):
-        """[LibVLC] Checks libvlc_exception"""

test/native/init.c

@@ -25 +25 @@
-   DEF_METHOD( bsearch_member_test, "Test Bsearch with structure" )
-   DEF_METHOD( dict_test, "Test dictionnaries" )
+   DEF_METHOD( threadvar_test, "Test TLS" )
-   { NULL, NULL, 0, NULL }
-};

test/native/tests.h

@@ -6 +6 @@
-PyObject *playlist_test( PyObject *self, PyObject *args );
-PyObject *vlm_test( PyObject *self, PyObject *args );
+
+PyObject *threadvar_test( PyObject *self, PyObject *args );
-
-/* Stats */

test/setup.py

@@ -43 +43 @@
-                sources = ['native/init.c', 'native/url.c', 'native/i18n.c',
-                'native/stats.c', 'native/libvlc.c', 'native/profiles.c',
-
+, 'native/threads.c'
-                include_dirs = ['../include', '../', '/usr/win32/include' ],
-                extra_objects = [ '../src/.libs/libvlc.so', '../src/.libs/libvlc-control.so' ],