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/devpoll.cpp | |
parent | b8b4acef4c2ba1a169ce84c1fb4c70a5676ebba3 (diff) |
clean up - session/socket/engine stuff removed
Diffstat (limited to 'src/devpoll.cpp')
-rw-r--r-- | src/devpoll.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/devpoll.cpp b/src/devpoll.cpp index 8fb0877..b7d153c 100644 --- a/src/devpoll.cpp +++ b/src/devpoll.cpp @@ -52,6 +52,10 @@ zmq::devpoll_t::devpoll_t () zmq::devpoll_t::~devpoll_t () { + // Make sure there are no fds registered on shutdown. + zmq_assert (load.get () == 0); + + worker.stop (); close (devpoll_fd); } @@ -152,11 +156,6 @@ void zmq::devpoll_t::stop () stopping = true; } -void zmq::devpoll_t::join () -{ - worker.stop (); -} - bool zmq::devpoll_t::loop () { // According to the poll(7d) man page, we can retrieve |