diff options
Diffstat (limited to 'src/threading/thread.h')
| -rw-r--r-- | src/threading/thread.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/threading/thread.h b/src/threading/thread.h index 6292d9ed7..284c8e46c 100644 --- a/src/threading/thread.h +++ b/src/threading/thread.h @@ -26,10 +26,10 @@ DEALINGS IN THE SOFTWARE. #pragma once #include "util/basic_macros.h" -#include "threads.h" #include <string> #include <atomic> +#include <thread> #include <mutex> #ifdef _AIX @@ -49,10 +49,12 @@ DEALINGS IN THE SOFTWARE. #endif + class Thread { public: Thread(const std::string &name=""); virtual ~Thread(); + DISABLE_CLASS_COPY(Thread) /* * Begins execution of a new thread at the pure virtual method Thread::run(). @@ -87,13 +89,12 @@ public: /* * Returns true if the calling thread is this Thread object. */ - bool isCurrentThread() { return thr_is_current_thread(getThreadId()); } + bool isCurrentThread() { return std::this_thread::get_id() == getThreadId(); } - inline bool isRunning() { return m_running; } - inline bool stopRequested() { return m_request_stop; } + bool isRunning() { return m_running; } + bool stopRequested() { return m_request_stop; } - inline threadid_t getThreadId() { return m_thread_obj->get_id(); } - inline threadhandle_t getThreadHandle() { return m_thread_obj->native_handle(); } + std::thread::id getThreadId() { return m_thread_obj->get_id(); } /* * Gets the thread return value. @@ -139,6 +140,11 @@ protected: virtual void *run() = 0; private: + std::thread::native_handle_type getThreadHandle() + { return m_thread_obj->native_handle(); } + + static void threadProc(Thread *thr); + void *m_retval; bool m_joinable; std::atomic<bool> m_request_stop; @@ -148,13 +154,11 @@ private: std::thread *m_thread_obj; - static ThreadStartFunc threadProc; #ifdef _AIX // For AIX, there does not exist any mapping from pthread_t to tid_t // available to us, so we maintain one ourselves. This is set on thread start. tid_t m_kernel_thread_id; #endif - Thread(const Thread &) = delete; }; |