hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make Worker::run(mxb::Semaphore*) private

Browse Source 
The semaphore is only used when Worker::start() is called to synchronize
the startup of the two threads. Also asserted that the state is what we
expected it to be.
This commit is contained in:
Markus Mäkelä
2018-08-18 14:35:58 +03:00
parent af70dc3973
commit 90960ec07f
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/maxscale/worker.hh
View File

@ -672,10 +672,11 @@ public:
* The worker will run the poll loop, until it is told to shut down. * The worker will run the poll loop, until it is told to shut down.
* *
* @attention This function will run in the calling thread. * @attention This function will run in the calling thread.
*
* @param pSem Semaphore that is posted on once the thread has started
*/ */
void run(mxb::Semaphore* pSem = NULL); void run()
{
run(nullptr);
}
/** /**
* Run worker in separate thread. * Run worker in separate thread.
@ -1195,6 +1196,8 @@ private:
} }
}; };
void run(mxb::Semaphore* pSem);
typedef DelegatingTimer<Worker> PrivateTimer; typedef DelegatingTimer<Worker> PrivateTimer;
typedef std::multimap<int64_t, DelayedCall*> DelayedCallsByTime; typedef std::multimap<int64_t, DelayedCall*> DelayedCallsByTime;
typedef std::unordered_map<uint32_t, DelayedCall*> DelayedCallsById; typedef std::unordered_map<uint32_t, DelayedCall*> DelayedCallsById;

1
server/core/worker.cc
View File

@ -529,6 +529,7 @@ bool Worker::post_message(uint32_t msg_id, intptr_t arg1, intptr_t arg2)
void Worker::run(mxb::Semaphore* pSem) void Worker::run(mxb::Semaphore* pSem)
{ {
ss_dassert(m_state == STOPPED);
this_thread.pCurrent_worker = this; this_thread.pCurrent_worker = this;
if (pre_run()) if (pre_run())