@@ -292,16 +292,14 @@ int DataBlockSlicer::appendBlock(DataBlockContainerReference const& block, doubl
292292 }
293293 }
294294
295- // theLog.log(LogDebugTrace, "slicer %p append block eq %d link %d for tf %d",
296- // this,(int)sourceId.equipmentId,(int)sourceId.linkId,(int)tfId);
295+ // theLog.log(LogDebugTrace, "slicer %p append block eq %d link %d for tf %d", this,(int)sourceId.equipmentId,(int)sourceId.linkId,(int)tfId);
297296 PartialSlice& s = partialSlices[sourceId];
298297
299298 if (s.currentDataSet != nullptr ) {
300- // theLog.log(LogDebugTrace, "slice size = %d chunks",partialSlices[linkId].currentDataSet->size()); if ((partialSlices[linkId].tfId!=tfId)||(partialSlices[linkId].currentDataSet->size()>2))
301- // {
299+ // theLog.log(LogDebugTrace, "slice size = %d chunks",(int)s.currentDataSet->size());
302300 if ((s.tfId != tfId) || (tfId == undefinedTimeframeId)) {
303301 // the current slice is complete
304- // theLog.log(LogDebugTrace, "slicer %p TF %d eq %d link %d is complete (%d blocks)",this, (int)s.tfId,(int)sourceId.equipmentId,(int)sourceId.linkId,s.currentDataSet->size());
302+ // theLog.log(LogDebugTrace, "slicer %p TF %d eq %d link %d is complete (%d blocks)",this, (int)s.tfId,(int)sourceId.equipmentId,(int)sourceId.linkId,(int) s.currentDataSet->size());
305303 slices.push (s.currentDataSet );
306304 s.currentDataSet = nullptr ;
307305 }
@@ -316,7 +314,7 @@ int DataBlockSlicer::appendBlock(DataBlockContainerReference const& block, doubl
316314 s.currentDataSet ->push_back (block);
317315 s.tfId = tfId;
318316 s.lastUpdateTime = timestamp;
319- // printf(" %d,%d -> %d blocks\n",s. sourceId.equipmentId,s. sourceId.linkId,s.currentDataSet->size());
317+ // printf(" %d,%d -> %d blocks\n",(int) sourceId.equipmentId,(int) sourceId.linkId,(int) s.currentDataSet->size());
320318 return s.currentDataSet ->size ();
321319}
322320
@@ -340,6 +338,7 @@ DataSetReference DataBlockSlicer::getSlice(bool includeIncomplete)
340338 bcv = slices.front ();
341339 slices.pop ();
342340 }
341+ // printf("getSlice -> %p\n", bcv.get());
343342 return bcv;
344343}
345344
0 commit comments