Whitespce cleanup: Remove whitespace at end-on-line, remove tabs, wrap

[senf.git] / senf / PPI / Connectors.cci

diff --git a/senf/PPI/Connectors.cci b/senf/PPI/Connectors.cci
index ec587ce..cebc539 100644 (file)
--- a/senf/PPI/Connectors.cci
+++ b/senf/PPI/Connectors.cci
@@ -24,8 +24,9 @@
     \brief Connectors inline non-template implementation */
 
 // Custom includes
-#include "../Utils/TypeInfo.hh"
-#include "../Utils/senfassert.hh"
+#include <senf/Utils/TypeInfo.hh>
+#include <senf/Utils/senfassert.hh>
+#include "Module.hh"
 
 #define prefix_ inline
 ///////////////////////////////cci.p///////////////////////////////////////
@@ -72,7 +73,9 @@ prefix_ senf::ppi::connector::Connector::~Connector()
     if (connected()) {
         Connector & peer (*peer_);
         peer_->peer_ = 0;
-        peer.v_init();
+        if (! peer.initializationScheduled())
+            peer.enqueueInitializable();
+        peer.v_disconnected();
     }
 }
 
@@ -82,6 +85,12 @@ prefix_ bool senf::ppi::connector::Connector::connected()
     return peer_;
 }
 
+prefix_ void senf::ppi::connector::Connector::unregisterConnector()
+{
+    if (module_)
+        module_->unregisterConnector(*this);
+}
+
 ////////////////////////////////////////
 // private members
 
@@ -139,7 +148,14 @@ prefix_ void senf::ppi::connector::PassiveConnector::registerRoute(ForwardingRou
     routes_.push_back(&route);
 }
 
-// public members 
+prefix_ void senf::ppi::connector::PassiveConnector::unregisterRoute(ForwardingRoute & route)
+{
+    Routes::iterator i (std::find(routes_.begin(), routes_.end(), &route));
+    if (i != routes_.end())
+        routes_.erase(i);
+}
+
+// public members
 
 prefix_ bool senf::ppi::connector::PassiveConnector::nativeThrottled()
     const
@@ -247,7 +263,7 @@ prefix_ senf::Packet senf::ppi::connector::InputConnector::peek()
     const
 {
     // Cannot peek() head of empty queue
-    SENF_ASSERT( ! queue_.empty() && 
+    SENF_ASSERT( ! queue_.empty() &&
                  "senf::ppi::connector::InputConnector: cannot call peek() on empty queue" );
     return queue_.back();
 }