zephyr-macros: Incorporate fn name into thread name

To help with debugging, try to give created Zephyr threads a readable
name.  Currently, this is based off of the name of the function used in
the declaration of the thread.

Signed-off-by: David Brown <[email protected]>

Author: d3zd3z

zephyr-macros/src/task.rs

@@ -1,10 +1,10 @@
 //! Expansion of `#[zephyr::task(...)]`.
 
-use std::fmt::Display;
+use std::{ffi::CString, fmt::Display};
 
 use darling::FromMeta;
 use darling::export::NestedMeta;
-use proc_macro2::{Span, TokenStream};
+use proc_macro2::{Literal, Span, TokenStream};
 use quote::{ToTokens, format_ident, quote};
 use syn::{
     Expr, ExprLit, ItemFn, Lit, LitInt, ReturnType, Type,
@@ -149,6 +149,8 @@ pub fn run(args: TokenStream, item: TokenStream) -> TokenStream {
         });
     }
 
+    let thread_name = Literal::c_string(&CString::new(thread_ident.to_string()).unwrap());
+
     let mut thread_outer_body = quote! {
         const _ZEPHYR_INTERNAL_STACK_SIZE: usize = zephyr::thread::stack_len(#stack_size);
         const _ZEPHYR_INTERNAL_POOL_SIZE: usize = #pool_size;
@@ -187,6 +189,7 @@ pub fn run(args: TokenStream, item: TokenStream) -> TokenStream {
             _ZephyrInternalArgs { #(#inner_args)* },
             Some(startup),
             0,
+            #thread_name,
         )
     };
 

zephyr/src/thread.rs

@@ -10,16 +10,16 @@
 
 use core::{
     cell::UnsafeCell,
-    ffi::{c_int, c_void},
+    ffi::{c_int, c_void, CStr},
     mem,
     ptr::null_mut,
     sync::atomic::Ordering,
 };
 
 use portable_atomic::AtomicU8;
 use zephyr_sys::{
-    k_thread, k_thread_create, k_thread_entry_t, k_thread_join, k_thread_priority_set, k_wakeup,
-    z_thread_stack_element, ZR_STACK_ALIGN, ZR_STACK_RESERVED,
+    k_thread, k_thread_create, k_thread_entry_t, k_thread_join, k_thread_name_set,
+    k_thread_priority_set, k_wakeup, z_thread_stack_element, ZR_STACK_ALIGN, ZR_STACK_RESERVED,
 };
 
 use crate::{
@@ -133,6 +133,7 @@ impl<T: Send> ThreadData<T> {
         args: T,
         entry: k_thread_entry_t,
         priority: c_int,
+        name: &'static CStr,
     ) -> ReadyThread {
         let id = Self::find_thread(pool);
 
@@ -157,6 +158,11 @@ impl<T: Send> ThreadData<T> {
             )
         };
 
+        // Set the name.
+        unsafe {
+            k_thread_name_set(tid, name.as_ptr());
+        }
+
         ReadyThread { id: tid }
     }