diff --git a/include/user/spMcRingBuffer.h b/include/user/spMcRingBuffer.h index 2a3258a..d4bb6d5 100644 --- a/include/user/spMcRingBuffer.h +++ b/include/user/spMcRingBuffer.h @@ -61,7 +61,7 @@ public: { slots[i].~StimulusFrame(); // Destroy default-constructed object new (&slots[i]) StimulusFrame( - frameAssemblyDesc->slots[i], callbacks, flags); + frameAssemblyDesc->slots[i], callbacks, flags, i); } } diff --git a/include/user/stimulusFrame.h b/include/user/stimulusFrame.h index b8df377..aed590f 100644 --- a/include/user/stimulusFrame.h +++ b/include/user/stimulusFrame.h @@ -77,8 +77,10 @@ public: StimulusFrame( const FrameAssemblyDesc::SlotDesc& slotDesc_, const SmoCallbacks& callbacks, - cl_mem_flags flags) - : slotDesc(slotDesc_) + cl_mem_flags flags, + size_t ringBufferIndex_) + : slotDesc(slotDesc_), + ringBufferIndex(ringBufferIndex_) { if (!callbacks.ComputeManager_createUseHostPtrBuffer) { @@ -112,6 +114,7 @@ public: SimultaneityStamp simultaneityStamp; FrameAssemblyDesc::SlotDesc slotDesc; std::shared_ptr clBuffer; + size_t ringBufferIndex; }; } // namespace stim_buff diff --git a/stimBuffApis/livoxGen1/openClCollatingAndMeshingEngine.cpp b/stimBuffApis/livoxGen1/openClCollatingAndMeshingEngine.cpp index 486cd08..65e28a7 100644 --- a/stimBuffApis/livoxGen1/openClCollatingAndMeshingEngine.cpp +++ b/stimBuffApis/livoxGen1/openClCollatingAndMeshingEngine.cpp @@ -1015,7 +1015,9 @@ public: } } - std::cout << __func__ << ": pointsPerDgram=" << pointsPerDgram + std::cout << __func__ << ": ringBufferIndex=" + << context->intensityStimFrame->get().ringBufferIndex + << ", pointsPerDgram=" << pointsPerDgram << ", nSucceeded=" << nSucceeded << ", totalPoints=" << totalPoints << ", highIntensityCount=" << highIntensityCount << std::endl; diff --git a/stimBuffApis/livoxGen1/pcloudStimulusProducer.cpp b/stimBuffApis/livoxGen1/pcloudStimulusProducer.cpp index 625507d..5e90db8 100644 --- a/stimBuffApis/livoxGen1/pcloudStimulusProducer.cpp +++ b/stimBuffApis/livoxGen1/pcloudStimulusProducer.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -88,7 +89,7 @@ tempStimulusFrame( 0, reinterpret_cast(&tempStimulusFrameMem), sizeof(tempStimulusFrameMem)}, - *smoHooksPtr, 0) + *smoHooksPtr, 0, SIZE_MAX) { if (smoHooksPtr->OptionParser_getOptions().verbose) {