diff options
author | Martin Sustrik <sustrik@250bpm.com> | 2012-02-16 10:10:36 +0900 |
---|---|---|
committer | Martin Sustrik <sustrik@250bpm.com> | 2012-02-16 10:10:36 +0900 |
commit | 7b81a0f67d928f10bd64a478953b025e5e0d63aa (patch) | |
tree | 60e1c0e7841c38344528c743fbbe24a8a4b15368 | |
parent | 741b0774f729c8934b00009bc76e3842a0610cc1 (diff) |
Polling mechnisms updated to cope with io_thread_t removal
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
-rw-r--r-- | src/devpoll.cpp | 3 | ||||
-rw-r--r-- | src/devpoll.hpp | 2 | ||||
-rw-r--r-- | src/kqueue.cpp | 3 | ||||
-rw-r--r-- | src/kqueue.hpp | 2 | ||||
-rw-r--r-- | src/poll.cpp | 3 | ||||
-rw-r--r-- | src/poll.hpp | 2 | ||||
-rw-r--r-- | src/select.cpp | 3 | ||||
-rw-r--r-- | src/select.hpp | 2 |
8 files changed, 12 insertions, 8 deletions
diff --git a/src/devpoll.cpp b/src/devpoll.cpp index 899e1b8..e85b765 100644 --- a/src/devpoll.cpp +++ b/src/devpoll.cpp @@ -37,7 +37,8 @@ #include "err.hpp" #include "config.hpp" -xs::devpoll_t::devpoll_t () : +xs::devpoll_t::devpoll_t (xs::ctx_t *ctx_, uint32_t tid_) : + poller_base_t (ctx_, tid_), stopping (false) { devpoll_fd = open ("/dev/poll", O_RDWR); diff --git a/src/devpoll.hpp b/src/devpoll.hpp index a6ae5e4..b32aa28 100644 --- a/src/devpoll.hpp +++ b/src/devpoll.hpp @@ -43,7 +43,7 @@ namespace xs { public: - devpoll_t (); + devpoll_t (xs::ctx_t *ctx_, uint32_t tid_); ~devpoll_t (); // "poller" concept. diff --git a/src/kqueue.cpp b/src/kqueue.cpp index 982bb43..6a193df 100644 --- a/src/kqueue.cpp +++ b/src/kqueue.cpp @@ -44,7 +44,8 @@ #define kevent_udata_t void * #endif -xs::kqueue_t::kqueue_t () : +xs::kqueue_t::kqueue_t (xs::ctx_t *ctx_, uint32_t tid_) : + poller_base_t (ctx_, tid_), stopping (false) { // Create event queue diff --git a/src/kqueue.hpp b/src/kqueue.hpp index 676396e..f3350b9 100644 --- a/src/kqueue.hpp +++ b/src/kqueue.hpp @@ -43,7 +43,7 @@ namespace xs { public: - kqueue_t (); + kqueue_t (xs::ctx_t *ctx_, uint32_t tid_); ~kqueue_t (); // "poller" concept. diff --git a/src/poll.cpp b/src/poll.cpp index 4796cdb..622a0ea 100644 --- a/src/poll.cpp +++ b/src/poll.cpp @@ -32,7 +32,8 @@ #include "err.hpp" #include "config.hpp" -xs::poll_t::poll_t () : +xs::poll_t::poll_t (xs::ctx_t *ctx_, uint32_t tid_) : + poller_base_t (ctx_, tid_), retired (false), stopping (false) { diff --git a/src/poll.hpp b/src/poll.hpp index 535a3b2..3d5157e 100644 --- a/src/poll.hpp +++ b/src/poll.hpp @@ -46,7 +46,7 @@ namespace xs { public: - poll_t (); + poll_t (xs::ctx_t *ctx_, uint32_t tid_); ~poll_t (); // "poller" concept. diff --git a/src/select.cpp b/src/select.cpp index 3518c52..1b63685 100644 --- a/src/select.cpp +++ b/src/select.cpp @@ -43,7 +43,8 @@ #include "err.hpp" #include "config.hpp" -xs::select_t::select_t () : +xs::select_t::select_t (xs::ctx_t *ctx_, uint32_t tid_) : + poller_base_t (ctx_, tid_), maxfd (retired_fd), retired (false), stopping (false) diff --git a/src/select.hpp b/src/select.hpp index 93ab77f..283cc52 100644 --- a/src/select.hpp +++ b/src/select.hpp @@ -56,7 +56,7 @@ namespace xs { public: - select_t (); + select_t (xs::ctx_t *ctx_, uint32_t tid_); ~select_t (); // "poller" concept. |