From d485372abfb80dfcea0ec3bc95bb3cd3468b5f29 Mon Sep 17 00:00:00 2001 From: Ben Kimock Date: Thu, 24 Aug 2023 10:24:01 -0400 Subject: [PATCH] Add Number and Atomic impls for usize Signed-off-by: Ben Kimock --- src/atomic64.rs | 61 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/src/atomic64.rs b/src/atomic64.rs index 0c653c51..e7252e28 100644 --- a/src/atomic64.rs +++ b/src/atomic64.rs @@ -4,7 +4,9 @@ use std::cmp::*; use std::f64; use std::ops::*; -use std::sync::atomic::{AtomicI64 as StdAtomicI64, AtomicU64 as StdAtomicU64, Ordering}; +use std::sync::atomic::{ + AtomicI64 as StdAtomicI64, AtomicU64 as StdAtomicU64, AtomicUsize as StdAtomicUsize, Ordering, +}; /// An interface for numbers. Used to generically model float metrics and integer metrics, i.e. /// [`Counter`](crate::Counter) and [`IntCounter`](crate::Counter). @@ -53,6 +55,18 @@ impl Number for f64 { } } +impl Number for usize { + #[inline] + fn from_i64(v: i64) -> Self { + v as Self + } + + #[inline] + fn into_f64(self) -> f64 { + self as f64 + } +} + /// An interface for atomics. Used to generically model float metrics and integer metrics, i.e. /// [`Counter`](crate::Counter) and [`IntCounter`](crate::IntCounter). pub trait Atomic: Send + Sync { @@ -239,6 +253,42 @@ impl AtomicU64 { } } +/// A atomic unsigned integer. +#[derive(Debug)] +pub struct AtomicUsize { + inner: StdAtomicUsize, +} + +impl Atomic for AtomicUsize { + type T = usize; + + fn new(val: Self::T) -> AtomicUsize { + AtomicUsize { + inner: StdAtomicUsize::new(val), + } + } + + #[inline] + fn set(&self, val: Self::T) { + self.inner.store(val, Ordering::Relaxed); + } + + #[inline] + fn get(&self) -> Self::T { + self.inner.load(Ordering::Relaxed) + } + + #[inline] + fn inc_by(&self, delta: Self::T) { + self.inner.fetch_add(delta, Ordering::Relaxed); + } + + #[inline] + fn dec_by(&self, delta: Self::T) { + self.inner.fetch_sub(delta, Ordering::Relaxed); + } +} + #[cfg(test)] mod test { use std::f64::consts::PI; @@ -275,4 +325,13 @@ mod test { au64.inc_by(123); assert_eq!(au64.get(), 123); } + + #[test] + fn test_atomic_usize() { + let ausize = AtomicUsize::new(0); + assert_eq!(ausize.get(), 0); + + ausize.inc_by(123); + assert_eq!(ausize.get(), 123); + } }