#include "Connectors.ih"
// Custom includes
-#include "Route.hh"
-#include "Module.hh"
#include "ModuleManager.hh"
-#include <senf/Utils/Console/Console.hh>
+#include <senf/Utils/Console/ParsedCommand.hh>
//#include "Connectors.mpp"
#define prefix_
///////////////////////////////////////////////////////////////////////////
// senf::ppi::connector::Connector
+prefix_ senf::ppi::connector::Connector::~Connector()
+{
+ if (connected()) {
+ Connector & peer (*peer_);
+ peer_->peer_ = 0;
+ if (! peer.initializationScheduled())
+ peer.enqueueInitializable();
+ peer.v_disconnected();
+ }
+}
+
prefix_ void senf::ppi::connector::Connector::connect(Connector & target)
{
// The connector is not registered -> route() or noroute() statement missing
- SENF_ASSERT( module_ &&
+ SENF_ASSERT( module_,
"senf::ppi::connector::Connector::connect(): (source) "
"Missing route() or noroute()" );
// The connector is already connected
- SENF_ASSERT( ! peer_ &&
+ SENF_ASSERT( ! peer_,
"senf::ppi::connector::Connector::connect(): (source) "
"duplicate connection" );
// The target connector is not registered -> route() or noroute() statement missing
- SENF_ASSERT( target.module_ &&
+ SENF_ASSERT( target.module_,
"senf::ppi::connector::Connector::connect(): (target) "
"Missing route() or noroute()" );
// The target connector is already connected
- SENF_ASSERT( ! target.peer_ &&
+ SENF_ASSERT( ! target.peer_,
"senf::ppi::connector::Connector::connect(): (target) "
"duplicate connection" );
if (! (packetTypeID() == typeid(void) ||
enqueueInitializable();
if (! peer().initializationScheduled())
peer().enqueueInitializable();
+
+ v_connected();
+ peer_->v_connected();
+
}
senf::ppi::connector::Connector::TraceState senf::ppi::connector::Connector::traceState_ (
prefix_ void senf::ppi::connector::Connector::trace(Packet const & p, char const * label)
{
- if (traceState_ == NO_TRACING)
+ if (traceState_ == NO_TRACING)
return;
SENF_LOG_BLOCK(({
std::string type (prettyName(p.typeId().id()));
ConsoleRegister::ConsoleRegister()
{
+#ifndef SENF_PPI_NOTRACE
senf::ppi::ModuleManager::instance().consoleDir()
.add("tracing", senf::console::factory::Command(
SENF_FNP(senf::ppi::connector::Connector::TraceState,
(senf::ppi::connector::Connector::TraceState)))
.arg("state", "new tracing state")
);
+#endif
}
ConsoleRegister consoleRegister;
prefix_ void senf::ppi::connector::Connector::disconnect()
{
// Cannot disconnected a non-connected connector
- SENF_ASSERT( peer_ &&
+ SENF_ASSERT( peer_,
"senf::ppi::connector::Connector::disconnect(): Not connected" );
Connector & peer (*peer_);
return typeid(void);
}
+prefix_ void senf::ppi::connector::Connector::unregisterConnector()
+{
+ if (module_)
+ module_->unregisterConnector(*this);
+}
+
+prefix_ void senf::ppi::connector::Connector::setModule(module::Module & module)
+{
+ module_ = &module;
+}
+
prefix_ void senf::ppi::connector::Connector::v_disconnected()
- const
+{}
+
+prefix_ void senf::ppi::connector::Connector::v_connected()
{}
///////////////////////////////////////////////////////////////////////////
// senf::ppi::connector::PassiveConnector
+prefix_ senf::ppi::connector::PassiveConnector::~PassiveConnector()
+{
+ // Must be here and NOT in base so it is called before destructing the routes_ member
+ unregisterConnector();
+}
+
+prefix_ void senf::ppi::connector::PassiveConnector::v_disconnected()
+{
+ Connector::v_disconnected();
+ peer_ = 0;
+}
+
+prefix_ void senf::ppi::connector::PassiveConnector::v_connected()
+{
+ Connector::v_connected();
+ peer_ = & dynamic_cast<ActiveConnector&>(Connector::peer());
+}
+
////////////////////////////////////////
// private members
emitUnthrottle();
}
+prefix_ void senf::ppi::connector::PassiveConnector::registerRoute(ForwardingRoute & route)
+{
+ routes_.push_back(&route);
+}
+
+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);
+}
+
prefix_ void senf::ppi::connector::PassiveConnector::v_unthrottleEvent()
{}
if (!nativeThrottled_)
emitUnthrottle();
} else
- throttleTrace("OUT", "not forwarding unthrottle event");
+ SENF_PPI_THROTTLE_TRACE("OUT", "not forwarding unthrottle event");
}
///////////////////////////////////////////////////////////////////////////
// senf::ppi::connector::ActiveConnector
+prefix_ senf::ppi::connector::ActiveConnector::~ActiveConnector()
+{
+ // Must be here and NOT in base so it is called before destructing the routes_ member
+ unregisterConnector();
+}
+
+prefix_ void senf::ppi::connector::ActiveConnector::v_disconnected()
+{
+ Connector::v_disconnected();
+ peer_ = 0;
+}
+
+prefix_ void senf::ppi::connector::ActiveConnector::v_connected()
+{
+ Connector::v_connected();
+ peer_ = & dynamic_cast<PassiveConnector&>(Connector::peer());
+}
+
////////////////////////////////////////
// private members
prefix_ void senf::ppi::connector::ActiveConnector::notifyThrottle()
{
- throttleTrace("IN ", "throttle");
+ SENF_PPI_THROTTLE_TRACE("IN ", "throttle");
if (! throttled_) {
throttled_ = true;
if (throttleCallback_)
prefix_ void senf::ppi::connector::ActiveConnector::notifyUnthrottle()
{
- throttleTrace("IN ", "unthrottle");
+ SENF_PPI_THROTTLE_TRACE("IN ", "unthrottle");
if (throttled_) {
throttled_ = false;
if (unthrottleCallback_)
{
if (empty())
v_requestEvent();
- Packet p;
if (! empty()) {
- p = peek();
+ Packet p ( queue_.back());
queue_.pop_back();
v_dequeueEvent();
+ SENF_PPI_TRACE(p, "IN ");
+ return p;
+ } else {
+ SENF_PPI_TRACE(Packet(), "IN ");
+ return Packet();
}
- trace(p, "IN ");
- return p;
+}
+
+prefix_ void senf::ppi::connector::InputConnector::v_disconnected()
+{
+ Connector::v_disconnected();
+ peer_ = 0;
+}
+
+prefix_ void senf::ppi::connector::InputConnector::v_connected()
+{
+ Connector::v_connected();
+ peer_ = & dynamic_cast<OutputConnector&>(Connector::peer());
}
////////////////////////////////////////
{}
///////////////////////////////////////////////////////////////////////////
+// senf::ppi::connector::OutputConnector
+
+prefix_ void senf::ppi::connector::OutputConnector::v_disconnected()
+{
+ Connector::v_disconnected();
+ peer_ = 0;
+}
+
+prefix_ void senf::ppi::connector::OutputConnector::v_connected()
+{
+ Connector::v_connected();
+ peer_ = & dynamic_cast<InputConnector&>(Connector::peer());
+}
+
+///////////////////////////////////////////////////////////////////////////
// senf::ppi::connector::GenericActiveInput
////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// senf::ppi::connector::GenericPassiveInput
+prefix_ void senf::ppi::connector::GenericPassiveInput::v_disconnected()
+{
+ PassiveConnector::v_disconnected();
+ InputConnector::v_disconnected();
+ peer_ = 0;
+}
+
+prefix_ void senf::ppi::connector::GenericPassiveInput::v_connected()
+{
+ PassiveConnector::v_connected();
+ InputConnector::v_connected();
+ peer_ = & dynamic_cast<GenericActiveOutput&>(Connector::peer());
+}
+
////////////////////////////////////////
// private members
prefix_ void senf::ppi::connector::GenericPassiveInput::v_enqueueEvent()
{
emit();
- qdisc_->update(*this, QueueingDiscipline::ENQUEUE);
+ if (qdisc_)
+ qdisc_->update(*this, QueueingDiscipline::ENQUEUE);
}
prefix_ void senf::ppi::connector::GenericPassiveInput::v_dequeueEvent()
{
- qdisc_->update(*this, QueueingDiscipline::DEQUEUE);
+ if (qdisc_)
+ qdisc_->update(*this, QueueingDiscipline::DEQUEUE);
+}
+
+prefix_ void senf::ppi::connector::GenericPassiveInput::qdisc(QueueingDiscipline::None_t)
+{
+ qdisc_.reset( 0);
}
prefix_ void senf::ppi::connector::GenericPassiveInput::v_unthrottleEvent()
}
}
+///////////////////////////////////////////////////////////////////////////
+// senf::ppi::connector::GenericPassiveOutput
+
+prefix_ void senf::ppi::connector::GenericPassiveOutput::v_disconnected()
+{
+ PassiveConnector::v_disconnected();
+ OutputConnector::v_disconnected();
+ peer_ = 0;
+}
+
+prefix_ void senf::ppi::connector::GenericPassiveOutput::v_connected()
+{
+ PassiveConnector::v_connected();
+ OutputConnector::v_connected();
+ peer_ = & dynamic_cast<GenericActiveInput&>(Connector::peer());
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::ppi::connector::GenericActiveInput
+
+prefix_ void senf::ppi::connector::GenericActiveInput::v_disconnected()
+{
+ ActiveConnector::v_disconnected();
+ InputConnector::v_disconnected();
+ peer_ = 0;
+}
+
+prefix_ void senf::ppi::connector::GenericActiveInput::v_connected()
+{
+ ActiveConnector::v_connected();
+ InputConnector::v_connected();
+ peer_ = & dynamic_cast<GenericPassiveOutput&>(Connector::peer());
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::ppi::connector::GenericActiveOutput
+
+prefix_ void senf::ppi::connector::GenericActiveOutput::v_disconnected()
+{
+ ActiveConnector::v_disconnected();
+ OutputConnector::v_disconnected();
+ peer_ = 0;
+}
+
+prefix_ void senf::ppi::connector::GenericActiveOutput::v_connected()
+{
+ ActiveConnector::v_connected();
+ OutputConnector::v_connected();
+ peer_ = & dynamic_cast<GenericPassiveInput&>(Connector::peer());
+}
+
+
///////////////////////////////cc.e////////////////////////////////////////
#undef prefix_
//#include "Connectors.mpp"