Skip to content

Commit 5e096cb

Browse files
committed
added debug mode to bypass aggregation
1 parent 6a24a99 commit 5e096cb

File tree

1 file changed

+24
-1
lines changed

1 file changed

+24
-1
lines changed

src/DataBlockAggregator.cxx

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,30 @@ Thread::CallbackResult DataBlockAggregator::executeCallback() {
162162
for (unsigned int ix=0; ix<nInputs; ix++) {
163163
int i=(ix + nextIndex) % nInputs;
164164

165+
if (0) {
166+
// no slicing... pass through
167+
if (output->isFull()) {
168+
return Thread::CallbackResult::Idle;
169+
}
170+
if (inputs[i]->isEmpty()) {
171+
continue;
172+
}
173+
DataBlockContainerReference b=nullptr;
174+
inputs[i]->pop(b);
175+
nBlocksIn++;
176+
DataSetReference bcv=nullptr;
177+
try {
178+
bcv=std::make_shared<DataSet>();
179+
}
180+
catch(...) {
181+
return Thread::CallbackResult::Error;
182+
}
183+
bcv->push_back(b);
184+
output->push(bcv);
185+
nSlicesOut++;
186+
continue;
187+
}
188+
165189
for (int j=0;j<1024;j++) {
166190
if (inputs[i]->isEmpty()) {
167191
break;
@@ -230,7 +254,6 @@ int DataBlockSlicer::appendBlock(DataBlockContainerReference const &block) {
230254
//theLog.log("TF %d link %d is complete",tfId,linkId);
231255
slices.push(partialSlices[linkId].currentDataSet);
232256
partialSlices[linkId].currentDataSet=nullptr;
233-
234257
}
235258
}
236259
if (partialSlices[linkId].currentDataSet==nullptr) {

0 commit comments

Comments
 (0)