From 5ee70c548708d39dabdb595d54029cf762e2d4c4 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 30 Jul 2019 06:24:00 +0200 Subject: Add and use THREAD_DEFAULT_MAXIMUM_NAME_SIZE --- bsps/shared/start/bspfatal-default.c | 2 +- cpukit/include/rtems/confdefs.h | 2 +- cpukit/include/rtems/score/thread.h | 9 +++++++++ cpukit/libmisc/stackchk/check.c | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/bsps/shared/start/bspfatal-default.c b/bsps/shared/start/bspfatal-default.c index 4ed6243b57..f5f7e58812 100644 --- a/bsps/shared/start/bspfatal-default.c +++ b/bsps/shared/start/bspfatal-default.c @@ -63,7 +63,7 @@ void bsp_fatal_extension( executing = _Thread_Get_executing(); if ( executing != NULL ) { - char name[ 32 ]; + char name[ 2 * THREAD_DEFAULT_MAXIMUM_NAME_SIZE ]; _Thread_Get_name( executing, name, sizeof( name ) ); printk( diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h index 5bda122b4f..45a75f0c6f 100644 --- a/cpukit/include/rtems/confdefs.h +++ b/cpukit/include/rtems/confdefs.h @@ -2637,7 +2637,7 @@ struct _reent *__getreent(void) ) #ifndef CONFIGURE_MAXIMUM_THREAD_NAME_SIZE - #define CONFIGURE_MAXIMUM_THREAD_NAME_SIZE 16 + #define CONFIGURE_MAXIMUM_THREAD_NAME_SIZE THREAD_DEFAULT_MAXIMUM_NAME_SIZE #endif #ifdef CONFIGURE_INIT diff --git a/cpukit/include/rtems/score/thread.h b/cpukit/include/rtems/score/thread.h index b3cfd91e93..fd99e8bb77 100644 --- a/cpukit/include/rtems/score/thread.h +++ b/cpukit/include/rtems/score/thread.h @@ -939,6 +939,15 @@ extern const size_t _Thread_Control_add_on_count; */ extern const size_t _Thread_Initial_thread_count; +/** + * @brief The default maximum size of a thread name in characters (including + * the terminating '\0' character). + * + * This is the default value for the application configuration option + * CONFIGURE_MAXIMUM_THREAD_NAME_SIZE. + */ +#define THREAD_DEFAULT_MAXIMUM_NAME_SIZE 16 + /** * @brief Maximum size of a thread name in characters (including the * terminating '\0' character). diff --git a/cpukit/libmisc/stackchk/check.c b/cpukit/libmisc/stackchk/check.c index a3f9a1d21e..3b8cf69a12 100644 --- a/cpukit/libmisc/stackchk/check.c +++ b/cpukit/libmisc/stackchk/check.c @@ -250,7 +250,7 @@ static void Stack_check_report_blown_task( { const Stack_Control *stack = &running->Start.Initial_stack; void *pattern_area = Stack_check_Get_pattern(stack); - char name[32]; + char name[2 * THREAD_DEFAULT_MAXIMUM_NAME_SIZE]; printk("BLOWN STACK!!!\n"); printk("task control block: 0x%08" PRIxPTR "\n", (intptr_t) running); -- cgit v1.2.3