Changeset a9e4de11cbbb54c4fdc9fa16f5adfdfd30e57fcf

Timestamp:

18/08/07 13:03:04 (1 year ago)

Author:

Damien Fouilleul <damienf@videolan.org>

git-committer:

Damien Fouilleul <damienf@videolan.org> 1187434984 +0000

git-parent:

[1144af45baae4cbc6609c46d771f314ce84ddcef]

git-author:

Damien Fouilleul <damienf@videolan.org> 1187434984 +0000

Message:

threads: win32, make sure only object owning a thread can close its handle when object is destroyed

Files:

• include/vlc_threads.h (modified) (1 diff)
• src/misc/objects.c (modified) (2 diffs)
• src/misc/threads.c (modified) (13 diffs)
• src/video_output/video_output.c (modified) (1 diff)

include/vlc_threads.h

@@ -167 +167 @@
-
-#elif defined( WIN32 ) || defined( UNDER_CE )
-
+
+
+
+
+
+
+
+
+
+
+
-typedef BOOL (WINAPI *SIGNALOBJECTANDWAIT) ( HANDLE, HANDLE, DWORD, BOOL );
-typedef unsigned (WINAPI *PTHREAD_START) (void *);
-
-typedef struct

src/misc/objects.c

@@ -425 +425 @@
-        vlc_mutex_unlock( &structure_lock );
-    }
+
+#if defined(WIN32) || defined(UNDER_CE)
+    /* if object has an associated thread, close it now */
+    if( p_priv->thread_id.hThread )
+       CloseHandle(p_priv->thread_id.hThread);
+#endif
-
-    vlc_mutex_destroy( &p_this->object_lock );
@@ -1210 +1216 @@
-    if( p_this->p_internals->b_thread )
-        snprintf( psz_thread, 29, " (thread %u)",
+#if defined(WIN32) || defined(UNDER_CE)
+                  (unsigned)p_this->p_internals->thread_id.id );
+#else
-                  (unsigned)p_this->p_internals->thread_id );
+#endif
-
-    psz_parent[0] = '\0';

src/misc/threads.c

@@ -553 +553 @@
-}
-
-#if defined( WIN32 ) || defined( UNDER_CE )
-
-/*
-** Use a wrapper function which will make sure that 
-** thread handle is closed
-*/
-struct _vlc_win32_init_thread_data {
-    void * ( *func ) (void * );
-    void *p_data;
-};
-
-static unsigned WINAPI __vlc_win32_thread_start(void* p_data) {
-    struct _vlc_win32_init_thread_data *p_win32data =
-        (struct _vlc_win32_init_thread_data *)p_data;
-    vlc_object_t *p_this = (vlc_object_t *)p_win32data->p_data;
-    HANDLE hThread = (HANDLE)p_this->p_internals->thread_id;
-    void *retval = (*p_win32data->func)((LPVOID)p_this);
-    CloseHandle(hThread);
-    return (unsigned)retval;
-}
-
-#endif
-
-/*****************************************************************************
- * vlc_thread_create: create a thread, inner version
@@ -589 +566 @@
-    void *p_data = (void *)p_this;
-    vlc_object_internals_t *p_priv = p_this->p_internals;
-#if defined( WIN32 ) || defined( UNDER_CE )
-    struct _vlc_win32_init_thread_data win32data = { func, p_data };
-#endif
-
-    vlc_mutex_lock( &p_this->object_lock );
@@ -605 +579 @@
-#elif defined( WIN32 ) || defined( UNDER_CE )
-    {
-        unsigned threadID;
-        /* When using the MSVCRT C library you have to use the _beginthreadex
-         * function instead of CreateThread, otherwise you'll end up with
@@ -611 +584 @@
-         * Knowledge Base, article 104641) */
-#if defined( UNDER_CE )
-
-
+
+
+
+
-#else
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        {
-            msg_Warn( p_this, "couldn't set a faster priority" );
@@ -628 +610 @@
-        }
-    }
-
-    i_ret = ( p_priv->thread_id ? 0 : 1 );
-
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
@@ -692 +672 @@
-        p_priv->b_thread = VLC_TRUE;
-
+#if defined( WIN32 ) || defined( UNDER_CE )
+        msg_Dbg( p_this, "thread %u (%s) created at priority %d (%s:%d)",
+                 (unsigned int)p_priv->thread_id.id, psz_name,
+         i_priority, psz_file, i_line );
+#else
-        msg_Dbg( p_this, "thread %u (%s) created at priority %d (%s:%d)",
-                 (unsigned int)p_priv->thread_id, psz_name, i_priority,
-                 psz_file, i_line );
+#endif
+
-
-        vlc_mutex_unlock( &p_this->object_lock );
@@ -718 +705 @@
-#if defined( PTH_INIT_IN_PTH_H ) || defined( ST_INIT_IN_ST_H )
-#elif defined( WIN32 ) || defined( UNDER_CE )
-
-
-(HANDLE)p_priv->thread_i
+.hThread
+.hThread
+p_priv->thread_id.hThrea
-    {
-        msg_Warn( p_this, "couldn't set a faster priority" );
@@ -780 +767 @@
-{
-    vlc_object_internals_t *p_priv = p_this->p_internals;
-
-
-
-
-
-
-
-
-
+
+
-    HMODULE hmodule;
-    BOOL (WINAPI *OurGetThreadTimes)( HANDLE, FILETIME*, FILETIME*,
@@ -796 +776 @@
-    HANDLE hThread;
-   
-
+
+
+
+
-    if( ! DuplicateHandle(GetCurrentProcess(),
-(HANDLE)p_priv->thread_i
+p_priv->thread_id.hThrea
-            GetCurrentProcess(),
-            &hThread,
@@ -806 +789 @@
-    {
-        msg_Err( p_this, "thread_join(%u) failed at %s:%d (%s)",
-, psz_file, i_line
-                        
+.id
+            psz_file, i_line,
-        p_priv->b_thread = VLC_FALSE;
-        return;
@@ -814 +797 @@
-    WaitForSingleObject( hThread, INFINITE );
-
+    msg_Dbg( p_this, "thread %u joined (%s:%d)",
+             (unsigned int)p_priv->thread_id.id,
+             psz_file, i_line );
-#if defined( UNDER_CE )
-    hmodule = GetModuleHandle( _T("COREDLL") );
@@ -851 +837 @@
-    CloseHandle( hThread );
-
+#else /* !defined(WIN32) */
+
+    int i_ret = 0;
+
+#if defined( PTH_INIT_IN_PTH_H )
+    i_ret = ( pth_join( p_priv->thread_id, NULL ) == FALSE );
+
+#elif defined( ST_INIT_IN_ST_H )
+    i_ret = st_thread_join( p_priv->thread_id, NULL );
+
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
-    int32_t exit_value;
-wait_for_thread( p_priv->thread_id, &exit_value 
+i_ret = (B_OK == wait_for_thread( p_priv->thread_id, &exit_value )
-
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
@@ -876 +872 @@
-    }
-
+#endif
+
-    p_priv->b_thread = VLC_FALSE;
-}

src/video_output/video_output.c

@@ -1449 +1449 @@
-    vlc_object_release( p_this->p_input );
-
-#ifdef WIN32
-    CloseHandle( p_this->p_internals->thread_id );
-#endif
-
-    vlc_object_destroy( p_this );
-}