Skip to content

Use portable-atomic in cs.rs for ESP32 compatibility #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
okhsunrog wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use portable-atomic in cs.rs for ESP32 compatibility #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion bbqueue/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ version = "1.0"
default-features = false
optional = true

[dependencies.portable-atomic]
version = "1.0"
default-features = false
optional = true

[dev-dependencies.tokio]
version = "1.0"
features = ["macros", "rt", "time"]
Expand All @@ -45,7 +50,7 @@ default = [
]
critical-section = [
"dep:critical-section",
"maitake-sync?/critical-section",
"dep:portable-atomic",
]
disable-cache-padding = [
"maitake-sync?/no-cache-pad",
Expand Down
2 changes: 1 addition & 1 deletion bbqueue/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,9 @@ pub mod prod_cons;
/// Queue storage
///
mod queue;
pub use queue::BBQueue;
#[cfg(feature = "alloc")]
pub use queue::ArcBBQueue;
pub use queue::BBQueue;

/// Generic traits
///
Expand Down
7 changes: 3 additions & 4 deletions bbqueue/src/traits/coordination/cs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
use const_init::ConstInit;

use super::{Coord, ReadGrantError, WriteGrantError};
use core::{
cmp::min,
sync::atomic::{AtomicBool, AtomicUsize, Ordering},
};
use core::cmp::min;
use core::sync::atomic::Ordering;
use portable_atomic::{AtomicBool, AtomicUsize};

/// Coordination that uses a critical section to perform coordination operations
///
Expand Down