# Objective - Acts on certain elements of #18799 - Closes #1615 - New baseline for #18170 ## Solution - Created a new `cfg` module in `bevy_platform` which contains two macros to aid in working with features like `web`, `std`, and `alloc`. - `switch` is a stable implementation of [`cfg_match`](https://doc.rust-lang.org/std/macro.cfg_match.html), which itself is a `core` alternative to [`cfg_if`](https://docs.rs/cfg-if). - `define_alias` is a `build.rs`-free alternative to [`cfg_aliases`](https://docs.rs/cfg_aliases) with the ability to share feature information between crates. - Switched to these macros within `bevy_platform` to demonstrate usage. ## Testing - CI --- ## Showcase Consider the typical `std` feature as an example of a "virality". With just `bevy_platform`, `bevy_utils`, and `bevy_ecs`, we have 3 crates in a chain where activating `std` in any of them should really activate it everywhere. The status-quo for this is for each crate to define its own `std` feature, and ensure it includes the `std` feature of every dependency in that feature. For crates which don't even interact with `std` directly, this can be quite cumbersome. Especially considering that Bevy has a fundamental crate, `bevy_platform`, which is a dependency for effectively every crate. Instead, we can use `define_alias` to create a macro which will conditionally compile code if and only if the specified configuration condition is met _in the defining crate_. ```rust // In `bevy_platform` define_alias! { #[cfg(feature = "std")] => { /// Indicates the `std` crate is available and can be used. std } #[cfg(all(target_arch = "wasm32", feature = "web"))] => { /// Indicates that this target has access to browser APIs. web } } ``` The above `web` and `std` macros will either no-op the provided code if the conditions are not met, or pass it unmodified if it is met. Since it is evaluated in the context of the defining crate, `bevy_platform/std` can be used to conditionally compile code in `bevy_utils` and `bevy_ecs` _without_ those crates including their own `std` features. ```rust // In `bevy_utils` use bevy_platform::cfg; // If `bevy_platform` has `std`, then we can too! cfg::std! { extern crate std; } ``` To aid in more complex configurations, `switch` is provided to provide a `cfg_if` alternative that is compatible with `define_alias`: ```rust use bevy_platform::cfg; cfg::switch! { #[cfg(feature = "foo")] => { /* use the foo API */ } cfg::web => { /* use browser API */ } cfg::std => { /* use std */ } _ => { /* use a fallback implementation */ } } ``` This paradigm would allow Bevy's sub-crates to avoid re-exporting viral features, and also enable functionality in response to availability in their dependencies, rather than from explicit features (bottom-up instead of top-down). I imagine that a "full rollout" of this paradigm would remove most viral features from Bevy's crates, leaving only `bevy_platform`, `bevy_internal`, and `bevy` (since `bevy`/`_internal` are explicitly re-exports of all of Bevy's crates). This bottom-up approach may be useful in other areas of Bevy's features too. For example, `bevy_core_pipeline/tonemapping_luts` requires: - bevy_render/ktx2 - bevy_image/ktx2 - bevy_image/zstd If `define_alias` was used in `bevy_image`, `bevy_render` would not need to re-export the `ktx2` feature, and `bevy_core_pipeline` could directly probe `bevy_image` for the status of `ktx2` and `zstd` features to determine if it should compile the `tonemapping_luts` functionality, rather than having an explicitly feature. Of course, an explicit feature is still important for _features_, so this may not be the best example, but it highlights that with this paradigm crates can reactively provide functionality, rather than needing to proactively declare feature combinations up-front and hope the user enables them. --------- Co-authored-by: BD103 <59022059+BD103@users.noreply.github.com>
181 lines
6.1 KiB
Rust
181 lines
6.1 KiB
Rust
//! Provides a fallback implementation of `Instant` from the standard library.
|
|
|
|
#![expect(
|
|
unsafe_code,
|
|
reason = "Instant fallback requires unsafe to allow users to update the internal value"
|
|
)]
|
|
|
|
use crate::sync::atomic::{AtomicPtr, Ordering};
|
|
|
|
use core::{
|
|
fmt,
|
|
ops::{Add, AddAssign, Sub, SubAssign},
|
|
time::Duration,
|
|
};
|
|
|
|
static ELAPSED_GETTER: AtomicPtr<()> = AtomicPtr::new(unset_getter as *mut _);
|
|
|
|
/// Fallback implementation of `Instant` suitable for a `no_std` environment.
|
|
///
|
|
/// If you are on any of the following target architectures, this is a drop-in replacement:
|
|
///
|
|
/// - `x86`
|
|
/// - `x86_64`
|
|
/// - `aarch64`
|
|
///
|
|
/// On any other architecture, you must call [`Instant::set_elapsed`], providing a method
|
|
/// which when called supplies a monotonically increasing count of elapsed nanoseconds relative
|
|
/// to some arbitrary point in time.
|
|
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
|
|
pub struct Instant(Duration);
|
|
|
|
impl Instant {
|
|
/// Returns an instant corresponding to "now".
|
|
#[must_use]
|
|
pub fn now() -> Instant {
|
|
let getter = ELAPSED_GETTER.load(Ordering::Acquire);
|
|
|
|
// SAFETY: Function pointer is always valid
|
|
let getter = unsafe { core::mem::transmute::<*mut (), fn() -> Duration>(getter) };
|
|
|
|
Self((getter)())
|
|
}
|
|
|
|
/// Provides a function returning the amount of time that has elapsed since execution began.
|
|
/// The getter provided to this method will be used by [`now`](Instant::now).
|
|
///
|
|
/// # Safety
|
|
///
|
|
/// - The function provided must accurately represent the elapsed time.
|
|
/// - The function must preserve all invariants of the [`Instant`] type.
|
|
/// - The pointer to the function must be valid whenever [`Instant::now`] is called.
|
|
pub unsafe fn set_elapsed(getter: fn() -> Duration) {
|
|
ELAPSED_GETTER.store(getter as *mut _, Ordering::Release);
|
|
}
|
|
|
|
/// Returns the amount of time elapsed from another instant to this one,
|
|
/// or zero duration if that instant is later than this one.
|
|
#[must_use]
|
|
pub fn duration_since(&self, earlier: Instant) -> Duration {
|
|
self.saturating_duration_since(earlier)
|
|
}
|
|
|
|
/// Returns the amount of time elapsed from another instant to this one,
|
|
/// or None if that instant is later than this one.
|
|
///
|
|
/// Due to monotonicity bugs, even under correct logical ordering of the passed `Instant`s,
|
|
/// this method can return `None`.
|
|
#[must_use]
|
|
pub fn checked_duration_since(&self, earlier: Instant) -> Option<Duration> {
|
|
self.0.checked_sub(earlier.0)
|
|
}
|
|
|
|
/// Returns the amount of time elapsed from another instant to this one,
|
|
/// or zero duration if that instant is later than this one.
|
|
#[must_use]
|
|
pub fn saturating_duration_since(&self, earlier: Instant) -> Duration {
|
|
self.0.saturating_sub(earlier.0)
|
|
}
|
|
|
|
/// Returns the amount of time elapsed since this instant.
|
|
#[must_use]
|
|
pub fn elapsed(&self) -> Duration {
|
|
Instant::now().saturating_duration_since(*self)
|
|
}
|
|
|
|
/// Returns `Some(t)` where `t` is the time `self + duration` if `t` can be represented as
|
|
/// `Instant` (which means it's inside the bounds of the underlying data structure), `None`
|
|
/// otherwise.
|
|
pub fn checked_add(&self, duration: Duration) -> Option<Instant> {
|
|
self.0.checked_add(duration).map(Instant)
|
|
}
|
|
|
|
/// Returns `Some(t)` where `t` is the time `self - duration` if `t` can be represented as
|
|
/// `Instant` (which means it's inside the bounds of the underlying data structure), `None`
|
|
/// otherwise.
|
|
pub fn checked_sub(&self, duration: Duration) -> Option<Instant> {
|
|
self.0.checked_sub(duration).map(Instant)
|
|
}
|
|
}
|
|
|
|
impl Add<Duration> for Instant {
|
|
type Output = Instant;
|
|
|
|
/// # Panics
|
|
///
|
|
/// This function may panic if the resulting point in time cannot be represented by the
|
|
/// underlying data structure. See [`Instant::checked_add`] for a version without panic.
|
|
fn add(self, other: Duration) -> Instant {
|
|
self.checked_add(other)
|
|
.expect("overflow when adding duration to instant")
|
|
}
|
|
}
|
|
|
|
impl AddAssign<Duration> for Instant {
|
|
fn add_assign(&mut self, other: Duration) {
|
|
*self = *self + other;
|
|
}
|
|
}
|
|
|
|
impl Sub<Duration> for Instant {
|
|
type Output = Instant;
|
|
|
|
fn sub(self, other: Duration) -> Instant {
|
|
self.checked_sub(other)
|
|
.expect("overflow when subtracting duration from instant")
|
|
}
|
|
}
|
|
|
|
impl SubAssign<Duration> for Instant {
|
|
fn sub_assign(&mut self, other: Duration) {
|
|
*self = *self - other;
|
|
}
|
|
}
|
|
|
|
impl Sub<Instant> for Instant {
|
|
type Output = Duration;
|
|
|
|
/// Returns the amount of time elapsed from another instant to this one,
|
|
/// or zero duration if that instant is later than this one.
|
|
fn sub(self, other: Instant) -> Duration {
|
|
self.duration_since(other)
|
|
}
|
|
}
|
|
|
|
impl fmt::Debug for Instant {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
self.0.fmt(f)
|
|
}
|
|
}
|
|
|
|
fn unset_getter() -> Duration {
|
|
crate::cfg::switch! {
|
|
#[cfg(target_arch = "x86")] => {
|
|
// SAFETY: standard technique for getting a nanosecond counter on x86
|
|
let nanos = unsafe {
|
|
core::arch::x86::_rdtsc()
|
|
};
|
|
return Duration::from_nanos(nanos);
|
|
}
|
|
#[cfg(target_arch = "x86_64")] => {
|
|
// SAFETY: standard technique for getting a nanosecond counter on x86_64
|
|
let nanos = unsafe {
|
|
core::arch::x86_64::_rdtsc()
|
|
};
|
|
return Duration::from_nanos(nanos);
|
|
}
|
|
#[cfg(target_arch = "aarch64")] => {
|
|
// SAFETY: standard technique for getting a nanosecond counter of aarch64
|
|
let nanos = unsafe {
|
|
let mut ticks: u64;
|
|
core::arch::asm!("mrs {}, cntvct_el0", out(reg) ticks);
|
|
ticks
|
|
};
|
|
return Duration::from_nanos(nanos);
|
|
}
|
|
_ => {
|
|
panic!("An elapsed time getter has not been provided to `Instant`. Please use `Instant::set_elapsed(...)` before calling `Instant::now()`")
|
|
}
|
|
}
|
|
}
|