summaryrefslogtreecommitdiff
path: root/src/reaper.cpp
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2011-05-23 20:30:01 +0200
committerMartin Sustrik <sustrik@250bpm.com>2011-05-23 20:30:01 +0200
commit0f6f7276e32c01ccfe86fb76741a52ac6ffc87af (patch)
tree3f2cec589f6243742da7e79028633d35f8b362db /src/reaper.cpp
parentacf0b0e515515e51ad32ba7a2d147ce703579478 (diff)
Move the pipe termination code to socket_base_t
So far, the pipe termination code was spread among socket type classes, fair queuer, load balancer, etc. This patch moves all the associated logic to a single place. Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Diffstat (limited to 'src/reaper.cpp')
-rw-r--r--src/reaper.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/reaper.cpp b/src/reaper.cpp
index d3ebbba..0295137 100644
--- a/src/reaper.cpp
+++ b/src/reaper.cpp
@@ -87,7 +87,7 @@ void zmq::reaper_t::process_stop ()
{
terminating = true;
- // If there are no sockets beig reaped finish immediately.
+ // If there are no sockets being reaped finish immediately.
if (!sockets) {
send_done ();
poller->rm_fd (mailbox_handle);
@@ -100,10 +100,6 @@ void zmq::reaper_t::process_reap (socket_base_t *socket_)
// Add the socket to the poller.
socket_->start_reaping (poller);
- // Start termination of associated I/O object hierarchy.
- socket_->terminate ();
- socket_->check_destroy ();
-
++sockets;
}