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

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2019-06-20 13:00:13 +03:00
parent 1fbb57f9b2 301b1b63ab
commit 20f595d978
5 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
maxutils/maxbase/src/worker.cc
View File

@ -527,9 +527,9 @@ bool Worker::post_message(uint32_t msg_id, intptr_t arg1, intptr_t arg2)
// TODO: Enable and fix this in develop and/or 2.4: The deletion of rworker_local is done after the
// workers have stopped and it triggers this assertion.
// mxb_assert(state() != Worker::STOPPED);
// mxb_assert(state() != Worker::FINISHED);
if (state() != Worker::STOPPED)
if (state() != Worker::FINISHED)
{
MessageQueue::Message message(msg_id, arg1, arg2);
rval = m_pQueue->post(message);
@ -540,7 +540,7 @@ bool Worker::post_message(uint32_t msg_id, intptr_t arg1, intptr_t arg2)
void Worker::run(mxb::Semaphore* pSem)
{
mxb_assert(m_state == STOPPED);
mxb_assert(m_state == STOPPED || m_state == FINISHED);
this_thread.pCurrent_worker = this;
if (pre_run())
@ -554,7 +554,7 @@ void Worker::run(mxb::Semaphore* pSem)
poll_waitevents();
m_state = STOPPED;
m_state = FINISHED;
post_run();
MXB_INFO("Worker %p has shut down.", this);