Skip to content
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

i#6959 all-unsched: Revert only-unscheduled fix #6960

Merged
merged 2 commits into from
Aug 30, 2024
Merged

i#6959 all-unsched: Revert only-unscheduled fix #6960

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7263404
i#6959 all-unsched: Revert only-unscheduled fix
derekbruening Aug 30, 2024
c7c35bc
Fix typo
derekbruening Aug 30, 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
8 changes: 7 additions & 1 deletion clients/drcachesim/scheduler/scheduler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2967,7 +2967,13 @@ scheduler_tmpl_t<RecordType, ReaderType>::pick_next_input(output_ordinal_t outpu
return eof_or_idle(output, need_lock, prev_index);
auto lock = std::unique_lock<std::mutex>(*inputs_[prev_index].lock);
// If we can't go back to the current input, we're EOF or idle.
if (inputs_[prev_index].at_eof || inputs_[prev_index].unscheduled) {
// TODO i#6959: We should go the EOF/idle route if
// inputs_[prev_index].unscheduled as otherwise we're ignoring its
// unscheduled transition: although if there are no other threads at
// all (not just an empty queue) this turns into the eof_or_idle()
// all-unscheduled scenario. Once we have some kind of early exit
// option we'll add the unscheduled check here.
if (inputs_[prev_index].at_eof) {
lock.unlock();
return eof_or_idle(output, need_lock, prev_index);
} else
Expand Down
Loading