attempt!

Author: Hywan

crates/matrix-sdk-common/src/cross_process_lock.rs

@@ -117,6 +117,12 @@ pub struct CrossProcessLockGuard {
     num_holders: Arc<AtomicU32>,
 }
 
+impl CrossProcessLockGuard {
+    fn new(num_holders: Arc<AtomicU32>) -> Self {
+        Self { num_holders }
+    }
+}
+
 impl Drop for CrossProcessLockGuard {
     fn drop(&mut self) {
         self.num_holders.fetch_sub(1, Ordering::SeqCst);
@@ -242,7 +248,9 @@ where
 
         // The lock is already dirtied? Let's stop here.
         if self.is_dirty() {
-            return Err(CrossProcessLockError::LockDirtied);
+            return Err(CrossProcessLockError::LockDirtied(CrossProcessLockGuard::new(
+                self.num_holders.clone(),
+            )));
         }
 
         // If another thread obtained the lock, make sure to only superficially increase
@@ -280,7 +288,9 @@ where
                     );
                     self.is_dirty.store(true, Ordering::SeqCst);
 
-                    return Err(CrossProcessLockError::LockDirtied);
+                    return Err(CrossProcessLockError::LockDirtied(CrossProcessLockGuard::new(
+                        self.num_holders.clone(),
+                    )));
                 }
 
                 // This was the same generation, no problem.
@@ -404,8 +414,7 @@ where
 
         self.num_holders.fetch_add(1, Ordering::SeqCst);
 
-        let guard = CrossProcessLockGuard { num_holders: self.num_holders.clone() };
-        Ok(Some(guard))
+        Ok(Some(CrossProcessLockGuard::new(self.num_holders.clone())))
     }
 
     /// Attempt to take the lock, with exponential backoff if the lock has
@@ -474,7 +483,7 @@ pub enum CrossProcessLockError {
     /// The lock has been dirtied, i.e. it means another process took the lock
     /// while this process was holding it.
     #[error("a lock has been dirtied")]
-    LockDirtied,
+    LockDirtied(CrossProcessLockGuard),
 
     #[error(transparent)]
     #[cfg(not(target_family = "wasm"))]