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

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

@ -28,7 +28,7 @@ namespace maxscale
{
class RoutingWorker : public Worker
, private MXS_POLL_DATA
, private MXB_POLL_DATA
{
RoutingWorker(const RoutingWorker&) = delete;
RoutingWorker& operator = (const RoutingWorker&) = delete;
@ -81,7 +81,7 @@ public:
*
* @return True, if the descriptor could be added, false otherwise.
*/
static bool add_shared_fd(int fd, uint32_t events, MXS_POLL_DATA* pData);
static bool add_shared_fd(int fd, uint32_t events, MXB_POLL_DATA* pData);
/**
* Remove a file descriptor from the epoll instance shared between all workers.
@ -429,7 +429,7 @@ private:
void delete_zombies();
static uint32_t epoll_instance_handler(struct mxs_poll_data* data, void* worker, uint32_t events);
static uint32_t epoll_instance_handler(MXB_POLL_DATA* data, void* worker, uint32_t events);
uint32_t handle_epoll_events(uint32_t events);
};