Commit 35c58dc7 authored by Martin Sustrik's avatar Martin Sustrik

ZMQII-1: fix for devpoll, kqueue & poll

parent fc7715b4
...@@ -54,10 +54,11 @@ zmq::devpoll_t::devpoll_t () ...@@ -54,10 +54,11 @@ zmq::devpoll_t::devpoll_t ()
zmq::devpoll_t::~devpoll_t () zmq::devpoll_t::~devpoll_t ()
{ {
worker.stop ();
// Make sure there are no fds registered on shutdown. // Make sure there are no fds registered on shutdown.
zmq_assert (load.get () == 0); zmq_assert (load.get () == 0);
worker.stop ();
close (devpoll_fd); close (devpoll_fd);
} }
......
...@@ -42,10 +42,11 @@ zmq::kqueue_t::kqueue_t () ...@@ -42,10 +42,11 @@ zmq::kqueue_t::kqueue_t ()
zmq::kqueue_t::~kqueue_t () zmq::kqueue_t::~kqueue_t ()
{ {
worker.stop ();
// Make sure there are no fds registered on shutdown. // Make sure there are no fds registered on shutdown.
zmq_assert (load.get () == 0); zmq_assert (load.get () == 0);
worker.stop ();
close (kqueue_fd); close (kqueue_fd);
} }
......
...@@ -52,10 +52,10 @@ zmq::poll_t::poll_t () : ...@@ -52,10 +52,10 @@ zmq::poll_t::poll_t () :
zmq::poll_t::~poll_t () zmq::poll_t::~poll_t ()
{ {
worker.stop ();
// Make sure there are no fds registered on shutdown. // Make sure there are no fds registered on shutdown.
zmq_assert (load.get () == 0); zmq_assert (load.get () == 0);
worker.stop ();
} }
zmq::handle_t zmq::poll_t::add_fd (fd_t fd_, i_poll_events *events_) zmq::handle_t zmq::poll_t::add_fd (fd_t fd_, i_poll_events *events_)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment