vlc_threadobj(): returns the object nesting the current thread

Also fix the threads entry point prototype on Windows.

diff --git a/src/libvlc.h b/src/libvlc.h
index f23490c994d7e91b3845d9f5116628e82bd46a74..9597df67820add1e01730e6ae6d103a789b151a6 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -45,6 +45,7 @@ void system_End       ( libvlc_int_t * );
  */
 int vlc_threads_init( void );
 void vlc_threads_end( void );
+vlc_object_t *vlc_threadobj (void);
 
 /*
  * CPU capabilities

diff --git a/src/misc/objects.c b/src/misc/objects.c
index 4a16e1bc2903ba3b20e02b6b5b0fe1ce51e90caf..1b84e311cbfbba27fb2a6d140020e676c31b8e93 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -85,7 +85,8 @@ static void vlc_object_detach_unlocked (vlc_object_t *p_this);
 /*****************************************************************************
  * Local structure lock
  *****************************************************************************/
-static vlc_mutex_t    structure_lock;
+static vlc_mutex_t     structure_lock;
+static vlc_threadvar_t thread_object;
 
 void *vlc_custom_create( vlc_object_t *p_this, size_t i_size,
                          int i_type, const char *psz_type )

diff --git a/src/misc/threads.c b/src/misc/threads.c
index 0ab4efaf655d6adf018e6d092d1768270ce86d81..16f4987da0562045c5dffd00ad2c57d71f7a1f7f 100644 (file)
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -62,6 +62,15 @@ libvlc_global_data_t *vlc_global( void )
     return p_root;
 }
 
+/**
+ * Object running the current thread
+ */
+static vlc_threadvar_t thread_object_key;
+
+vlc_object_t *vlc_threadobj (void)
+{
+    return vlc_threadvar_get (&thread_object_key);
+}
 
 vlc_threadvar_t msg_context_global_key;
 
@@ -150,6 +159,7 @@ int vlc_threads_init( void )
         }
 
         /* We should be safe now. Do all the initialization stuff we want. */
+        vlc_threadvar_create( &thread_object_key, NULL );
         vlc_threadvar_create( &msg_context_global_key, msg_StackDestroy );
     }
     i_initializations++;
@@ -181,6 +191,7 @@ void vlc_threads_end( void )
     {
         vlc_object_release( p_root );
         vlc_threadvar_delete( &msg_context_global_key );
+        vlc_threadvar_delete( &thread_object_key );
     }
     i_initializations--;
 
@@ -411,6 +422,33 @@ void vlc_threadvar_delete (vlc_threadvar_t *p_tls)
 #endif
 }
 
+struct vlc_thread_boot
+{
+    void * (*entry) (void *);
+    vlc_object_t *object;
+};
+
+#if defined (LIBVLC_USE_PTHREAD)
+# define THREAD_RTYPE void *
+# define THREAD_RVAL  NULL
+#elif defined (WIN32)
+# define THREAD_RTYPE __stdcall unsigned
+# define THREAD_RVAL 0
+#endif
+
+static THREAD_RTYPE thread_entry (void *data)
+{
+    vlc_object_t *obj = ((struct vlc_thread_boot *)data)->object;
+    void *(*func) (void *) = ((struct vlc_thread_boot *)data)->entry;
+
+    free (data);
+    vlc_threadvar_set (&thread_object_key, obj);
+    msg_Dbg (obj, "thread started");
+    func (obj);
+    msg_Dbg (obj, "thread ended");
+    return THREAD_RVAL;
+}
+
 /*****************************************************************************
  * vlc_thread_create: create a thread, inner version
  *****************************************************************************
@@ -422,13 +460,18 @@ int __vlc_thread_create( vlc_object_t *p_this, const char * psz_file, int i_line
                          int i_priority, bool b_wait )
 {
     int i_ret;
-    void *p_data = (void *)p_this;
     vlc_object_internals_t *p_priv = vlc_internals( p_this );
 
+    struct vlc_thread_boot *boot = malloc (sizeof (*boot));
+    if (boot == NULL)
+        return errno;
+    boot->entry = func;
+    boot->object = p_this;
+
     vlc_mutex_lock( &p_this->object_lock );
 
 #if defined( LIBVLC_USE_PTHREAD )
-    i_ret = pthread_create( &p_priv->thread_id, NULL, func, p_data );
+    i_ret = pthread_create( &p_priv->thread_id, NULL, thread_entry, boot );
 
 #ifndef __APPLE__
     if( config_GetInt( p_this, "rt-priority" ) > 0 )
@@ -471,13 +514,13 @@ int __vlc_thread_create( vlc_object_t *p_this, const char * psz_file, int i_line
          * memory leaks and the signal functions not working (see Microsoft
          * Knowledge Base, article 104641) */
 #if defined( UNDER_CE )
-        HANDLE hThread = CreateThread( NULL, 0, (LPTHREAD_START_ROUTINE)func,
-                                       (LPVOID)p_data, CREATE_SUSPENDED,
+        HANDLE hThread = CreateThread( NULL, 0, thread_entry,
+                                       (LPVOID)boot, CREATE_SUSPENDED,
                                         NULL );
 #else
         HANDLE hThread = (HANDLE)(uintptr_t)
-            _beginthreadex( NULL, 0, (LPTHREAD_START_ROUTINE)func,
-                            (void *)p_data, CREATE_SUSPENDED, NULL );
+            _beginthreadex( NULL, 0, thread_entry, boot,
+                            CREATE_SUSPENDED, NULL );
 #endif
         p_priv->thread_id = hThread;
         ResumeThread(hThread);
@@ -495,7 +538,7 @@ int __vlc_thread_create( vlc_object_t *p_this, const char * psz_file, int i_line
     }
 
 #elif defined( HAVE_KERNEL_SCHEDULER_H )
-    p_priv->thread_id = spawn_thread( (thread_func)func, psz_name,
+    p_priv->thread_id = spawn_thread( (thread_func)thread_entry, psz_name,
                                       i_priority, p_data );
     i_ret = resume_thread( p_priv->thread_id );