remove a race from the hashing write()

Calling load() and store() separately leaves a lot of opportunity for a
race to occur.

This changes the logic to use compare_exchange() and will only return if
the previous value is absolutely not 1 at the point of comparison.

I also don't think this needs to be SeqCst, so relaxing that requirement
a little.
This commit is contained in:
Gary Pennington 2023-06-14 15:23:12 +01:00
parent 517f219066
commit 785be453f6

View File

@ -50,14 +50,17 @@ impl HokmaLock {
pub fn write(&'static self) -> WhenTheHokmaSuppression { pub fn write(&'static self) -> WhenTheHokmaSuppression {
loop { loop {
let previous = self.lock.load(Ordering::SeqCst); // We are only interested in error results
self.lock.store(1, Ordering::SeqCst); if let Err(previous) = self
.lock
if previous != 1 { .compare_exchange(1, 1, Ordering::Acquire, Ordering::Relaxed)
return WhenTheHokmaSuppression { {
hokma: self, if previous != 1 {
state: previous, return WhenTheHokmaSuppression {
}; hokma: self,
state: previous,
};
}
} }
} }
} }