Commit e3ab29d9 authored by Remi Mommsen's avatar Remi Mommsen Committed by Remi Mommsen
Browse files

references #144: undo naming change of parseSocketBuffers workloops

parent 3f51ca46
......@@ -81,7 +81,6 @@ namespace evb {
volatile std::atomic<bool> parseSocketBuffersActive_;
FedFragmentPtr currentFragment_;
static unsigned int streamCounter_;
};
......@@ -92,9 +91,6 @@ namespace evb {
// Implementation follows //
////////////////////////////////////////////////////////////////////////////////
template<class ReadoutUnit,class Configuration>
unsigned int evb::readoutunit::SocketStream<ReadoutUnit,Configuration>::streamCounter_(0);
template<class ReadoutUnit,class Configuration>
evb::readoutunit::SocketStream<ReadoutUnit,Configuration>::SocketStream
(
......@@ -106,7 +102,6 @@ evb::readoutunit::SocketStream<ReadoutUnit,Configuration>::SocketStream
parseSocketBuffersActive_(false)
{
startParseSocketBuffersWorkLoop();
++streamCounter_;
}
......@@ -120,12 +115,14 @@ void evb::readoutunit::SocketStream<ReadoutUnit,Configuration>::startParseSocket
{
try
{
const std::string fedIdStr = std::to_string(this->fedId_);
parseSocketBuffersWL_ = toolbox::task::getWorkLoopFactory()->
getWorkLoop( this->readoutUnit_->getIdentifier("parseSocketBuffers_"+std::to_string(streamCounter_)), "waiting" );
getWorkLoop( this->readoutUnit_->getIdentifier("parseSocketBuffers_"+fedIdStr), "waiting" );
parseSocketBuffersAction_ =
toolbox::task::bind(this, &evb::readoutunit::SocketStream<ReadoutUnit,Configuration>::parseSocketBuffers,
this->readoutUnit_->getIdentifier("parseSocketBuffersAction_"+std::to_string(streamCounter_)) );
this->readoutUnit_->getIdentifier("parseSocketBuffersAction_"+fedIdStr) );
if ( ! parseSocketBuffersWL_->isActive() )
parseSocketBuffersWL_->activate();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment