FPGAImagePuller: frames given up on go back to the card while a module waits

A module waiting for its next frame released the late frames of images it
had given up on only after the wait. With one card more than
MissingAfterFrames behind the others, its buffers filled with such frames,
the card could not write the frame waited for, and the run hung (seen with
two mock cards under load). The release now happens inside the wait.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UqXYdHHZ4cogS1mrGUtfN7
This commit is contained in:
leonarski_fandClaude Opus 5.5 committed 2026-11-18 09:43:57 +01:00
1 parent 8ca312f297
commit 4c8af0dbc1
2 files changed
+18 -14

No files matched your search

+17 -13
View File
@@ -130,14 +130,23 @@ int64_t FPGAImagePuller::FastestFrame() const {
return ret; return ret;
} }
// Polled: a dead card has to be noticed from the other cards' frames // Polled: a dead card has to be noticed from the other cards' frames.
void FPGAImagePuller::WaitForFrame(uint16_t data_stream, uint16_t module_number, int64_t frame) const { // A frame given up on can still arrive, late: its buffer goes back to the card, also while waiting, as the card
const auto &counters = devices[data_stream].Counters(); // may need it to write the frame waited for.
// A frame is complete once the module is two further on, as in JFJochReceiverFPGA void FPGAImagePuller::WaitForFrame(uint16_t data_stream, uint16_t module_number, int64_t frame, int64_t &oldest_held) {
while ((static_cast<int64_t>(counters.GetCurrFrameNumber(module_number)) < frame + 2) auto &device = devices[data_stream];
&& !counters.IsAcquisitionFinished() && !failed const auto &counters = device.Counters();
&& (FastestFrame() < frame + 2 + MissingAfterFrames)) while (true) {
while ((oldest_held < frame)
&& (oldest_held < static_cast<int64_t>(counters.GetCurrFrameNumber(module_number))))
device.FrameBufferRelease(oldest_held++, module_number);
// A frame is complete once the module is two further on, as in JFJochReceiverFPGA
if ((static_cast<int64_t>(counters.GetCurrFrameNumber(module_number)) >= frame + 2)
|| counters.IsAcquisitionFinished() || failed
|| (FastestFrame() >= frame + 2 + MissingAfterFrames))
return;
std::this_thread::sleep_for(std::chrono::milliseconds(1)); std::this_thread::sleep_for(std::chrono::milliseconds(1));
}
} }
// The last frame any card got; waits for all cards, so every module stops at the same image // The last frame any card got; waits for all cards, so every module stops at the same image
@@ -185,7 +194,7 @@ void FPGAImagePuller::ModuleThread(uint16_t data_stream, uint16_t module_number)
int64_t oldest_held = 0; int64_t oldest_held = 0;
for (int64_t image = 0; image < experiment.GetImageNum(); image++) { for (int64_t image = 0; image < experiment.GetImageNum(); image++) {
WaitForFrame(data_stream, module_number, image); WaitForFrame(data_stream, module_number, image, oldest_held);
if (failed) if (failed)
break; break;
@@ -195,11 +204,6 @@ void FPGAImagePuller::ModuleThread(uint16_t data_stream, uint16_t module_number)
&& (image > LastFrame())) && (image > LastFrame()))
break; break;
// A frame given up on can still arrive, late: its buffer goes back to the card.
while ((oldest_held < image)
&& (oldest_held < static_cast<int64_t>(counters.GetCurrFrameNumber(module_number))))
device.FrameBufferRelease(oldest_held++, module_number);
const bool collected = counters.IsAnyPacketCollected(image, module_number); const bool collected = counters.IsAnyPacketCollected(image, module_number);
if (const auto slot = GetSlot(image)) { if (const auto slot = GetSlot(image)) {
if (collected) { if (collected) {
+1 -1
View File
@@ -72,7 +72,7 @@ private:
void CompressThread(); void CompressThread();
void FinalizeMeasurement(); void FinalizeMeasurement();
void WaitForFrame(uint16_t data_stream, uint16_t module_number, int64_t frame) const; void WaitForFrame(uint16_t data_stream, uint16_t module_number, int64_t frame, int64_t &oldest_held);
int64_t FastestFrame() const; int64_t FastestFrame() const;
int64_t LastFrame() const; int64_t LastFrame() const;
std::shared_ptr<Slot> GetSlot(int64_t image_number); std::shared_ptr<Slot> GetSlot(int64_t image_number);