samples: bench: cargo fmt

Update formatting from `cargo fmt`.

Signed-off-by: David Brown <[email protected]>

Author: d3zd3z

samples/bench/src/executor.rs

@@ -8,14 +8,12 @@ use core::{ffi::c_int, sync::atomic::Ordering};
 use alloc::format;
 use embassy_executor::SendSpawner;
 use embassy_futures::yield_now;
+#[allow(unused_imports)]
+use embassy_sync::semaphore::{FairSemaphore, GreedySemaphore};
 use embassy_sync::{
-    blocking_mutex::raw::CriticalSectionRawMutex,
-    channel::Channel,
-    semaphore::Semaphore,
+    blocking_mutex::raw::CriticalSectionRawMutex, channel::Channel, semaphore::Semaphore,
     signal::Signal,
 };
-#[allow(unused_imports)]
-use embassy_sync::semaphore::{GreedySemaphore, FairSemaphore};
 use static_cell::StaticCell;
 use zephyr::{embassy::Executor, sync::atomic::AtomicBool};
 
@@ -24,7 +22,7 @@ use crate::{BenchTimer, Command, TestResult, NUM_THREADS, THREAD_STACK_SIZE};
 /// As the tests do exercise different executors at different priorities, use the critical section
 /// variant.
 // type ASemaphore = GreedySemaphore<CriticalSectionRawMutex>;
-type ASemaphore = FairSemaphore<CriticalSectionRawMutex, {NUM_THREADS + 2}>;
+type ASemaphore = FairSemaphore<CriticalSectionRawMutex, { NUM_THREADS + 2 }>;
 
 /// A Signal for reporting back spawners.
 type SpawnerSignal = Signal<CriticalSectionRawMutex, SendSpawner>;
@@ -281,7 +279,6 @@ async fn main_run(this: &'static AsyncTests) {
             } else {
                 this.spawners[0].spawn(low_worker(this, command)).unwrap();
             }
-
         } else {
             this.spawners[1].spawn(high_worker(this, command)).unwrap();
             this.spawners[1].spawn(low_worker(this, command)).unwrap();
@@ -349,5 +346,4 @@ fn executor_thread(exec: &'static StaticCell<Executor>, spawner_sig: &'static Sp
 
 // For debugging
 #[unsafe(no_mangle)]
-extern "C" fn invalid_spinlock(_l: *mut zephyr::raw::k_spinlock, _thread: u32, _id: u32) {
-}
+extern "C" fn invalid_spinlock(_l: *mut zephyr::raw::k_spinlock, _thread: u32, _id: u32) {}

samples/bench/src/lib.rs

@@ -16,10 +16,11 @@ use alloc::collections::vec_deque::VecDeque;
 use alloc::vec;
 use executor::AsyncTests;
 use static_cell::StaticCell;
+use zephyr::define_work_queue;
 use zephyr::raw::k_yield;
 use zephyr::sync::{PinWeak, SpinMutex};
 use zephyr::time::NoWait;
-use zephyr::work::{SimpleAction, Work, WorkQueueDecl};
+use zephyr::work::{SimpleAction, Work};
 use zephyr::{
     kconfig::CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC,
     printkln,
@@ -40,7 +41,7 @@ const NUM_THREADS: usize = 6;
 
 /// Stack size to use for the threads.
 #[cfg(target_pointer_width = "32")]
-const THREAD_STACK_SIZE: usize = 4*1024;
+const THREAD_STACK_SIZE: usize = 4 * 1024;
 
 /// Stack size to use for the threads.
 #[cfg(target_pointer_width = "64")]
@@ -803,21 +804,7 @@ impl<'a> BenchTimer<'a> {
     }
 }
 
-/// Static declaration of work queue.  This is a working template for how this will be generated
-/// through the macro.
-static WORKQ: WorkQueueDecl<WORK_STACK_SIZE> = WorkQueueDecl::new(
-    &WORKQ_STACK,
-    zephyr::raw::k_work_queue_config {
-        name: c"WORKQ".as_ptr(),
-        no_yield: true,
-        essential: false,
-    },
-    5,
-);
-
-#[unsafe(link_section = ".noinit.WORKQ_STACK")]
-static WORKQ_STACK: zephyr::thread::ThreadStack<WORK_STACK_SIZE> =
-    zephyr::thread::ThreadStack::new();
+define_work_queue!(WORKQ, WORK_STACK_SIZE, priority = 5, no_yield = true);
 
 static SEMS: [Semaphore; NUM_THREADS] = [const { Semaphore::new(0, u32::MAX) }; NUM_THREADS];
 static BACK_SEMS: [Semaphore; NUM_THREADS] = [const { Semaphore::new(0, u32::MAX) }; NUM_THREADS];