Merge pull request #4372 from fg-cfh/feat/name-main-task

executor-macros: rtos-trace: name main task

3 files changed, 17 insertions, 4 deletions

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
index 13e04d954..8ee143cad 100644
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@@ -161,9 +161,9 @@ jobs:
         if: steps.changes.outputs.embassy-executor-macros == 'true'
         uses: dangoslen/changelog-enforcer@v3
         with:
-          changeLogPath: embassy-executor-macros/CHANGELOG.md
+          changeLogPath: embassy-executor/CHANGELOG.md
           skipLabels: "skip-changelog"
-          missingUpdateErrorMessage: "Please add a changelog entry in the embassy-executor-macros/CHANGELOG.md file."
+          missingUpdateErrorMessage: "Please add a changelog entry in the embassy-executor/CHANGELOG.md file."
       - name: Check that changelog updated (embassy-executor-timer-queue)
         if: steps.changes.outputs.embassy-executor-timer-queue == 'true'
         uses: dangoslen/changelog-enforcer@v3
diff --git a/embassy-executor-macros/src/macros/main.rs b/embassy-executor-macros/src/macros/main.rs
index fcc04d9c0..f043ff7f6 100644
--- a/embassy-executor-macros/src/macros/main.rs
+++ b/embassy-executor-macros/src/macros/main.rs
@@ -170,6 +170,14 @@ For example: `#[embassy_executor::main(entry = ..., executor = \"some_crate::Exe
     let f_body = f.body;
     let out = &f.sig.output;
 
+    let name_main_task = if cfg!(feature = "rtos-trace") {
+        quote!(
+            main_task.metadata().set_name("main\0");
+        )
+    } else {
+        quote!()
+    };
+
     let (main_ret, mut main_body) = match arch.flavor {
         Flavor::Standard => (
             quote!(!),
@@ -181,7 +189,9 @@ For example: `#[embassy_executor::main(entry = ..., executor = \"some_crate::Exe
                 let mut executor = #executor::new();
                 let executor = unsafe { __make_static(&mut executor) };
                 executor.run(|spawner| {
-                    spawner.spawn(__embassy_main(spawner).unwrap());
+                    let main_task = __embassy_main(spawner).unwrap();
+                    #name_main_task
+                    spawner.spawn(main_task);
                 })
             },
         ),
@@ -191,7 +201,9 @@ For example: `#[embassy_executor::main(entry = ..., executor = \"some_crate::Exe
                 let executor = ::std::boxed::Box::leak(::std::boxed::Box::new(#executor::new()));
 
                 executor.start(|spawner| {
-                    spawner.spawn(__embassy_main(spawner).unwrap());
+                    let main_task = __embassy_main(spawner).unwrap();
+                    #name_main_task
+                    spawner.spawn(main_task);
                 });
 
                 Ok(())
diff --git a/embassy-executor/CHANGELOG.md b/embassy-executor/CHANGELOG.md
index 953f4b9b6..69c82653b 100644
--- a/embassy-executor/CHANGELOG.md
+++ b/embassy-executor/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased - ReleaseDate
 
 - Added new metadata API for tasks
+- Named main task when rtos-trace feature is enabled.
 - Upgraded rtos-trace
 - Fixed performance regression on some ESP32 MCUs.