replace bitset set/reset methods with a single set method that takes …

…a bool
coupler-rs · Sep 2, 2024 · fe2071b · fe2071b
1 parent 1cd580b
commit fe2071b
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 34 deletions.
diff --git a/src/sync/bitset.rs b/src/sync/bitset.rs
@@ -22,19 +22,16 @@ impl Bitset {
     }
 
     #[inline]
-    pub fn set(&mut self, index: usize) {
+    pub fn set(&mut self, index: usize, value: bool) {
         assert!(index < self.len);
 
         let mask = 1 << (index & WORD_SIZE_MASK);
-        self.words[index >> WORD_SIZE_SHIFT] |= mask;
-    }
-
-    #[inline]
-    pub fn reset(&mut self, index: usize) {
-        assert!(index < self.len);
-
-        let mask = 1 << (index & WORD_SIZE_MASK);
-        self.words[index >> WORD_SIZE_SHIFT] &= !mask;
+        let word = &mut self.words[index >> WORD_SIZE_SHIFT];
+        if value {
+            *word |= mask;
+        } else {
+            *word &= !mask;
+        }
     }
 
     #[inline]
@@ -65,19 +62,16 @@ impl AtomicBitset {
     }
 
     #[inline]
-    pub fn set(&self, index: usize, ordering: Ordering) {
+    pub fn set(&self, index: usize, value: bool, ordering: Ordering) {
         assert!(index < self.len);
 
         let mask = 1 << (index & WORD_SIZE_MASK);
-        self.words[index >> WORD_SIZE_SHIFT].fetch_or(mask, ordering);
-    }
-
-    #[inline]
-    pub fn reset(&self, index: usize, ordering: Ordering) {
-        assert!(index < self.len);
-
-        let mask = 1 << (index & WORD_SIZE_MASK);
-        self.words[index >> WORD_SIZE_SHIFT].fetch_and(!mask, ordering);
+        let word = &self.words[index >> WORD_SIZE_SHIFT];
+        if value {
+            word.fetch_or(mask, ordering);
+        } else {
+            word.fetch_and(!mask, ordering);
+        }
     }
 
     #[inline]
@@ -146,10 +140,10 @@ mod tests {
         for index in 0..8 {
             assert!(!bitset.get(index));
 
-            bitset.set(index);
+            bitset.set(index, true);
             assert!(bitset.get(index));
 
-            bitset.reset(index);
+            bitset.set(index, false);
             assert!(!bitset.get(index));
         }
     }
@@ -161,10 +155,10 @@ mod tests {
         for index in 0..8 {
             assert!(!bitset.get(index, Ordering::Relaxed));
 
-            bitset.set(index, Ordering::Relaxed);
+            bitset.set(index, true, Ordering::Relaxed);
             assert!(bitset.get(index, Ordering::Relaxed));
 
-            bitset.reset(index, Ordering::Relaxed);
+            bitset.set(index, false, Ordering::Relaxed);
             assert!(!bitset.get(index, Ordering::Relaxed));
         }
     }
@@ -173,9 +167,9 @@ mod tests {
     fn atomic_drain() {
         let bitset = AtomicBitset::with_len(8);
 
-        bitset.set(0, Ordering::Relaxed);
-        bitset.set(3, Ordering::Relaxed);
-        bitset.set(7, Ordering::Relaxed);
+        bitset.set(0, true, Ordering::Relaxed);
+        bitset.set(3, true, Ordering::Relaxed);
+        bitset.set(7, true, Ordering::Relaxed);
 
         let mut iter = bitset.drain(Ordering::Relaxed);
         assert_eq!(iter.next().unwrap(), 0);
@@ -188,7 +182,7 @@ mod tests {
         let bitset = AtomicBitset::with_len(1000);
 
         for x in 0..128 {
-            bitset.set(5 + 7 * x, Ordering::Relaxed);
+            bitset.set(5 + 7 * x, true, Ordering::Relaxed);
         }
 
         let mut count = 0;

diff --git a/src/sync/param_gestures.rs b/src/sync/param_gestures.rs
@@ -20,18 +20,18 @@ impl ParamGestures {
     }
 
     pub fn begin_gesture(&self, index: usize) {
-        self.gestures.set(index, Ordering::Relaxed);
-        self.dirty.set(index, Ordering::Release);
+        self.gestures.set(index, true, Ordering::Relaxed);
+        self.dirty.set(index, true, Ordering::Release);
     }
 
     pub fn end_gesture(&self, index: usize) {
-        self.gestures.reset(index, Ordering::Relaxed);
-        self.dirty.set(index, Ordering::Release);
+        self.gestures.set(index, false, Ordering::Relaxed);
+        self.dirty.set(index, true, Ordering::Release);
     }
 
     pub fn set_value(&self, index: usize, value: ParamValue) {
         self.values[index].store(value, Ordering::Relaxed);
-        self.dirty.set(index, Ordering::Release);
+        self.dirty.set(index, true, Ordering::Release);
     }
 
     pub fn poll(&self) -> Poll {

diff --git a/src/sync/params.rs b/src/sync/params.rs
@@ -19,7 +19,7 @@ impl ParamValues {
 
     pub fn set(&self, index: usize, value: ParamValue) {
         self.values[index].store(value, Ordering::Relaxed);
-        self.dirty.set(index, Ordering::Release);
+        self.dirty.set(index, true, Ordering::Release);
     }
 
     pub fn poll(&self) -> Poll {