summaryrefslogtreecommitdiff
path: root/src/socket_base.cpp
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2012-02-16 10:09:58 +0900
committerMartin Sustrik <sustrik@250bpm.com>2012-02-16 10:09:58 +0900
commit24cf53ad6eaa0eb9a873b909e932d95417f52d2c (patch)
tree0d2f19a76536d09d0fe6e22874ce572eda70eccd /src/socket_base.cpp
parent0641ffa5e9588dd7daaf389c40a213994fe4b1b1 (diff)
io_thread_t merged with poller_base_t
The relationship of these two classes was 1:1. Thus one of them was obsolete. Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Diffstat (limited to 'src/socket_base.cpp')
-rw-r--r--src/socket_base.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/socket_base.cpp b/src/socket_base.cpp
index 97ac4b4..492d027 100644
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -39,7 +39,7 @@
#include "tcp_listener.hpp"
#include "ipc_listener.hpp"
#include "tcp_connecter.hpp"
-#include "io_thread.hpp"
+#include "poller_base.hpp"
#include "session_base.hpp"
#include "config.hpp"
#include "clock.hpp"
@@ -338,7 +338,7 @@ int xs::socket_base_t::bind (const char *addr_)
// Remaining trasnports require to be run in an I/O thread, so at this
// point we'll choose one.
- io_thread_t *io_thread = choose_io_thread (options.affinity);
+ poller_base_t *io_thread = choose_io_thread (options.affinity);
if (!io_thread) {
errno = EMTHREAD;
return -1;
@@ -449,7 +449,7 @@ int xs::socket_base_t::connect (const char *addr_)
}
// Choose the I/O thread to run the session in.
- io_thread_t *io_thread = choose_io_thread (options.affinity);
+ poller_base_t *io_thread = choose_io_thread (options.affinity);
if (!io_thread) {
errno = EMTHREAD;
return -1;