X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fthreadengines%2Fthreadengine_win32.h;h=aac7b8b974ca3d49efcc20673db7266bc96c5372;hb=b18e6b5556f2deedf6ebf154477c4d69dcf02638;hp=bf8658853915b649774f51c54eea6ffe59585549;hpb=a77b9081d4e17bfe8b887073c09d531b2f4c4842;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/threadengines/threadengine_win32.h b/include/threadengines/threadengine_win32.h index bf8658853..aac7b8b97 100644 --- a/include/threadengines/threadengine_win32.h +++ b/include/threadengines/threadengine_win32.h @@ -99,9 +99,8 @@ class CoreExport Mutex } }; -class ThreadQueueData +class ThreadQueueData : public Mutex { - CRITICAL_SECTION mutex; HANDLE event; public: ThreadQueueData() @@ -109,23 +108,11 @@ class ThreadQueueData event = CreateEvent(NULL, false, false, NULL); if (event == NULL) throw CoreException("CreateEvent() failed in ThreadQueueData::ThreadQueueData()!"); - InitializeCriticalSection(&mutex); } ~ThreadQueueData() { CloseHandle(event); - DeleteCriticalSection(&mutex); - } - - void Lock() - { - EnterCriticalSection(&mutex); - } - - void Unlock() - { - LeaveCriticalSection(&mutex); } void Wakeup() @@ -135,9 +122,9 @@ class ThreadQueueData void Wait() { - LeaveCriticalSection(&mutex); + Unlock(); WaitForSingleObject(event, INFINITE); - EnterCriticalSection(&mutex); + Lock(); } };