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

Fix build failures

Browse Source 
Fixed build failures caused by merges and rebases.
This commit is contained in:
Markus Mäkelä 2018-08-17 18:23:04 +03:00
parent 667e9df97c
commit af70dc3973
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/maxscale/worker.hh
View File

@ -22,7 +22,6 @@
#include <maxbase/semaphore.hh>
#include <maxscale/platform.h>
#include <maxscale/semaphore.hh>
#include <maxscale/session.h>
#include <maxscale/utils.hh>
#include <maxscale/worker.h>
@ -676,7 +675,7 @@ public:
*
* @param pSem Semaphore that is posted on once the thread has started
*/
void run(mxs::Semaphore* pSem = NULL);
void run(mxb::Semaphore* pSem = NULL);
/**
* Run worker in separate thread.
@ -1180,7 +1179,7 @@ private:
void handle_message(MessageQueue& queue, const MessageQueue::Message& msg); // override
static void thread_main(Worker* pThis, mxs::Semaphore* pSem);
static void thread_main(Worker* pThis, mxb::Semaphore* pSem);
void poll_waitevents();

1
server/core/internal/routingworker.hh
View File

@ -16,6 +16,7 @@
#include <unordered_map>
#include <maxbase/semaphore.hh>
#include <maxscale/poll.h>
#include <maxscale/query_classifier.h>
#include <maxscale/routingworker.h>

6
server/core/worker.cc
View File

@ -527,7 +527,7 @@ bool Worker::post_message(uint32_t msg_id, intptr_t arg1, intptr_t arg2)
return m_pQueue->post(message);
}
void Worker::run(mxs::Semaphore* pSem)
void Worker::run(mxb::Semaphore* pSem)
{
this_thread.pCurrent_worker = this;
@ -559,7 +559,7 @@ bool Worker::start()
{
ss_dassert(!m_started);
ss_dassert(m_thread.get_id() == std::thread::id());
mxs::Semaphore sem;
mxb::Semaphore sem;
m_started = true;
m_should_shutdown = false;
@ -664,7 +664,7 @@ void Worker::handle_message(MessageQueue& queue, const MessageQueue::Message& ms
* @param arg A worker.
*/
//static
void Worker::thread_main(Worker* pThis, mxs::Semaphore* pSem)
void Worker::thread_main(Worker* pThis, mxb::Semaphore* pSem)
{
pThis->run(pSem);
}