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/kqueue.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/kqueue.cpp') diff --git a/src/kqueue.cpp b/src/kqueue.cpp index 28c15de..f4c58a3 100644 --- a/src/kqueue.cpp +++ b/src/kqueue.cpp @@ -42,6 +42,10 @@ zmq::kqueue_t::kqueue_t () zmq::kqueue_t::~kqueue_t () { + // Make sure there are no fds registered on shutdown. + zmq_assert (load.get () == 0); + + worker.stop (); close (kqueue_fd); } @@ -144,11 +148,6 @@ void zmq::kqueue_t::stop () stopping = true; } -void zmq::kqueue_t::join () -{ - worker.stop (); -} - void zmq::kqueue_t::loop () { while (!stopping) { -- cgit v1.2.3