diff options
author | Martin Sustrik <sustrik@fastmq.commkdir> | 2009-08-06 12:51:32 +0200 |
---|---|---|
committer | Martin Sustrik <sustrik@fastmq.commkdir> | 2009-08-06 12:51:32 +0200 |
commit | 0b5cc026fbe7ccc6de66907be29471562a2d344d (patch) | |
tree | a6051f238152e2261ea48942f0c216a3984cc9fd /src/poll.cpp | |
parent | b8b4acef4c2ba1a169ce84c1fb4c70a5676ebba3 (diff) |
clean up - session/socket/engine stuff removed
Diffstat (limited to 'src/poll.cpp')
-rw-r--r-- | src/poll.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/poll.cpp b/src/poll.cpp index 864cfad..94e4fd4 100644 --- a/src/poll.cpp +++ b/src/poll.cpp @@ -50,6 +50,14 @@ zmq::poll_t::poll_t () : fd_table [i].index = retired_fd; } +zmq::poll_t::~poll_t () +{ + // Make sure there are no fds registered on shutdown. + zmq_assert (load.get () == 0); + + worker.stop (); +} + zmq::handle_t zmq::poll_t::add_fd (fd_t fd_, i_poll_events *events_) { pollfd pfd = {fd_, 0, 0}; @@ -132,11 +140,6 @@ void zmq::poll_t::stop () stopping = true; } -void zmq::poll_t::join () -{ - worker.stop (); -} - void zmq::poll_t::loop () { while (!stopping) { |