summaryrefslogtreecommitdiff
path: root/src/poll.cpp
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2010-09-26 19:22:33 +0200
committerMartin Sustrik <sustrik@250bpm.com>2010-09-26 19:22:33 +0200
commit8d7bf6684cbb9625ec7c963b8867e2411b49eb57 (patch)
tree934d18199f7ba555235feff84df310a99b075a6c /src/poll.cpp
parentcf815e8c785254d97190f223765fbbd19a1e6d52 (diff)
common base for all pollers created; the only thing it handles at the moment is 'load'
Diffstat (limited to 'src/poll.cpp')
-rw-r--r--src/poll.cpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/poll.cpp b/src/poll.cpp
index 513c405..9afa6b5 100644
--- a/src/poll.cpp
+++ b/src/poll.cpp
@@ -54,9 +54,6 @@ zmq::poll_t::poll_t () :
zmq::poll_t::~poll_t ()
{
worker.stop ();
-
- // Make sure there are no fds registered on shutdown.
- zmq_assert (load.get () == 0);
}
zmq::poll_t::handle_t zmq::poll_t::add_fd (fd_t fd_, i_poll_events *events_)
@@ -69,7 +66,7 @@ zmq::poll_t::handle_t zmq::poll_t::add_fd (fd_t fd_, i_poll_events *events_)
fd_table [fd_].events = events_;
// Increase the load metric of the thread.
- load.add (1);
+ adjust_load (1);
return fd_;
}
@@ -85,7 +82,7 @@ void zmq::poll_t::rm_fd (handle_t handle_)
retired = true;
// Decrease the load metric of the thread.
- load.sub (1);
+ adjust_load (-1);
}
void zmq::poll_t::set_pollin (handle_t handle_)
@@ -124,11 +121,6 @@ void zmq::poll_t::cancel_timer (i_poll_events *events_, int id_)
timers.erase (it);
}
-int zmq::poll_t::get_load ()
-{
- return load.get ();
-}
-
void zmq::poll_t::start ()
{
worker.start (worker_routine, this);