Skip to content

DPL: Use startTime instead of tfCounter in whenAllOrdered policy #8644

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
davidrohr merged 1 commit into from
Apr 25, 2022
Merged

DPL: Use startTime instead of tfCounter in whenAllOrdered policy #8644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Framework/Core/include/Framework/CompletionPolicyHelpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ struct CompletionPolicyHelpers {
return consumeWhenAll("consume-all", matcher);
}

/// as consumeWhenAll, but ensures that records are processed with incremental DataHeader::tfCounter
/// as consumeWhenAll, but ensures that records are processed with incremental timeSlice (DataHeader::startTime)
static CompletionPolicy consumeWhenAllOrdered(const char* name, CompletionPolicy::Matcher matcher);
/// Default matcher applies for all devices
static CompletionPolicy consumeWhenAllOrdered(CompletionPolicy::Matcher matcher = [](auto const&) -> bool { return true; })
Expand Down
8 changes: 4 additions & 4 deletions Framework/Core/src/CompletionPolicyHelpers.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,17 +116,17 @@ CompletionPolicy CompletionPolicyHelpers::consumeWhenAll(const char* name, Compl

CompletionPolicy CompletionPolicyHelpers::consumeWhenAllOrdered(const char* name, CompletionPolicy::Matcher matcher)
{
auto nextTfCounter = std::make_shared<long int>(0);
auto callback = [nextTfCounter](InputSpan const& inputs) -> CompletionPolicy::CompletionOp {
auto nextTimeSlice = std::make_shared<long int>(0);
auto callback = [nextTimeSlice](InputSpan const& inputs) -> CompletionPolicy::CompletionOp {
for (auto& input : inputs) {
if (input.header == nullptr) {
return CompletionPolicy::CompletionOp::Wait;
}
if (framework::DataRefUtils::isValid(input) && framework::DataRefUtils::getHeader<o2::header::DataHeader*>(input)->tfCounter != *nextTfCounter) {
if (framework::DataRefUtils::isValid(input) && framework::DataRefUtils::getHeader<o2::framework::DataProcessingHeader*>(input)->startTime != *nextTimeSlice) {
return CompletionPolicy::CompletionOp::Wait;
}
}
(*nextTfCounter)++;
(*nextTimeSlice)++;
return CompletionPolicy::CompletionOp::ConsumeAndRescan;
};
return CompletionPolicy{name, matcher, callback};
Expand Down