Skip to content

refactor(kernel/core_local): swap out StaticExecutor with StaticLocalExecutor #2187

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

Merged
mkroening merged 1 commit into from
Jan 21, 2026
Merged

refactor(kernel/core_local): swap out StaticExecutor with StaticLocalExecutor #2187

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
8 changes: 4 additions & 4 deletions src/arch/aarch64/kernel/core_local.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use core::ptr;
use core::sync::atomic::Ordering;

use aarch64_cpu::registers::{Readable, TPIDR_EL1, Writeable};
use async_executor::StaticExecutor;
use async_executor::StaticLocalExecutor;
#[cfg(feature = "smp")]
use hermit_sync::InterruptTicketMutex;
use hermit_sync::{RawRwSpinLock, RawSpinMutex};
Expand All @@ -24,7 +24,7 @@ pub(crate) struct CoreLocal {
/// Interface to the interrupt counters
irq_statistics: &'static IrqStatistics,
/// The core-local async executor.
ex: StaticExecutor<RawSpinMutex, RawRwSpinLock>,
ex: StaticLocalExecutor<RawSpinMutex, RawRwSpinLock>,
/// Queues to handle incoming requests from the other cores
#[cfg(feature = "smp")]
pub scheduler_input: InterruptTicketMutex<SchedulerInput>,
Expand All @@ -46,7 +46,7 @@ impl CoreLocal {
core_id,
scheduler: Cell::new(ptr::null_mut()),
irq_statistics,
ex: StaticExecutor::new(),
ex: StaticLocalExecutor::new(),
#[cfg(feature = "smp")]
scheduler_input: InterruptTicketMutex::new(SchedulerInput::new()),
};
Expand Down Expand Up @@ -93,7 +93,7 @@ pub(crate) fn core_scheduler() -> &'static mut PerCoreScheduler {
unsafe { CoreLocal::get().scheduler.get().as_mut().unwrap() }
}

pub(crate) fn ex() -> &'static StaticExecutor<RawSpinMutex, RawRwSpinLock> {
pub(crate) fn ex() -> &'static StaticLocalExecutor<RawSpinMutex, RawRwSpinLock> {
&CoreLocal::get().ex
}

Expand Down
8 changes: 4 additions & 4 deletions src/arch/riscv64/kernel/core_local.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use core::cell::Cell;
use core::ptr;
use core::sync::atomic::Ordering;

use async_executor::StaticExecutor;
use async_executor::StaticLocalExecutor;
#[cfg(feature = "smp")]
use hermit_sync::InterruptTicketMutex;
use hermit_sync::{RawRwSpinLock, RawSpinMutex};
Expand All @@ -22,7 +22,7 @@ pub struct CoreLocal {
/// start address of the kernel stack
pub kernel_stack: Cell<u64>,
/// The core-local async executor.
ex: StaticExecutor<RawSpinMutex, RawRwSpinLock>,
ex: StaticLocalExecutor<RawSpinMutex, RawRwSpinLock>,
/// Queues to handle incoming requests from the other cores
#[cfg(feature = "smp")]
pub scheduler_input: InterruptTicketMutex<SchedulerInput>,
Expand All @@ -41,7 +41,7 @@ impl CoreLocal {
core_id,
scheduler: Cell::new(ptr::null_mut()),
kernel_stack: Cell::new(0),
ex: StaticExecutor::new(),
ex: StaticLocalExecutor::new(),
#[cfg(feature = "smp")]
scheduler_input: InterruptTicketMutex::new(SchedulerInput::new()),
};
Expand Down Expand Up @@ -84,6 +84,6 @@ pub fn set_core_scheduler(scheduler: *mut PerCoreScheduler) {
CoreLocal::get().scheduler.set(scheduler);
}

pub(crate) fn ex() -> &'static StaticExecutor<RawSpinMutex, RawRwSpinLock> {
pub(crate) fn ex() -> &'static StaticLocalExecutor<RawSpinMutex, RawRwSpinLock> {
&CoreLocal::get().ex
}
8 changes: 4 additions & 4 deletions src/arch/x86_64/kernel/core_local.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use core::sync::atomic::AtomicBool;
use core::sync::atomic::Ordering;
use core::{mem, ptr};

use async_executor::StaticExecutor;
use async_executor::StaticLocalExecutor;
#[cfg(feature = "smp")]
use hermit_sync::InterruptTicketMutex;
use hermit_sync::{RawRwSpinLock, RawSpinMutex};
Expand All @@ -33,7 +33,7 @@ pub(crate) struct CoreLocal {
/// Interface to the interrupt counters
irq_statistics: &'static IrqStatistics,
/// The core-local async executor.
ex: StaticExecutor<RawSpinMutex, RawRwSpinLock>,
ex: StaticLocalExecutor<RawSpinMutex, RawRwSpinLock>,
#[cfg(feature = "smp")]
pub hlt: AtomicBool,
/// Queues to handle incoming requests from the other cores
Expand Down Expand Up @@ -61,7 +61,7 @@ impl CoreLocal {
tss: Cell::new(ptr::null_mut()),
kernel_stack: Cell::new(ptr::null_mut()),
irq_statistics,
ex: StaticExecutor::new(),
ex: StaticLocalExecutor::new(),
#[cfg(feature = "smp")]
hlt: AtomicBool::new(false),
#[cfg(feature = "smp")]
Expand Down Expand Up @@ -110,7 +110,7 @@ pub(crate) fn core_scheduler() -> &'static mut PerCoreScheduler {
unsafe { CoreLocal::get().scheduler.get().as_mut().unwrap() }
}

pub(crate) fn ex() -> &'static StaticExecutor<RawSpinMutex, RawRwSpinLock> {
pub(crate) fn ex() -> &'static StaticLocalExecutor<RawSpinMutex, RawRwSpinLock> {
&CoreLocal::get().ex
}

Expand Down