X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FConnectors.cci;h=e6a73911a79d20387537a65f9693a2c3a3bcb281;hb=bd9f9d3fd6fbcff0112a7bf48ab9284da9576b11;hp=122e9e0c001a6cad4934706be132bee88b4dd3fe;hpb=8bc8b29a3c4c1b32b14e17d17e3f6c3ff565c9e9;p=senf.git

diff --git a/PPI/Connectors.cci b/PPI/Connectors.cci
index 122e9e0..e6a7391 100644
--- a/PPI/Connectors.cci
+++ b/PPI/Connectors.cci
@@ -37,7 +37,7 @@ prefix_ senf::ppi::connector::Connector & senf::ppi::connector::Connector::peer(
     const
 {
     // The connector is not connected
-    SENF_ASSERT(peer_);
+    SENF_ASSERT(peer_ && "senf::ppi::connect() call missing");
     return *peer_;
 }
 
@@ -46,7 +46,7 @@ prefix_ senf::ppi::module::Module & senf::ppi::connector::Connector::module()
 {
     // The connector is not registered in the module -> probably a route() or noroute() statement is
     // missing.
-    SENF_ASSERT(module_);
+    SENF_ASSERT(module_ && "Connector not registered: Missing route() or noroute()");
     return *module_;
 }
 
@@ -162,8 +162,8 @@ prefix_ senf::ppi::connector::PassiveConnector::PassiveConnector()
 
 prefix_ void senf::ppi::connector::PassiveConnector::emit()
 {
-    // No event callback has been registered (onEvent() call missing)
-    SENF_ASSERT(callback_);
+    // No event callback has been registered (onRequest() call missing)
+    SENF_ASSERT(callback_ && "senf::ppi::connector::PassiveConnector: missing onRequest()");
     if (!throttled())
         callback_();
 }
@@ -232,7 +232,8 @@ 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();
 }
 
@@ -258,7 +259,7 @@ prefix_ senf::ppi::connector::InputConnector::InputConnector()
 ////////////////////////////////////////
 // private members
 
-prefix_ void senf::ppi::connector::InputConnector::enqueue(Packet p)
+prefix_ void senf::ppi::connector::InputConnector::enqueue(Packet const & p)
 {
     queue_.push_front(p);
     v_enqueueEvent();
@@ -273,13 +274,13 @@ prefix_ senf::ppi::connector::InputConnector & senf::ppi::connector::OutputConne
     return dynamic_cast<InputConnector&>(Connector::peer());
 }
 
-prefix_ void senf::ppi::connector::OutputConnector::operator()(Packet p)
+prefix_ void senf::ppi::connector::OutputConnector::operator()(Packet const & p)
 {
     if (connected())
         peer().enqueue(p);
 }
 
-prefix_ void senf::ppi::connector::OutputConnector::write(Packet p)
+prefix_ void senf::ppi::connector::OutputConnector::write(Packet const & p)
 {
     operator()(p);
 }