From f9d05fdad0b771ef147456b3f6853c5e84f09cfa Mon Sep 17 00:00:00 2001 From: Per Lindgren Date: Mon, 18 Oct 2021 17:39:51 +0200 Subject: [PATCH] api test, all implemented, TODO hide priority? --- examples/destructure.rs | 6 ++-- macros/src/codegen/hardware_tasks.rs | 2 ++ macros/src/codegen/idle.rs | 9 +++-- macros/src/codegen/shared_resources.rs | 29 --------------- macros/src/codegen/shared_resources_struct.rs | 36 +++++++++++++++++-- macros/src/codegen/software_tasks.rs | 2 ++ src/export.rs | 3 ++ 7 files changed, 51 insertions(+), 36 deletions(-) diff --git a/examples/destructure.rs b/examples/destructure.rs index 6019c225cc..13e0891317 100644 --- a/examples/destructure.rs +++ b/examples/destructure.rs @@ -46,10 +46,12 @@ mod app { } // De-structure-ing syntax + + // TODO: hide priority field (or re-use priority from first resource) #[task(shared = [&a, &b, &c])] fn bar(cx: bar::Context) { - let bar::SharedResources { a, b, c } = cx.shared; + let bar::SharedResources { a, b, c, priority } = cx.shared; - hprintln!("bar: a = {}, b = {}, c = {}", a, b, c).unwrap(); + hprintln!("bar: a = {}, b = {}, c = {}, p = {:?}", a, b, c, priority).unwrap(); } } diff --git a/macros/src/codegen/hardware_tasks.rs b/macros/src/codegen/hardware_tasks.rs index e6192e2c00..8532176e50 100644 --- a/macros/src/codegen/hardware_tasks.rs +++ b/macros/src/codegen/hardware_tasks.rs @@ -72,6 +72,8 @@ pub fn codegen( Context::HardwareTask(name), &mut shared_needs_lt, app, + analysis, + extra, ); root.push(item); diff --git a/macros/src/codegen/idle.rs b/macros/src/codegen/idle.rs index 0dededa4e6..772884e811 100644 --- a/macros/src/codegen/idle.rs +++ b/macros/src/codegen/idle.rs @@ -35,8 +35,13 @@ pub fn codegen( let name = &idle.name; if !idle.args.shared_resources.is_empty() { - let (item, constructor) = - shared_resources_struct::codegen(Context::Idle, &mut shared_needs_lt, app); + let (item, constructor) = shared_resources_struct::codegen( + Context::Idle, + &mut shared_needs_lt, + app, + analysis, + extra, + ); root_idle.push(item); mod_app.push(constructor); diff --git a/macros/src/codegen/shared_resources.rs b/macros/src/codegen/shared_resources.rs index 8c0a542a8a..a115b7c20a 100644 --- a/macros/src/codegen/shared_resources.rs +++ b/macros/src/codegen/shared_resources.rs @@ -106,34 +106,5 @@ pub fn codegen( }) }; - let manual = "Manual Codegen".to_string(); - - let to_gen = quote! { - - #[doc = #manual] - impl<'a> rtic::Mutex for __rtic_internal_fooSharedResources<'a> { - type T = __rtic_internal_fooShared; - #[inline(always)] - fn lock( - &mut self, - f: impl FnOnce(&mut __rtic_internal_fooShared) -> RTIC_INTERNAL_R, - ) -> RTIC_INTERNAL_R { - /// Priority ceiling - const CEILING: u8 = 1u8; - unsafe { - rtic::export::lock( - &mut __rtic_internal_fooShared::new(), - self.priority(), - CEILING, - lm3s6965::NVIC_PRIO_BITS, - f, - ) - } - } - } - }; - - mod_app.push(to_gen); - (mod_app, mod_resources) } diff --git a/macros/src/codegen/shared_resources_struct.rs b/macros/src/codegen/shared_resources_struct.rs index 497a8455ea..942518b92b 100644 --- a/macros/src/codegen/shared_resources_struct.rs +++ b/macros/src/codegen/shared_resources_struct.rs @@ -1,11 +1,17 @@ use proc_macro2::TokenStream as TokenStream2; use quote::quote; -use rtic_syntax::{ast::App, Context}; +use rtic_syntax::{analyze::Ownership, ast::App, Context}; -use crate::codegen::util; +use crate::{analyze::Analysis, check::Extra, codegen::util}; /// Generate shared resources structs -pub fn codegen(ctxt: Context, needs_lt: &mut bool, app: &App) -> (TokenStream2, TokenStream2) { +pub fn codegen( + ctxt: Context, + needs_lt: &mut bool, + app: &App, + analysis: &Analysis, + extra: &Extra, +) -> (TokenStream2, TokenStream2) { let mut lt = None; let resources = match ctxt { @@ -22,6 +28,7 @@ pub fn codegen(ctxt: Context, needs_lt: &mut bool, app: &App) -> (TokenStream2, // Lock-all api related let mut fields_mut = vec![]; let mut values_mut = vec![]; + let mut max_ceiling = 0; for (name, access) in resources { let res = app.shared_resources.get(name).expect("UNREACHABLE"); @@ -75,6 +82,15 @@ pub fn codegen(ctxt: Context, needs_lt: &mut bool, app: &App) -> (TokenStream2, )); + let ceiling = match analysis.ownerships.get(name) { + Some(Ownership::Owned { priority }) => *priority, + Some(Ownership::CoOwned { priority }) => *priority, + Some(Ownership::Contended { ceiling }) => *ceiling, + None => 0, + }; + + max_ceiling = std::cmp::max(ceiling, max_ceiling); + // continue as the value has been filled, continue; } @@ -151,6 +167,18 @@ pub fn codegen(ctxt: Context, needs_lt: &mut bool, app: &App) -> (TokenStream2, } else { Some(quote!(priority: &#lt rtic::export::Priority)) }; + + // Generate code for the lock-all API + let lock_all = util::impl_mutex( + extra, + &vec![], // TODO: what cfg should go here? + false, // resource proxy at top level (not in shared_resources) + &ident, + quote!(#ident_mut), + max_ceiling, + quote!(&mut #ident_mut::new()), + ); + let implementations = quote!( impl<#lt> #ident<#lt> { #[inline(always)] @@ -176,6 +204,8 @@ pub fn codegen(ctxt: Context, needs_lt: &mut bool, app: &App) -> (TokenStream2, } } } + + #lock_all ); (item, implementations) diff --git a/macros/src/codegen/software_tasks.rs b/macros/src/codegen/software_tasks.rs index 2008b6c98a..753394d3bd 100644 --- a/macros/src/codegen/software_tasks.rs +++ b/macros/src/codegen/software_tasks.rs @@ -112,6 +112,8 @@ pub fn codegen( Context::SoftwareTask(name), &mut shared_needs_lt, app, + analysis, + extra, ); root.push(item); diff --git a/src/export.rs b/src/export.rs index a124c78b3c..ea3b4718a3 100644 --- a/src/export.rs +++ b/src/export.rs @@ -70,6 +70,9 @@ impl Barrier { } // Newtype over `Cell` that forbids mutation through a shared reference +// Debug is convenient for debugging the RTIC framework +// but Priority should not be user-facing +#[derive(Debug)] pub struct Priority { inner: Cell, }