LailaTheElf/embassy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4244 from janderholm/master

Browse Source 
executor: Make state implementations and their conditions match
This commit is contained in:
Dario Nieuwenhuis 2025-06-01 12:16:50 +00:00 committed by GitHub
commit ad5a14fe85
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
embassy-executor/src/raw/mod.rs
View File

@ -11,7 +11,7 @@
#[cfg_attr(not(target_has_atomic = "ptr"), path = "run_queue_critical_section.rs")] #[cfg_attr(not(target_has_atomic = "ptr"), path = "run_queue_critical_section.rs")]
mod run_queue; mod run_queue;
#[cfg_attr(all(cortex_m, target_has_atomic = "8"), path = "state_atomics_arm.rs")] #[cfg_attr(all(cortex_m, target_has_atomic = "32"), path = "state_atomics_arm.rs")]
#[cfg_attr(all(not(cortex_m), target_has_atomic = "8"), path = "state_atomics.rs")] #[cfg_attr(all(not(cortex_m), target_has_atomic = "8"), path = "state_atomics.rs")]
#[cfg_attr(not(target_has_atomic = "8"), path = "state_critical_section.rs")] #[cfg_attr(not(target_has_atomic = "8"), path = "state_critical_section.rs")]
mod state; mod state;

10
embassy-executor/src/raw/state_atomics.rs
View File

@ -1,4 +1,4 @@
use core::sync::atomic::{AtomicU32, Ordering}; use core::sync::atomic::{AtomicU8, Ordering};
#[derive(Clone, Copy)] #[derive(Clone, Copy)]
pub(crate) struct Token(()); pub(crate) struct Token(());
@ -11,18 +11,18 @@ pub(crate) fn locked<R>(f: impl FnOnce(Token) -> R) -> R {
} }
/// Task is spawned (has a future) /// Task is spawned (has a future)
pub(crate) const STATE_SPAWNED: u32 = 1 << 0; pub(crate) const STATE_SPAWNED: u8 = 1 << 0;
/// Task is in the executor run queue /// Task is in the executor run queue
pub(crate) const STATE_RUN_QUEUED: u32 = 1 << 1; pub(crate) const STATE_RUN_QUEUED: u8 = 1 << 1;
pub(crate) struct State { pub(crate) struct State {
state: AtomicU32, state: AtomicU8,
} }
impl State { impl State {
pub const fn new() -> State { pub const fn new() -> State {
Self { Self {
state: AtomicU32::new(0), state: AtomicU8::new(0),
} }
} }

10
embassy-executor/src/raw/state_critical_section.rs
View File

@ -4,12 +4,12 @@ pub(crate) use critical_section::{with as locked, CriticalSection as Token};
use critical_section::{CriticalSection, Mutex}; use critical_section::{CriticalSection, Mutex};
/// Task is spawned (has a future) /// Task is spawned (has a future)
pub(crate) const STATE_SPAWNED: u32 = 1 << 0; pub(crate) const STATE_SPAWNED: u8 = 1 << 0;
/// Task is in the executor run queue /// Task is in the executor run queue
pub(crate) const STATE_RUN_QUEUED: u32 = 1 << 1; pub(crate) const STATE_RUN_QUEUED: u8 = 1 << 1;
pub(crate) struct State { pub(crate) struct State {
state: Mutex<Cell<u32>>, state: Mutex<Cell<u8>>,
} }
impl State { impl State {
@ -19,11 +19,11 @@ impl State {
} }
} }
fn update<R>(&self, f: impl FnOnce(&mut u32) -> R) -> R { fn update<R>(&self, f: impl FnOnce(&mut u8) -> R) -> R {
critical_section::with(|cs| self.update_with_cs(cs, f)) critical_section::with(|cs| self.update_with_cs(cs, f))
} }
fn update_with_cs<R>(&self, cs: CriticalSection<'_>, f: impl FnOnce(&mut u32) -> R) -> R { fn update_with_cs<R>(&self, cs: CriticalSection<'_>, f: impl FnOnce(&mut u8) -> R) -> R {
let s = self.state.borrow(cs); let s = self.state.borrow(cs);
let mut val = s.get(); let mut val = s.get();
let r = f(&mut val); let r = f(&mut val);