From 796433fad28301fbc2c3e50cb2aaa88bf3405c16 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Sun, 8 Jan 2023 16:36:48 +0100
Subject: [PATCH] Fix failing UI test

---
 macros/src/syntax/analyze.rs      | 18 ++++++++++--------
 macros/ui/shared-lock-free.stderr | 17 +++++++++++++++++
 2 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 macros/ui/shared-lock-free.stderr

diff --git a/macros/src/syntax/analyze.rs b/macros/src/syntax/analyze.rs
index ff0577dacc..dd5a9b40d2 100644
--- a/macros/src/syntax/analyze.rs
+++ b/macros/src/syntax/analyze.rs
@@ -13,17 +13,17 @@ use crate::syntax::{
 
 pub(crate) fn app(app: &App) -> Result<Analysis, syn::Error> {
     // Collect all tasks into a vector
-    type TaskName = String;
+    type TaskName = Ident;
     type Priority = u8;
 
     // The task list is a Tuple (Name, Shared Resources, Local Resources, Priority)
     let task_resources_list: Vec<(TaskName, Vec<&Ident>, &LocalResources, Priority)> =
         Some(&app.init)
             .iter()
-            .map(|ht| ("init".to_string(), Vec::new(), &ht.args.local_resources, 0))
+            .map(|ht| (ht.name.clone(), Vec::new(), &ht.args.local_resources, 0))
             .chain(app.idle.iter().map(|ht| {
                 (
-                    "idle".to_string(),
+                    ht.name.clone(),
                     ht.args
                         .shared_resources
                         .iter()
@@ -35,7 +35,7 @@ pub(crate) fn app(app: &App) -> Result<Analysis, syn::Error> {
             }))
             .chain(app.software_tasks.iter().map(|(name, ht)| {
                 (
-                    name.to_string(),
+                    name.clone(),
                     ht.args
                         .shared_resources
                         .iter()
@@ -47,7 +47,7 @@ pub(crate) fn app(app: &App) -> Result<Analysis, syn::Error> {
             }))
             .chain(app.hardware_tasks.iter().map(|(name, ht)| {
                 (
-                    name.to_string(),
+                    name.clone(),
                     ht.args
                         .shared_resources
                         .iter()
@@ -77,16 +77,17 @@ pub(crate) fn app(app: &App) -> Result<Analysis, syn::Error> {
             for r in tr {
                 // Get all uses of resources annotated lock_free
                 if lf_res == r {
-                    // lock_free resources are not allowed in async tasks
-                    error.push(syn::Error::new(
+                    // Check so async tasks do not use lock free resources
+                    if app.software_tasks.get(task).is_some() {
+                        error.push(syn::Error::new(
                             r.span(),
                             format!(
                                 "Lock free shared resource {:?} is used by an async tasks, which is forbidden",
                                 r.to_string(),
                             ),
                         ));
+                    }
 
-                    // TODO: Should this be removed?
                     // HashMap returns the previous existing object if old.key == new.key
                     if let Some(lf_res) = lf_hash.insert(r.to_string(), (task, r, priority)) {
                         // Check if priority differ, if it does, append to
@@ -95,6 +96,7 @@ pub(crate) fn app(app: &App) -> Result<Analysis, syn::Error> {
                             lf_res_with_error.push(lf_res.1);
                             lf_res_with_error.push(r);
                         }
+
                         // If the resource already violates lock free properties
                         if lf_res_with_error.contains(&r) {
                             lf_res_with_error.push(lf_res.1);
diff --git a/macros/ui/shared-lock-free.stderr b/macros/ui/shared-lock-free.stderr
new file mode 100644
index 0000000000..51e99a0c43
--- /dev/null
+++ b/macros/ui/shared-lock-free.stderr
@@ -0,0 +1,17 @@
+error: Lock free shared resource "e1" is used by tasks at different priorities
+ --> ui/shared-lock-free.rs:9:9
+  |
+9 |         e1: u32,
+  |         ^^
+
+error: Shared resource "e1" is declared lock free but used by tasks at different priorities
+  --> ui/shared-lock-free.rs:30:51
+   |
+30 |     #[task(binds = UART0, priority = 1, shared = [e1])]
+   |                                                   ^^
+
+error: Shared resource "e1" is declared lock free but used by tasks at different priorities
+  --> ui/shared-lock-free.rs:36:51
+   |
+36 |     #[task(binds = UART1, priority = 2, shared = [e1])]
+   |                                                   ^^