Fix mutex references and the global lock - #322
Conversation
Allow mutexes to be acquired and released by reference. This then allows the global reference `_GL` to be acquired and released. Correct the semantics of the global lock so that it handles the firmware lock correctly
|
Perhaps a syntax sugar closure like fn with_lock<R>(
&self,
mutex: Handle,
timeout: u16,
f: impl FnOnce() -> R,
) -> Result<R, AmlError> {
self.acquire(mutex, timeout)?;
struct Guard<'a, H: Handler> {
handler: &'a H,
mutex: Handle,
}
impl<H: Handler> Drop for Guard<'_, H> {
fn drop(&mut self) {
self.handler.release(self.mutex);
}
}
let _guard = Guard {
handler: self,
mutex,
};
Ok(f())
}Little helpers like this saved plenty of boot wedges for me |
|
Do you mean to add to this PR? If so would you show me an example of it being used? I can think why it might be generally useful but I'm not sure about needing it here |
|
Thanks for working on this Martin! I also have some
Yeah, we have to trust the |
| */ | ||
| self.handler.release(self.global_lock_mutex); | ||
| continue; | ||
| let last = self.global_lock_acquisition_count.fetch_add(1, Ordering::Relaxed); |
There was a problem hiding this comment.
On second reading - are these orderings strong enough? This is an accursed area of knowledge for me, but I wonder if these should be Acquire and Release respectively? Other than that, very happy to merge.
This fixes #305 by correcting the mutex acquisition and release. It also allows mutexes to be acquired and released by reference, since otherwise it is not possible to acquire (or release)
_GL.@IsaacWoods the main question I had was about where to keep track of the reentrant acquisition count of
global_lock_mutex. Clearly theHandlershould not release the actual mutex until the count reaches zero, but we don't know what the count is.There were two options that I could think of:
Interpreter(which I chose), orHandlerto return a value indicating whether the mutex was fully released or not.Option 2 would require an API change, and also relies on the implementer to correctly deal with reentrancy. Whereas option 1 allows the crate to deal with an inadequately implemented
Handlerbut ifHandleris wrong then the actual mutex may come out of sync with the firmware lock.I would be happy to switch to option 2 if you prefer, Isaac.