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

Remove unnecessary code

Browse Source 
A descriptor is always added to the global epoll instance or
to a specific worker, never just to _any_ worker.
This commit is contained in:
Johan Wikman
2018-02-28 20:11:27 +02:00
parent e385e6fcd4
commit a197e6c859
2 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/maxscale/poll_core.h
View File

@ -60,11 +60,6 @@ typedef struct mxs_poll_data
*/ */
#define MXS_WORKER_ALL -1 #define MXS_WORKER_ALL -1
/**
* A file descriptor should be added to the poll set of some worker.
*/
#define MXS_WORKER_ANY -2
/** /**
* Add a file descriptor with associated data to the poll set. * Add a file descriptor with associated data to the poll set.
* *

9
server/core/poll.cc
View File

@ -40,7 +40,6 @@
using maxscale::Worker; using maxscale::Worker;
static int next_epoll_fd = 0; /*< Which thread handles the next DCB */
static int n_threads; /*< Number of threads */ static int n_threads; /*< Number of threads */
/** /**
@ -100,13 +99,7 @@ bool poll_add_fd_to_worker(int wid, int fd, uint32_t events, MXS_POLL_DATA* data
{ {
bool rv; bool rv;
if (wid == MXS_WORKER_ANY) if (wid == MXS_WORKER_ALL)
{
wid = (int)atomic_add(&next_epoll_fd, 1) % n_threads;
rv = add_fd_to_worker(wid, fd, events, data);
}
else if (wid == MXS_WORKER_ALL)
{ {
rv = add_fd_to_workers(fd, events, data); rv = add_fd_to_workers(fd, events, data);
} }