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/select.cpp | |
parent | b8b4acef4c2ba1a169ce84c1fb4c70a5676ebba3 (diff) |
clean up - session/socket/engine stuff removed
Diffstat (limited to 'src/select.cpp')
-rw-r--r-- | src/select.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/select.cpp b/src/select.cpp index 68ec9a0..f10acdc 100644 --- a/src/select.cpp +++ b/src/select.cpp @@ -51,6 +51,14 @@ zmq::select_t::select_t () : FD_ZERO (&source_set_err); } +zmq::select_t::~select_t () +{ + // Make sure there are no fds registered on shutdown. + zmq_assert (load.get () == 0); + + worker.stop (); +} + zmq::handle_t zmq::select_t::add_fd (fd_t fd_, i_poll_events *events_) { // Store the file descriptor. @@ -156,11 +164,6 @@ void zmq::select_t::stop () stopping = true; } -void zmq::select_t::join () -{ - worker.stop (); -} - void zmq::select_t::loop () { while (!stopping) { |