Merge pull request #23 from nazar554/feature/atomic-shim

Add atomic_shim to support platforms where 64-bit atomics are not available

Cargo.toml

@@ -29,9 +29,21 @@ prost = ["prost-types"]
 
 [dependencies]
 once_cell = "^1.4"
-raw-cpuid = "^8.1"
 metrics-core = { version = "^0.5", optional = true }
 prost-types = { version = "^0.6", optional = true }
+atomic-shim = "0.1.0"
+
+[target.'cfg(target_arch = "x86")'.dependencies]
+raw-cpuid = "^8.1"
+
+[target.'cfg(target_arch = "x86_64")'.dependencies]
+raw-cpuid = "^8.1"
+
+[target.'cfg(target_arch = "mips")'.dependencies]
+ctor = "0.1.15"
+
+[target.'cfg(target_arch = "powerpc")'.dependencies]
+ctor = "0.1.15"
 
 [target.'cfg(target_os = "linux")'.dependencies]
 libc = "^0.2"

src/instant.rs

@@ -197,4 +197,4 @@ impl Into<prost_types::Timestamp> for Instant {
             nanos: nsecs,
         }
     }
-}
+}

src/lib.rs

@@ -43,7 +43,7 @@
 //! is the only code updating the recent time, the accuracy of the value given to callers is
 //! limited by how often the upkeep thread updates the time, thus the trade off between accuracy
 //! and speed of access.
-//! 
+//!
 //! # Feature Flags
 //! `quanta` comes with multiple feature flags that enable convenient conversions to time types in
 //! other popular crates:
@@ -115,13 +115,12 @@
 //! [clock_gettime]: https://linux.die.net/man/3/clock_gettime
 //! [metrics_core_asnanoseconds]: https://docs.rs/metrics-core/0.5.2/metrics_core/trait.AsNanoseconds.html
 //! [prost_types_timestamp]: https://docs.rs/prost-types/0.6.1/prost_types/struct.Timestamp.html
-use std::sync::{
-    atomic::{AtomicU64, Ordering},
-    Arc,
-};
+use atomic_shim::AtomicU64;
+use std::sync::{atomic::Ordering, Arc};
 use std::time::Duration;
 
 use once_cell::sync::OnceCell;
+#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 use raw_cpuid::CpuId;
 
 mod monotonic;
@@ -133,11 +132,24 @@ pub use self::mock::{IntoNanoseconds, Mock};
 mod instant;
 pub use self::instant::Instant;
 mod upkeep;
-pub use self::upkeep::{Handle, Upkeep, Error};
+pub use self::upkeep::{Error, Handle, Upkeep};
 mod stats;
 use self::stats::Variance;
 
+#[cfg(any(target_arch = "mips", target_arch = "powerpc"))]
+mod atomic_compat {
+    use super::AtomicU64;
+    use ctor::ctor;
+
+    #[ctor]
+    pub static GLOBAL_RECENT: AtomicU64 = AtomicU64::new(0);
+}
+#[cfg(any(target_arch = "mips", target_arch = "powerpc"))]
+use self::atomic_compat::GLOBAL_RECENT;
+
+#[cfg(not(any(target_arch = "mips", target_arch = "powerpc")))]
 static GLOBAL_RECENT: AtomicU64 = AtomicU64::new(0);
+
 static GLOBAL_CALIBRATION: OnceCell<Calibration> = OnceCell::new();
 
 // Run 100 rounds of calibration before we start actually seeing what the numbers look like.
@@ -545,27 +557,31 @@ fn has_constant_or_better_tsc() -> bool {
     false
 }
 
+#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 fn read_cpuid_mfg() -> String {
     let cpuid = CpuId::new();
     cpuid
         .get_vendor_info()
         .map_or_else(|| String::new(), |vi| vi.as_string().to_owned())
 }
 
+#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 fn read_cpuid_nonstop_tsc() -> bool {
     let cpuid = CpuId::new();
     cpuid
         .get_extended_function_info()
         .map_or(false, |efi| efi.has_invariant_tsc())
 }
 
+#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 fn read_cpuid_family_model() -> u32 {
     let cpuid = CpuId::new();
     cpuid.get_feature_info().map_or(0, |fi| {
         (fi.family_id() as u32) << 8 | (fi.extended_model_id() as u32) << 4 | fi.model_id() as u32
     })
 }
 
+#[allow(dead_code)]
 fn has_multiple_sockets() -> bool {
     // TODO: implement me.
     //

src/mock.rs

@@ -1,10 +1,8 @@
 #![allow(dead_code)]
 use crate::ClockSource;
+use atomic_shim::AtomicU64;
 use std::{
-    sync::{
-        atomic::{AtomicU64, Ordering},
-        Arc,
-    },
+    sync::{atomic::Ordering, Arc},
     time::Duration,
 };