marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pdh: Fix a couple of race conditions in the thread handling.

oldstable
Alexandre Julliard 2007-10-30 13:04:23 +01:00
parent 0f16c1496f
commit 55d274d1d2
1 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
dlls/pdh/pdh_main.c
View File

@ -380,17 +380,6 @@ PDH_STATUS WINAPI PdhCalculateCounterFromRawValue( PDH_HCOUNTER handle, DWORD fo
return ret; return ret;
} }
/* caller must hold query lock */
static void shutdown_query_thread( struct query *query )
{
SetEvent( query->stop );
WaitForSingleObject( query->thread, INFINITE );
CloseHandle( query->stop );
CloseHandle( query->thread );
query->thread = NULL;
}
/*********************************************************************** /***********************************************************************
* PdhCloseQuery (PDH.@) * PdhCloseQuery (PDH.@)
@ -409,7 +398,20 @@ PDH_STATUS WINAPI PdhCloseQuery( PDH_HQUERY handle )
return PDH_INVALID_HANDLE; return PDH_INVALID_HANDLE;
} }
if (query->thread) shutdown_query_thread( query ); if (query->thread)
{
HANDLE thread = query->thread;
SetEvent( query->stop );
LeaveCriticalSection( &pdh_handle_cs );
WaitForSingleObject( thread, INFINITE );
EnterCriticalSection( &pdh_handle_cs );
if (query->magic != PDH_MAGIC_QUERY) return ERROR_SUCCESS;
CloseHandle( query->stop );
CloseHandle( query->thread );
query->thread = NULL;
}
LIST_FOR_EACH_SAFE( item, next, &query->counters ) LIST_FOR_EACH_SAFE( item, next, &query->counters )
{ {
@ -476,7 +478,6 @@ static DWORD CALLBACK collect_query_thread( void *arg )
DWORD interval = query->interval; DWORD interval = query->interval;
HANDLE stop = query->stop; HANDLE stop = query->stop;
SetEvent( stop );
for (;;) for (;;)
{ {
if (WaitForSingleObject( stop, interval ) != WAIT_TIMEOUT) ExitThread( 0 ); if (WaitForSingleObject( stop, interval ) != WAIT_TIMEOUT) ExitThread( 0 );
@ -520,8 +521,20 @@ PDH_STATUS WINAPI PdhCollectQueryDataEx( PDH_HQUERY handle, DWORD interval, HAND
LeaveCriticalSection( &pdh_handle_cs ); LeaveCriticalSection( &pdh_handle_cs );
return PDH_NO_DATA; return PDH_NO_DATA;
} }
if (query->thread) shutdown_query_thread( query ); if (query->thread)
if (!(query->stop = CreateEventW( NULL, FALSE, FALSE, NULL ))) {
HANDLE thread = query->thread;
SetEvent( query->stop );
LeaveCriticalSection( &pdh_handle_cs );
WaitForSingleObject( thread, INFINITE );
EnterCriticalSection( &pdh_handle_cs );
if (query->magic != PDH_MAGIC_QUERY) return PDH_INVALID_HANDLE;
CloseHandle( query->thread );
query->thread = NULL;
}
else if (!(query->stop = CreateEventW( NULL, FALSE, FALSE, NULL )))
{ {
ret = GetLastError(); ret = GetLastError();
LeaveCriticalSection( &pdh_handle_cs ); LeaveCriticalSection( &pdh_handle_cs );
@ -537,7 +550,6 @@ PDH_STATUS WINAPI PdhCollectQueryDataEx( PDH_HQUERY handle, DWORD interval, HAND
LeaveCriticalSection( &pdh_handle_cs ); LeaveCriticalSection( &pdh_handle_cs );
return ret; return ret;
} }
WaitForSingleObject( query->stop, INFINITE );
LeaveCriticalSection( &pdh_handle_cs ); LeaveCriticalSection( &pdh_handle_cs );
return ERROR_SUCCESS; return ERROR_SUCCESS;