Skip to content

DPL: Fix orderedCompletionPolicy getting stuck when oldestPossibleTimeslice message jumps by > 1 at once, and any but the last TF in the jump range is missing #13031

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martenole merged 2 commits into from
Apr 16, 2024
Merged

DPL: Fix orderedCompletionPolicy getting stuck when oldestPossibleTimeslice message jumps by > 1 at once, and any but the last TF in the jump range is missing #13031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d321ec9
DPL: Fix debug message, which was showing the previous slot
davidrohr Apr 16, 2024
00983d4
DPL: Fix orderedCompletionPolicy getting stuck when oldestPossibleTim…
davidrohr Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions Framework/Core/src/CommonServices.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,17 +676,21 @@ o2::framework::ServiceSpec CommonServices::decongestionSpec()
}
}
decongestion.lastTimeslice = oldestPossibleOutput.timeslice.value;
if (decongestion.orderedCompletionPolicyActive) {

},
TimesliceId{oldestPossibleTimeslice}, -1);
if (decongestion.orderedCompletionPolicyActive) {
AsyncQueueHelpers::post(
queue, decongestion.oldestPossibleTimesliceTask, [ref = services, oldestPossibleOutput, &decongestion, &proxy, &spec, device, &timesliceIndex](size_t id) {
O2_SIGNPOST_ID_GENERATE(cid, async_queue);
int64_t oldNextTimeslice = decongestion.nextTimeslice;
decongestion.nextTimeslice = std::max(decongestion.nextTimeslice, (int64_t)oldestPossibleOutput.timeslice.value);
if (oldNextTimeslice != decongestion.nextTimeslice) {
O2_SIGNPOST_EVENT_EMIT_ERROR(async_queue, cid, "oldest_possible_timeslice", "Some Lifetime::Timeframe data got dropped starting at %" PRIi64, oldNextTimeslice);
timesliceIndex.rescan();
}
}
},
TimesliceId{oldestPossibleTimeslice}, -1); },
TimesliceId{oldestPossibleOutput.timeslice.value}, -1);
} },
.kind = ServiceKind::Serial};
}

Expand Down
18 changes: 10 additions & 8 deletions Framework/Core/src/TimesliceIndex.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,14 +208,16 @@ TimesliceIndex::OldestOutputInfo TimesliceIndex::updateOldestPossibleOutput()
}
}
O2_SIGNPOST_ID_GENERATE(tid, timeslice_index);
if (changed && mOldestPossibleOutput.timeslice.value != result.timeslice.value) {
O2_SIGNPOST_EVENT_EMIT(timeslice_index, tid, "updateOldestPossibleOutput", "Oldest possible output %zu due to %{public}s %zu",
result.timeslice.value,
result.channel.value == -1 ? "slot" : "channel",
result.channel.value == -1 ? mOldestPossibleOutput.slot.index : mOldestPossibleOutput.channel.value);
} else if (mOldestPossibleOutput.timeslice.value != result.timeslice.value) {
O2_SIGNPOST_EVENT_EMIT(timeslice_index, tid, "updateOldestPossibleOutput", "Oldest possible output updated from oldest Input : %zu --> %zu",
mOldestPossibleOutput.timeslice.value, result.timeslice.value);
if (mOldestPossibleOutput.timeslice.value != result.timeslice.value) {
if (changed) {
O2_SIGNPOST_EVENT_EMIT(timeslice_index, tid, "updateOldestPossibleOutput", "Oldest possible output %zu (before %zu) due to %s %zu",
result.timeslice.value, mOldestPossibleOutput.timeslice.value,
result.channel.value == -1 ? "slot" : "channel",
result.channel.value == -1 ? result.slot.index : result.channel.value);
} else {
O2_SIGNPOST_EVENT_EMIT(timeslice_index, tid, "updateOldestPossibleOutput", "Oldest possible output updated from oldest Input : %zu --> %zu",
mOldestPossibleOutput.timeslice.value, result.timeslice.value);
}
}
mOldestPossibleOutput = result;

Expand Down