1 files changed, 31 insertions, 10 deletions

diff --git a/src/lb.cpp b/src/lb.cpp
index ca93ba2..e0c2c04 100644
--- a/src/lb.cpp
+++ b/src/lb.cpp
@@ -22,31 +22,49 @@
 #include "lb.hpp"
 #include "pipe.hpp"
 #include "err.hpp"
+#include "i_terminate_events.hpp"
 
-zmq::lb_t::lb_t () :
+zmq::lb_t::lb_t (i_terminate_events *sink_) :
     active (0),
     current (0),
-    more (false)
+    more (false),
+    sink (sink_),
+    terminating (false)
 {
 }
 
 zmq::lb_t::~lb_t ()
 {
-    for (pipes_t::size_type i = 0; i != pipes.size (); i++)
-        pipes [i]->term ();
+    zmq_assert (pipes.empty ());
 }
 
 void zmq::lb_t::attach (writer_t *pipe_)
 {
+    pipe_->set_event_sink (this);
+
     pipes.push_back (pipe_);
     pipes.swap (active, pipes.size () - 1);
     active++;
+
+    if (terminating)
+        pipe_->terminate ();
 }
 
-void zmq::lb_t::detach (writer_t *pipe_)
+void zmq::lb_t::terminate ()
 {
-    zmq_assert (!more || pipes [current] != pipe_);
+    terminating = true;
+
+    if (pipes.empty ()) {
+        sink->terminated ();
+        return;
+    }
+
+    for (pipes_t::size_type i = 0; i != pipes.size (); i++)
+        pipes [i]->terminate ();
+}
 
+void zmq::lb_t::terminated (writer_t *pipe_)
+{
     //  Remove the pipe from the list; adjust number of active pipes
     //  accordingly.
     if (pipes.index (pipe_) < active) {
@@ -55,9 +73,12 @@ void zmq::lb_t::detach (writer_t *pipe_)
             current = 0;
     }
     pipes.erase (pipe_);
+
+    if (terminating && pipes.empty ())
+        sink->terminated ();
 }
 
-void zmq::lb_t::revive (writer_t *pipe_)
+void zmq::lb_t::activated (writer_t *pipe_)
 {
     //  Move the pipe to the list of active pipes.
     pipes.swap (pipes.index (pipe_), active);
@@ -111,10 +132,10 @@ bool zmq::lb_t::has_out ()
         if (pipes [current]->check_write ())
             return true;
 
+        //  Deactivate the pipe.
         active--;
-        if (current < active)
-            pipes.swap (current, active);
-        else
+        pipes.swap (current, active);
+        if (current == active)
             current = 0;
     }