[vlc-devel] commit: WinCE: remove broken thread times debug (Pierre Ynard )
git version control
git at videolan.org
Wed Aug 12 16:36:06 CEST 2009
vlc | branch: master | Pierre Ynard <linkfanel at yahoo.fr> | Wed Aug 12 16:33:10 2009 +0200| [4ef45be243f2b5a52bc043388561ae5c92e318d1] | committer: Pierre Ynard
WinCE: remove broken thread times debug
The call was broken, but still worked, but only half-way...
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4ef45be243f2b5a52bc043388561ae5c92e318d1
---
src/misc/threads.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/misc/threads.c b/src/misc/threads.c
index 5dd6f12..005a0ff 100644
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -169,12 +169,11 @@ void __vlc_thread_join( vlc_object_t *p_this )
#if defined( LIBVLC_USE_PTHREAD )
vlc_join (p_priv->thread_id, NULL);
-#elif defined( UNDER_CE ) || defined( WIN32 )
+#elif defined( WIN32 ) && !defined( UNDER_CE )
HANDLE hThread;
FILETIME create_ft, exit_ft, kernel_ft, user_ft;
int64_t real_time, kernel_time, user_time;
-#ifndef UNDER_CE
if( ! DuplicateHandle(GetCurrentProcess(),
p_priv->thread_id,
GetCurrentProcess(),
@@ -186,12 +185,11 @@ void __vlc_thread_join( vlc_object_t *p_this )
p_priv->b_thread = false;
return; /* We have a problem! */
}
-#else
- hThread = p_priv->thread_id->handle;
-#endif
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 ) )
{
real_time =
More information about the vlc-devel
mailing list