summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormalosek <malosek@fastmq.com>2009-09-16 17:07:15 +0200
committermalosek <malosek@fastmq.com>2009-09-16 17:07:15 +0200
commit3ebe9932f9c208966f8cb97d631d26df0367c151 (patch)
treeeb5a3c374f2bee3d0336bc3b29ebe5980cf841aa
parent1a655045951c29edda0b616640b9dac507cda164 (diff)
parentd16b3bc0c93452a4be7d06525793ac5190e38031 (diff)
Merge branch 'master' of git@github.com:sustrik/zeromq2
-rw-r--r--src/devpoll.cpp3
-rw-r--r--src/kqueue.cpp3
-rw-r--r--src/poll.cpp4
3 files changed, 6 insertions, 4 deletions
diff --git a/src/devpoll.cpp b/src/devpoll.cpp
index ac5c72f..2386034 100644
--- a/src/devpoll.cpp
+++ b/src/devpoll.cpp
@@ -54,10 +54,11 @@ zmq::devpoll_t::devpoll_t ()
zmq::devpoll_t::~devpoll_t ()
{
+ worker.stop ();
+
// Make sure there are no fds registered on shutdown.
zmq_assert (load.get () == 0);
- worker.stop ();
close (devpoll_fd);
}
diff --git a/src/kqueue.cpp b/src/kqueue.cpp
index f4c58a3..c967c73 100644
--- a/src/kqueue.cpp
+++ b/src/kqueue.cpp
@@ -42,10 +42,11 @@ zmq::kqueue_t::kqueue_t ()
zmq::kqueue_t::~kqueue_t ()
{
+ worker.stop ();
+
// Make sure there are no fds registered on shutdown.
zmq_assert (load.get () == 0);
- worker.stop ();
close (kqueue_fd);
}
diff --git a/src/poll.cpp b/src/poll.cpp
index 94e4fd4..dd3de43 100644
--- a/src/poll.cpp
+++ b/src/poll.cpp
@@ -52,10 +52,10 @@ zmq::poll_t::poll_t () :
zmq::poll_t::~poll_t ()
{
+ worker.stop ();
+
// 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_)