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

Backport spin lock bug fixes #44584

Merged
merged 2 commits into from
Apr 9, 2024
Merged

Backport spin lock bug fixes #44584

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
771bc0d
Fix two spinlocks
wddgit Mar 22, 2024
8ed0a21
Initialize statsGuard_
makortel Mar 18, 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: 4 additions & 4 deletions DPGAnalysis/Skims/src/LogErrorEventFilter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ namespace {
};
std::unique_ptr<std::atomic<bool>, release> make_guard(std::atomic<bool> &b) noexcept {
bool expected = false;
while (not b.compare_exchange_strong(expected, true))
;

while (not b.compare_exchange_strong(expected, true)) {
expected = false;
}
return std::unique_ptr<std::atomic<bool>, release>(&b, release());
}

Expand Down Expand Up @@ -116,7 +116,7 @@ class LogErrorEventFilter : public edm::global::EDFilter<edm::RunCache<leef::Run
size_t maxSavedEventsPerLumi_;
bool verbose_, veryVerbose_;
bool taggedMode_, forcedValue_;
mutable std::atomic<bool> statsGuard_;
mutable std::atomic<bool> statsGuard_{false};

template <typename Collection>
static void increment(ErrorSet &scoreboard, Collection &list);
Expand Down
2 changes: 1 addition & 1 deletion FWCore/Framework/src/Path.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ namespace edm {

void Path::threadsafe_setFailedModuleInfo(int nwrwue, bool iExcept) {
bool expected = false;
while (stateLock_.compare_exchange_strong(expected, true)) {
while (not stateLock_.compare_exchange_strong(expected, true)) {
expected = false;
}
if (iExcept) {
Expand Down