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

Add MessageQueue to Worker

Browse Source 
The Worker no longer creates a pipe and implements the cross
worker/thread message mechanism itself. Instead it has a
MessageQueue instance variable for that purpose.
This commit is contained in:
Johan Wikman
2017-04-06 14:30:22 +03:00
parent b8c78a23df
commit 052975bccd
3 changed files with 46 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
server/core/maxscale/worker.hh
View File

@ -13,12 +13,14 @@
*/
#include <maxscale/cppdefs.hh>
#include "messagequeue.hh"
#include "worker.h"
namespace maxscale
{
class Worker : public MXS_WORKER
, private MessageQueue::Handler
{
Worker(const Worker&);
Worker& operator = (const Worker&);
@ -195,27 +197,23 @@ public:
static int get_current_id();
private:
Worker(int id, int epoll_fd, int read_fd, int write_fd);
~Worker();
Worker(int id, int epoll_fd);
virtual ~Worker();
static Worker* create(int id);
uint32_t poll(uint32_t events);
static uint32_t poll_handler(MXS_POLL_DATA* pData, int worker_id, uint32_t events);
void handle_message(uint32_t msg_id, intptr_t arg1, intptr_t arg2);
void handle_message(MessageQueue& queue, const MessageQueue::Message& msg); // override
static void thread_main(void* arg);
private:
int m_id; /*< The id of the worker. */
int m_epoll_fd; /*< The epoll file descriptor. */
int m_read_fd; /*< The file descriptor the worker reads from. */
int m_write_fd; /*< The file descriptor used for sending data to the worker. */
THREAD m_thread; /*< The thread handle of the worker. */
bool m_started; /*< Whether the thread has been started or not. */
bool m_should_shutdown; /*< Whether shutdown should be performed. */
bool m_shutdown_initiated; /*< Whether shutdown has been initated. */
int m_id; /*< The id of the worker. */
int m_epoll_fd; /*< The epoll file descriptor. */
MessageQueue* m_pQueue; /*< The message queue of the worker. */
THREAD m_thread; /*< The thread handle of the worker. */
bool m_started; /*< Whether the thread has been started or not. */
bool m_should_shutdown; /*< Whether shutdown should be performed. */
bool m_shutdown_initiated; /*< Whether shutdown has been initated. */
};
}