From 0b5cc026fbe7ccc6de66907be29471562a2d344d Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Thu, 6 Aug 2009 12:51:32 +0200 Subject: clean up - session/socket/engine stuff removed --- src/devpoll.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/devpoll.cpp') 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 -- cgit v1.2.3