Skip to content

V
vlc
Commit 4ef45be2 authored by Pierre Ynard's avatar Pierre Ynard
Browse files
Options

WinCE: remove broken thread times debug 

The call was broken, but still worked, but only half-way...
parent 17492dca
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
src/misc/threads.c
View file @ 4ef45be2
...@@ -169,12 +169,11 @@ void __vlc_thread_join( vlc_object_t *p_this ) ...@@ -169,12 +169,11 @@ void __vlc_thread_join( vlc_object_t *p_this )
#if defined( LIBVLC_USE_PTHREAD ) #if defined( LIBVLC_USE_PTHREAD )
vlc_join (p_priv->thread_id, NULL); vlc_join (p_priv->thread_id, NULL);
#elif defined( UNDER_CE ) || defined( WIN32 ) #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;
#ifndef UNDER_CE
if( ! DuplicateHandle(GetCurrentProcess(), if( ! DuplicateHandle(GetCurrentProcess(),
p_priv->thread_id, p_priv->thread_id,
GetCurrentProcess(), GetCurrentProcess(),
...@@ -186,12 +185,11 @@ void __vlc_thread_join( vlc_object_t *p_this ) ...@@ -186,12 +185,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! */
} }
#else
hThread = p_priv->thread_id->handle;
#endif
vlc_join( p_priv->thread_id, NULL ); vlc_join( p_priv->thread_id, NULL );
/* FIXME: this could work on WinCE too... except that it seems always to
* 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 ) )
{ {
real_time = real_time =
......
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