Commit bce03d65 authored by Pierre Ynard's avatar Pierre Ynard

threads: simplify

Remove repeated code
parent 4ef45be2
...@@ -166,10 +166,7 @@ void __vlc_thread_join( vlc_object_t *p_this ) ...@@ -166,10 +166,7 @@ void __vlc_thread_join( vlc_object_t *p_this )
{ {
vlc_object_internals_t *p_priv = vlc_internals( p_this ); vlc_object_internals_t *p_priv = vlc_internals( p_this );
#if defined( LIBVLC_USE_PTHREAD ) #if defined( WIN32 ) && !defined( UNDER_CE )
vlc_join (p_priv->thread_id, NULL);
#elif defined( WIN32 ) && !defined( UNDER_CE )
HANDLE hThread; HANDLE hThread;
FILETIME create_ft, exit_ft, kernel_ft, user_ft; FILETIME create_ft, exit_ft, kernel_ft, user_ft;
int64_t real_time, kernel_time, user_time; int64_t real_time, kernel_time, user_time;
...@@ -185,9 +182,11 @@ void __vlc_thread_join( vlc_object_t *p_this ) ...@@ -185,9 +182,11 @@ void __vlc_thread_join( vlc_object_t *p_this )
p_priv->b_thread = false; p_priv->b_thread = false;
return; /* We have a problem! */ return; /* We have a problem! */
} }
#endif
vlc_join( p_priv->thread_id, NULL ); vlc_join( p_priv->thread_id, NULL );
#if defined( WIN32 ) && !defined( UNDER_CE )
/* FIXME: this could work on WinCE too... except that it seems always to /* FIXME: this could work on WinCE too... except that it seems always to
* return 0 for exit_ft and kernel_ft */ * return 0 for exit_ft and kernel_ft */
if( GetThreadTimes( hThread, &create_ft, &exit_ft, &kernel_ft, &user_ft ) ) if( GetThreadTimes( hThread, &create_ft, &exit_ft, &kernel_ft, &user_ft ) )
...@@ -215,10 +214,6 @@ void __vlc_thread_join( vlc_object_t *p_this ) ...@@ -215,10 +214,6 @@ void __vlc_thread_join( vlc_object_t *p_this )
(double)((user_time%(60*1000000))/1000000.0) ); (double)((user_time%(60*1000000))/1000000.0) );
} }
CloseHandle( hThread ); CloseHandle( hThread );
#else
vlc_join( p_priv->thread_id, NULL );
#endif #endif
p_priv->b_thread = false; p_priv->b_thread = false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment