diff options
Diffstat (limited to 'include/threadengines')
| -rw-r--r-- | include/threadengines/threadengine_pthread.h | 60 | ||||
| -rw-r--r-- | include/threadengines/threadengine_win32.h | 60 |
2 files changed, 40 insertions, 80 deletions
diff --git a/include/threadengines/threadengine_pthread.h b/include/threadengines/threadengine_pthread.h index 5168ed238..ca3354260 100644 --- a/include/threadengines/threadengine_pthread.h +++ b/include/threadengines/threadengine_pthread.h @@ -18,8 +18,7 @@ */ -#ifndef THREADENGINE_PTHREAD_H -#define THREADENGINE_PTHREAD_H +#pragma once #include <pthread.h> #include "typedefs.h" @@ -37,14 +36,12 @@ class CoreExport ThreadEngine { public: - - /** Constructor. - */ - ThreadEngine(); - - /** Destructor + /** Per-thread state, present in each Thread object, managed by the ThreadEngine */ - virtual ~ThreadEngine(); + struct ThreadState + { + pthread_t pthread_id; + }; /** Create a new thread. This takes an already allocated * Thread* pointer and initializes it to use this threading @@ -54,20 +51,17 @@ class CoreExport ThreadEngine */ void Start(Thread* thread_to_init); - /** Returns the thread engine's name for display purposes - * @return The thread engine name + /** Stop a thread gracefully. + * First, this function asks the thread to terminate by calling Thread::SetExitFlag(). + * Next, it waits until the thread terminates (on the operating system level). Finally, + * all OS-level resources associated with the thread are released. The Thread instance + * passed to the function is NOT freed. + * When this function returns, the thread is stopped and you can destroy it or restart it + * at a later point. + * Stopping a thread that is not running is a bug. + * @param thread The thread to stop. */ - const std::string GetName() - { - return "posix-thread"; - } -}; - -class CoreExport ThreadData -{ - public: - pthread_t pthread_id; - void FreeThread(Thread* toFree); + void Stop(Thread* thread); }; /** The Mutex class represents a mutex, which can be used to keep threads @@ -80,7 +74,7 @@ class CoreExport ThreadData */ class CoreExport Mutex { - private: + protected: pthread_mutex_t putex; public: /** Constructor. @@ -109,33 +103,20 @@ class CoreExport Mutex } }; -class ThreadQueueData +class ThreadQueueData : public Mutex { - pthread_mutex_t mutex; pthread_cond_t cond; public: ThreadQueueData() { - pthread_mutex_init(&mutex, NULL); pthread_cond_init(&cond, NULL); } ~ThreadQueueData() { - pthread_mutex_destroy(&mutex); pthread_cond_destroy(&cond); } - void Lock() - { - pthread_mutex_lock(&mutex); - } - - void Unlock() - { - pthread_mutex_unlock(&mutex); - } - void Wakeup() { pthread_cond_signal(&cond); @@ -143,7 +124,7 @@ class ThreadQueueData void Wait() { - pthread_cond_wait(&cond, &mutex); + pthread_cond_wait(&cond, &putex); } }; @@ -153,6 +134,3 @@ class ThreadSignalData public: ThreadSignalSocket* sock; }; - - -#endif diff --git a/include/threadengines/threadengine_win32.h b/include/threadengines/threadengine_win32.h index f068ac707..aac7b8b97 100644 --- a/include/threadengines/threadengine_win32.h +++ b/include/threadengines/threadengine_win32.h @@ -18,10 +18,9 @@ */ -#ifndef THREADENGINE_WIN32_H -#define THREADENGINE_WIN32_H +#pragma once -#include "inspircd_config.h" +#include "config.h" #include "base.h" class Thread; @@ -39,10 +38,12 @@ class Thread; class CoreExport ThreadEngine { public: - - ThreadEngine(); - - virtual ~ThreadEngine(); + /** Per-thread state, present in each Thread object, managed by the ThreadEngine + */ + struct ThreadState + { + HANDLE handle; + }; static DWORD WINAPI Entry(void* parameter); @@ -54,20 +55,17 @@ class CoreExport ThreadEngine */ void Start(Thread* thread_to_init); - /** Returns the thread engine's name for display purposes - * @return The thread engine name + /** Stop a thread gracefully. + * First, this function asks the thread to terminate by calling Thread::SetExitFlag(). + * Next, it waits until the thread terminates (on the operating system level). Finally, + * all OS-level resources associated with the thread are released. The Thread instance + * passed to the function is NOT freed. + * When this function returns, the thread is stopped and you can destroy it or restart it + * at a later point. + * Stopping a thread that is not running is a bug. + * @param thread The thread to stop. */ - const std::string GetName() - { - return "windows-thread"; - } -}; - -class CoreExport ThreadData -{ - public: - HANDLE handle; - void FreeThread(Thread* toFree); + void Stop(Thread* thread); }; /** The Mutex class represents a mutex, which can be used to keep threads @@ -101,9 +99,8 @@ class CoreExport Mutex } }; -class ThreadQueueData +class ThreadQueueData : public Mutex { - CRITICAL_SECTION mutex; HANDLE event; public: ThreadQueueData() @@ -111,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() @@ -137,9 +122,9 @@ class ThreadQueueData void Wait() { - LeaveCriticalSection(&mutex); + Unlock(); WaitForSingleObject(event, INFINITE); - EnterCriticalSection(&mutex); + Lock(); } }; @@ -152,6 +137,3 @@ class ThreadSignalData connFD = -1; } }; - -#endif - |