Skip to content

Commit

Permalink
Merge pull request #44584 from wddgit/backport140XSpinLockFix
Browse files Browse the repository at this point in the history
Backport spin lock bug fixes
  • Loading branch information
cmsbuild authored Apr 9, 2024
2 parents ac9dcf3 + 8ed0a21 commit 4781898
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions DPGAnalysis/Skims/src/LogErrorEventFilter.cc
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
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

0 comments on commit 4781898

Please sign in to comment.