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

MXS-2008 Add maxbase/poll.[h|hh]

Browse Source 
Remove maxscale/poll_core.h
This commit is contained in:
Johan Wikman
2018-08-17 15:01:58 +03:00
parent 8f257a51fe
commit 932956d5f6
14 changed files with 123 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/core/messagequeue.cc
View File

@ -52,7 +52,7 @@ namespace maxscale
{
MessageQueue::MessageQueue(Handler* pHandler, int read_fd, int write_fd)
: MxsPollData(&MessageQueue::poll_handler)
: mxb::PollData(&MessageQueue::poll_handler)
, m_handler(*pHandler)
, m_read_fd(read_fd)
, m_write_fd(write_fd)
@ -267,7 +267,7 @@ Worker* MessageQueue::remove_from_worker()
uint32_t MessageQueue::handle_poll_events(Worker* pWorker, uint32_t events)
{
uint32_t rc = MXS_POLL_NOP;
uint32_t rc = MXB_POLL_NOP;
ss_dassert(pWorker == m_pWorker);
@ -308,14 +308,14 @@ uint32_t MessageQueue::handle_poll_events(Worker* pWorker, uint32_t events)
}
while ((n != 0) && (n != -1));
rc = MXS_POLL_READ;
rc = MXB_POLL_READ;
}
return rc;
}
//static
uint32_t MessageQueue::poll_handler(MXS_POLL_DATA* pData, void* pWorker, uint32_t events)
uint32_t MessageQueue::poll_handler(MXB_POLL_DATA* pData, void* pWorker, uint32_t events)
{
MessageQueue* pThis = static_cast<MessageQueue*>(pData);