michaelh/zephyr
1
0
Fork 0
Code Releases Activity

portability: cmsis: Store thread name within Zephyr k_thread

Browse source 
Use underlying Zephyr thread directly to store thread name instead of
storing the name in CMSIS control block. Also, allow `osThreadGetName`
to work within ISR, as expected from spec.

Signed-off-by: Utsav Munendra <utsavm@meta.com>
This commit is contained in:
Utsav Munendra 2025-03-15 10:58:56 -07:00 • committed by Benjamin Cabé
commit e676bf3d35
2 changed files with 7 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/zephyr/portability/cmsis_types.h
View file

@ -26,7 +26,6 @@ struct cmsis_rtos_thread_cb {
struct k_poll_signal poll_signal;
struct k_poll_event poll_event;
uint32_t signal_results;
char name[CMSIS_OBJ_NAME_MAX_LEN];
uint32_t attr_bits;
};

27
subsys/portability/cmsis_rtos_v2/thread.c
View file

@ -192,37 +192,24 @@ osThreadId_t osThreadNew(osThreadFunc_t threadfunc, void *arg, const osThreadAtt
(void)k_thread_create(&tid->z_thread, stack, stack_size, zephyr_thread_wrapper, (void *)arg,
NULL, threadfunc, prio, 0, K_NO_WAIT);
if (attr->name == NULL) {
strncpy(tid->name, init_thread_attrs.name, sizeof(tid->name) - 1);
} else {
strncpy(tid->name, attr->name, sizeof(tid->name) - 1);
}
k_thread_name_set(&tid->z_thread, tid->name);
const char *name = (attr->name == NULL) ? init_thread_attrs.name : attr->name;
k_thread_name_set(&tid->z_thread, name);
return (osThreadId_t)tid;
}
/**
* @brief Get name of a thread.
* This function may be called from Interrupt Service Routines.
*/
const char *osThreadGetName(osThreadId_t thread_id)
{
const char *name = NULL;
struct cmsis_rtos_thread_cb *tid = (struct cmsis_rtos_thread_cb *)thread_id;
if (k_is_in_isr() || (thread_id == NULL)) {
name = NULL;
} else {
if (is_cmsis_rtos_v2_thread(thread_id) == NULL) {
name = NULL;
} else {
struct cmsis_rtos_thread_cb *tid = (struct cmsis_rtos_thread_cb *)thread_id;
name = k_thread_name_get(&tid->z_thread);
}
if (tid == NULL) {
return NULL;
}
return name;
return k_thread_name_get(&tid->z_thread);
}
/**