From 0f6f7276e32c01ccfe86fb76741a52ac6ffc87af Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Mon, 23 May 2011 20:30:01 +0200 Subject: 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 --- src/reaper.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/reaper.cpp') 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; } -- cgit v1.2.3