mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2025-12-18 22:05:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

Now all locks are symmetric

Browse source 
Test fixes

Fix test

Fix comment
This commit is contained in:
Emil Fresk 2020-10-22 21:36:32 +02:00
parent b3aa9e99a9
commit e8eca4be37
22 changed files with 183 additions and 223 deletions
Download patch file Download diff file Expand all files Collapse all files

9
macros/src/codegen/hardware_tasks.rs
View file

@ -70,13 +70,8 @@ pub fn codegen(
// `${task}Resources`
if !task.args.resources.is_empty() {
let (item, constructor) = resources_struct::codegen(
Context::HardwareTask(name),
priority,
&mut needs_lt,
app,
analysis,
);
let (item, constructor) =
resources_struct::codegen(Context::HardwareTask(name), &mut needs_lt, app);
root.push(item);

3
macros/src/codegen/idle.rs
View file

@ -37,8 +37,7 @@ pub fn codegen(
let name = &idle.name;
if !idle.args.resources.is_empty() {
let (item, constructor) =
resources_struct::codegen(Context::Idle, 0, &mut needs_lt, app, analysis);
let (item, constructor) = resources_struct::codegen(Context::Idle, &mut needs_lt, app);
root_idle.push(item);
mod_app = Some(constructor);

3
macros/src/codegen/init.rs
View file

@ -82,8 +82,7 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> CodegenResult {
let mut mod_app = None;
if !init.args.resources.is_empty() {
let (item, constructor) =
resources_struct::codegen(Context::Init, 0, &mut needs_lt, app, analysis);
let (item, constructor) = resources_struct::codegen(Context::Init, &mut needs_lt, app);
root_init.push(item);
mod_app = Some(constructor);

12
macros/src/codegen/resources.rs
View file

@ -49,7 +49,8 @@ pub fn codegen(
));
}
if let Some(Ownership::Contended { ceiling }) = analysis.ownerships.get(name) {
let r_prop = &res.properties;
if !r_prop.task_local && !r_prop.lock_free {
mod_resources.push(quote!(
#[allow(non_camel_case_types)]
#(#cfgs)*
@ -83,13 +84,20 @@ pub fn codegen(
)
};
let ceiling = match analysis.ownerships.get(name) {
Some(Ownership::Owned { priority }) => *priority,
Some(Ownership::CoOwned { priority }) => *priority,
Some(Ownership::Contended { ceiling }) => *ceiling,
None => 0,
};
mod_app.push(util::impl_mutex(
extra,
cfgs,
true,
name,
quote!(#ty),
*ceiling,
ceiling,
ptr,
));
}

132
macros/src/codegen/resources_struct.rs
View file

@ -2,15 +2,9 @@ use proc_macro2::TokenStream as TokenStream2;
use quote::quote;
use rtic_syntax::{ast::App, Context};
use crate::{analyze::Analysis, codegen::util};
use crate::codegen::util;
pub fn codegen(
ctxt: Context,
priority: u8,
needs_lt: &mut bool,
app: &App,
analysis: &Analysis,
) -> (TokenStream2, TokenStream2) {
pub fn codegen(ctxt: Context, needs_lt: &mut bool, app: &App) -> (TokenStream2, TokenStream2) {
let mut lt = None;
let resources = match ctxt {
@ -30,6 +24,7 @@ pub fn codegen(
let cfgs = &res.cfgs;
has_cfgs |= !cfgs.is_empty();
// access hold if the resource is [x] (exclusive) or [&x] (shared)
let mut_ = if access.is_exclusive() {
Some(quote!(mut))
} else {
@ -38,99 +33,66 @@ pub fn codegen(
let ty = &res.ty;
let mangled_name = util::mangle_ident(&name);
if ctxt.is_init() {
if !analysis.ownerships.contains_key(name) {
// Owned by `init`
fields.push(quote!(
#(#cfgs)*
pub #name: &'static #mut_ #ty
));
// let ownership = &analysis.ownerships[name];
let r_prop = &res.properties;
values.push(quote!(
#(#cfgs)*
#name: &#mut_ #mangled_name
));
} else {
// Owned by someone else
if !r_prop.task_local && !r_prop.lock_free {
if access.is_shared() {
lt = Some(quote!('a));
fields.push(quote!(
#(#cfgs)*
pub #name: &'a mut #ty
pub #name: &'a #ty
));
} else {
// Resource proxy
lt = Some(quote!('a));
fields.push(quote!(
#(#cfgs)*
pub #name: resources::#name<'a>
));
values.push(quote!(
#(#cfgs)*
#name: &mut #mangled_name
#name: resources::#name::new(priority)
));
// continue as the value has been filled,
continue;
}
} else {
let ownership = &analysis.ownerships[name];
if ownership.needs_lock(priority) {
if mut_.is_none() {
lt = Some(quote!('a));
fields.push(quote!(
#(#cfgs)*
pub #name: &'a #ty
));
} else {
// Resource proxy
lt = Some(quote!('a));
fields.push(quote!(
#(#cfgs)*
pub #name: resources::#name<'a>
));
values.push(quote!(
#(#cfgs)*
#name: resources::#name::new(priority)
));
continue;
}
let lt = if ctxt.runs_once() {
quote!('static)
} else {
let lt = if ctxt.runs_once() {
quote!('static)
} else {
lt = Some(quote!('a));
quote!('a)
};
lt = Some(quote!('a));
quote!('a)
};
if ownership.is_owned() || mut_.is_none() {
fields.push(quote!(
#(#cfgs)*
pub #name: &#lt #mut_ #ty
));
} else {
fields.push(quote!(
#(#cfgs)*
pub #name: &#lt mut #ty
));
}
}
fields.push(quote!(
#(#cfgs)*
pub #name: &#lt #mut_ #ty
));
}
let is_late = expr.is_none();
if is_late {
let expr = if mut_.is_some() {
quote!(&mut *#mangled_name.as_mut_ptr())
} else {
quote!(&*#mangled_name.as_ptr())
};
values.push(quote!(
#(#cfgs)*
#name: #expr
));
let is_late = expr.is_none();
if is_late {
let expr = if access.is_exclusive() {
quote!(&mut *#mangled_name.as_mut_ptr())
} else {
values.push(quote!(
#(#cfgs)*
#name: &#mut_ #mangled_name
));
}
quote!(&*#mangled_name.as_ptr())
};
values.push(quote!(
#(#cfgs)*
#name: #expr
));
} else {
values.push(quote!(
#(#cfgs)*
#name: &#mut_ #mangled_name
));
}
}

9
macros/src/codegen/software_tasks.rs
View file

@ -82,13 +82,8 @@ pub fn codegen(
// `${task}Resources`
let mut needs_lt = false;
if !task.args.resources.is_empty() {
let (item, constructor) = resources_struct::codegen(
Context::SoftwareTask(name),
task.args.priority,
&mut needs_lt,
app,
analysis,
);
let (item, constructor) =
resources_struct::codegen(Context::SoftwareTask(name), &mut needs_lt, app);
root.push(item);