Changeset 1746fdda5a2bc062d52a3b8a30d9d1d6518e64b4

Timestamp:

28/05/08 20:52:22 (5 months ago)

Author:

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

git-committer:

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

git-parent:

[94f55c6038a3f727f3de61099167a44dfd9f2cd6]

git-author:

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

Message:

vlc_threadobj(): returns the object nesting the current thread

Also fix the threads entry point prototype on Windows.

Files:

• src/libvlc.h (modified) (1 diff)
• src/misc/objects.c (modified) (1 diff)
• src/misc/threads.c (modified) (7 diffs)

src/libvlc.h

@@ -46 +46 @@
-int vlc_threads_init( void );
-void vlc_threads_end( void );
+vlc_object_t *vlc_threadobj (void);
-
-/*

src/misc/objects.c

@@ -86 +86 @@
- * Local structure lock
- *****************************************************************************/
-
+
+
-
-void *vlc_custom_create( vlc_object_t *p_this, size_t i_size,

src/misc/threads.c

@@ -63 +63 @@
-}
-
+/**
+ * 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;
@@ -151 +160 @@
-
-        /* 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 );
-    }
@@ -182 +192 @@
-        vlc_object_release( p_root );
-        vlc_threadvar_delete( &msg_context_global_key );
+        vlc_threadvar_delete( &thread_object_key );
-    }
-    i_initializations--;
@@ -412 +423 @@
-}
-
+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
@@ -423 +461 @@
-{
-    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 )
-func, p_data
+thread_entry, boot
-
-#ifndef __APPLE__
@@ -472 +515 @@
-         * Knowledge Base, article 104641) */
-#if defined( UNDER_CE )
-(LPTHREAD_START_ROUTINE)func
-p_data
+thread_entry
+boot
-                                        NULL );
-#else
-        HANDLE hThread = (HANDLE)(uintptr_t)
-(LPTHREAD_START_ROUTINE)func
-(void *)p_data, 
+thread_entry, boot
+
-#endif
-        p_priv->thread_id = hThread;
@@ -496 +539 @@
-
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
-func
+thread_entry
-                                      i_priority, p_data );
-    i_ret = resume_thread( p_priv->thread_id );