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.

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

Update expensify_prod branch #2115

Merged
merged 5 commits into from
Mar 4, 2025
Merged
Changes from 3 commits
Commits
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
4 changes: 4 additions & 0 deletions libstuff/SScheduledPriorityQueue.h
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ void SScheduledPriorityQueue<T>::push(T&& item, Priority priority, Scheduled sch
_lookupByTimeout.insert(make_pair(timeout, make_pair(priority, scheduled)));
queue.emplace(scheduled, ItemTimeoutPair(move(item), timeout));
_queueCondition.notify_one();
SINFO("Enqueued command with timeout " << timeout);
}

template<typename T>
Expand Down Expand Up @@ -302,6 +303,9 @@ T SScheduledPriorityQueue<T>::_dequeue() {
_lookupByTimeout.erase(it);
break;
}

// We should always break before we get here, some timeout should match.
SWARN("Did not find a matching timeout to remove for command: " << item->request.methodLine);
}

// Call the end function and return!
Expand Down