///////////////////////////////////////////////////////////////////////////
// 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
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;
///////////////////////////////////////////////////////////////////////////
// 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();
+}
+
////////////////////////////////////////
// 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();
+}
+
////////////////////////////////////////
// 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::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()