Merge #371

371: task_local and lock_free r=korken89 a=AfoHT

Getting this going to test with GHA

For further discussion see https://github.com/rtic-rs/rfcs/issues/30

Co-authored-by: Per <Per Lindgren>
Co-authored-by: Henrik Tjäder <henrik@tjaders.com>

4 files changed, 246 insertions, 0 deletions

diff --git a/ui/single/local-cfg-task-local-err.rs b/ui/single/local-cfg-task-local-err.rs
new file mode 100644
index 00000000..412f6142
--- /dev/null
+++ b/ui/single/local-cfg-task-local-err.rs
@@ -0,0 +1,66 @@
+//! examples/local-cfg-task-local.rs
+
+#![deny(unsafe_code)]
+//#![deny(warnings)]
+#![no_main]
+#![no_std]
+
+use cortex_m_semihosting::debug;
+use cortex_m_semihosting::hprintln;
+use lm3s6965::Interrupt;
+use panic_semihosting as _;
+
+#[rtic::app(device = lm3s6965)]
+mod app {
+    #[resources]
+    struct Resources {
+        // A local (move), early resource
+        #[cfg(feature = "feature_l1")]
+        #[task_local]
+        #[init(1)]
+        l1: u32,
+
+        // A local (move), late resource
+        #[task_local]
+        l2: u32,
+    }
+
+    #[init]
+    fn init(_: init::Context) -> init::LateResources {
+        rtic::pend(Interrupt::UART0);
+        rtic::pend(Interrupt::UART1);
+        init::LateResources {
+            #[cfg(feature = "feature_l2")]
+            l2: 2,
+            #[cfg(not(feature = "feature_l2"))]
+            l2: 5,
+        }
+    }
+
+    // l1 ok (task_local)
+    #[idle(resources =[#[cfg(feature = "feature_l1")]l1])]
+    fn idle(_cx: idle::Context) -> ! {
+        #[cfg(feature = "feature_l1")]
+        hprintln!("IDLE:l1 = {}", _cx.resources.l1).unwrap();
+        debug::exit(debug::EXIT_SUCCESS);
+        loop {}
+    }
+
+    // l2 ok (task_local)
+    #[task(priority = 1, binds = UART0, resources = [
+        #[cfg(feature = "feature_l2")]l2,
+    ])]
+    fn uart0(_cx: uart0::Context) {
+        #[cfg(feature = "feature_l2")]
+        hprintln!("UART0:l2 = {}", _cx.resources.l2).unwrap();
+    }
+
+    // l2 error, conflicting with uart0 for l2 (task_local)
+    #[task(priority = 1, binds = UART1, resources = [
+        #[cfg(not(feature = "feature_l2"))]l2
+    ])]
+    fn uart1(_cx: uart1::Context) {
+        #[cfg(not(feature = "feature_l2"))]
+        hprintln!("UART0:l2 = {}", _cx.resources.l2).unwrap();
+    }
+}
diff --git a/ui/single/local-cfg-task-local-err.stderr b/ui/single/local-cfg-task-local-err.stderr
new file mode 100644
index 00000000..9a84ead4
--- /dev/null
+++ b/ui/single/local-cfg-task-local-err.stderr
@@ -0,0 +1,37 @@
+error: task local resource "l2" is used by multiple tasks
+  --> $DIR/local-cfg-task-local-err.rs:25:9
+   |
+25 |         l2: u32,
+   |         ^^
+
+error: task local resource "l2" is used by task "uart0" with priority 1
+  --> $DIR/local-cfg-task-local-err.rs:51:39
+   |
+51 |         #[cfg(feature = "feature_l2")]l2,
+   |                                       ^^
+
+error: task local resource "l2" is used by task "uart1" with priority 1
+  --> $DIR/local-cfg-task-local-err.rs:60:44
+   |
+60 |         #[cfg(not(feature = "feature_l2"))]l2
+   |                                            ^^
+
+warning: unused import: `cortex_m_semihosting::debug`
+ --> $DIR/local-cfg-task-local-err.rs:8:5
+  |
+8 | use cortex_m_semihosting::debug;
+  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  |
+  = note: `#[warn(unused_imports)]` on by default
+
+warning: unused import: `cortex_m_semihosting::hprintln`
+ --> $DIR/local-cfg-task-local-err.rs:9:5
+  |
+9 | use cortex_m_semihosting::hprintln;
+  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+warning: unused import: `lm3s6965::Interrupt`
+  --> $DIR/local-cfg-task-local-err.rs:10:5
+   |
+10 | use lm3s6965::Interrupt;
+   |     ^^^^^^^^^^^^^^^^^^^
diff --git a/ui/single/local-err.rs b/ui/single/local-err.rs
new file mode 100644
index 00000000..0fe98a4b
--- /dev/null
+++ b/ui/single/local-err.rs
@@ -0,0 +1,83 @@
+//! examples/local_err.rs
+
+#![deny(unsafe_code)]
+#![deny(warnings)]
+#![no_main]
+#![no_std]
+
+// errors here, since we cannot bail compilation or generate stubs
+// run cargo expand, then you see the root of the problem...
+use cortex_m_semihosting::{debug, hprintln};
+use lm3s6965::Interrupt;
+use panic_semihosting as _;
+
+#[rtic::app(device = lm3s6965)]
+mod app {
+    #[resources]
+    struct Resources {
+        // An early resource
+        #[init(0)]
+        shared: u32,
+
+        // A local (move), early resource
+        #[task_local]
+        #[init(1)]
+        l1: u32,
+
+        // An exclusive, early resource
+        #[lock_free]
+        #[init(1)]
+        e1: u32,
+
+        // A local (move), late resource
+        #[task_local]
+        l2: u32,
+
+        // An exclusive, late resource
+        #[lock_free]
+        e2: u32,
+    }
+
+    #[init]
+    fn init(_: init::Context) -> init::LateResources {
+        rtic::pend(Interrupt::UART0);
+        rtic::pend(Interrupt::UART1);
+        init::LateResources { e2: 2, l2: 2 }
+    }
+
+    // `shared` cannot be accessed from this context
+    // l1 ok
+    // l2 rejeceted (not task_local)
+    // e2 ok
+    #[idle(resources =[l1, l2, e2])]
+    fn idle(cx: idle::Context) -> ! {
+        hprintln!("IDLE:l1 = {}", cx.resources.l1).unwrap();
+        hprintln!("IDLE:e2 = {}", cx.resources.e2).unwrap();
+        debug::exit(debug::EXIT_SUCCESS);
+        loop {}
+    }
+
+    // `shared` can be accessed from this context
+    // l2 rejected (not task_local)
+    // e1 rejected (not lock_free)
+    #[task(priority = 1, binds = UART0, resources = [shared, l2, e1])]
+    fn uart0(cx: uart0::Context) {
+        let shared: &mut u32 = cx.resources.shared;
+        *shared += 1;
+        *cx.resources.e1 += 10;
+        hprintln!("UART0: shared = {}", shared).unwrap();
+        hprintln!("UART0:l2 = {}", cx.resources.l2).unwrap();
+        hprintln!("UART0:e1 = {}", cx.resources.e1).unwrap();
+    }
+
+    // l2 rejected (not task_local)
+    #[task(priority = 2, binds = UART1, resources = [shared, l2, e1])]
+    fn uart1(cx: uart1::Context) {
+        let shared: &mut u32 = cx.resources.shared;
+        *shared += 1;
+
+        hprintln!("UART1: shared = {}", shared).unwrap();
+        hprintln!("UART1:l2 = {}", cx.resources.l2).unwrap();
+        hprintln!("UART1:e1 = {}", cx.resources.e1).unwrap();
+    }
+}
diff --git a/ui/single/local-err.stderr b/ui/single/local-err.stderr
new file mode 100644
index 00000000..88369d8e
--- /dev/null
+++ b/ui/single/local-err.stderr
@@ -0,0 +1,60 @@
+error: task local resource "l2" is used by multiple tasks
+  --> $DIR/local-err.rs:34:9
+   |
+34 |         l2: u32,
+   |         ^^
+
+error: task local resource "l2" is used by task "idle" with priority 0
+  --> $DIR/local-err.rs:52:28
+   |
+52 |     #[idle(resources =[l1, l2, e2])]
+   |                            ^^
+
+error: task local resource "l2" is used by task "uart0" with priority 1
+  --> $DIR/local-err.rs:63:62
+   |
+63 |     #[task(priority = 1, binds = UART0, resources = [shared, l2, e1])]
+   |                                                              ^^
+
+error: task local resource "l2" is used by task "uart1" with priority 2
+  --> $DIR/local-err.rs:74:62
+   |
+74 |     #[task(priority = 2, binds = UART1, resources = [shared, l2, e1])]
+   |                                                              ^^
+
+error: Lock free resource "e1" is used by tasks at different priorities
+  --> $DIR/local-err.rs:30:9
+   |
+30 |         e1: u32,
+   |         ^^
+
+error: Resource "e1" is declared lock free but used by tasks at different priorities
+  --> $DIR/local-err.rs:63:66
+   |
+63 |     #[task(priority = 1, binds = UART0, resources = [shared, l2, e1])]
+   |                                                                  ^^
+
+error: Resource "e1" is declared lock free but used by tasks at different priorities
+  --> $DIR/local-err.rs:74:66
+   |
+74 |     #[task(priority = 2, binds = UART1, resources = [shared, l2, e1])]
+   |                                                                  ^^
+
+error: unused imports: `debug`, `hprintln`
+  --> $DIR/local-err.rs:10:28
+   |
+10 | use cortex_m_semihosting::{debug, hprintln};
+   |                            ^^^^^  ^^^^^^^^
+   |
+note: the lint level is defined here
+  --> $DIR/local-err.rs:4:9
+   |
+4  | #![deny(warnings)]
+   |         ^^^^^^^^
+   = note: `#[deny(unused_imports)]` implied by `#[deny(warnings)]`
+
+error: unused import: `lm3s6965::Interrupt`
+  --> $DIR/local-err.rs:11:5
+   |
+11 | use lm3s6965::Interrupt;
+   |     ^^^^^^^^^^^^^^^^^^^