From f4dfa3b0d0abac55b7c60d333018d53d09b21bef Mon Sep 17 00:00:00 2001 From: Steven Stallion Date: Wed, 20 Jul 2016 14:05:12 -0500 Subject: [PATCH] rtos: remove display_str member This patch removes the display_str member in the thread_detail struct. This member was not being used and provides no additional benefit over the thread_name_str and extra_info_str members. This change is made in preparation of support for the qXfer:threads:read packet, which will modernize how thread information is shared with GDB. Change-Id: I1f8bc6325e6aa790e02ea6caee9d6f44c5fedf36 Signed-off-by: Steven Stallion Reviewed-on: http://openocd.zylin.com/3558 Tested-by: jenkins Reviewed-by: Paul Fertser --- src/rtos/ChibiOS.c | 2 -- src/rtos/FreeRTOS.c | 2 -- src/rtos/ThreadX.c | 5 ----- src/rtos/eCos.c | 3 --- src/rtos/embKernel.c | 1 - src/rtos/mqx.c | 1 - src/rtos/rtos.c | 15 +++------------ src/rtos/rtos.h | 1 - 8 files changed, 3 insertions(+), 27 deletions(-) diff --git a/src/rtos/ChibiOS.c b/src/rtos/ChibiOS.c index 2d8866439..00e9df783 100644 --- a/src/rtos/ChibiOS.c +++ b/src/rtos/ChibiOS.c @@ -357,7 +357,6 @@ static int ChibiOS_update_threads(struct rtos *rtos) sizeof(struct thread_detail)); rtos->thread_details->threadid = 1; rtos->thread_details->exists = true; - rtos->thread_details->display_str = NULL; rtos->thread_details->extra_info_str = malloc( sizeof(tmp_thread_extra_info)); @@ -448,7 +447,6 @@ static int ChibiOS_update_threads(struct rtos *rtos) strcpy(curr_thrd_details->extra_info_str, state_desc); curr_thrd_details->exists = true; - curr_thrd_details->display_str = NULL; curr_thrd_details++; } diff --git a/src/rtos/FreeRTOS.c b/src/rtos/FreeRTOS.c index a68ac2b30..52cebadc7 100644 --- a/src/rtos/FreeRTOS.c +++ b/src/rtos/FreeRTOS.c @@ -221,7 +221,6 @@ static int FreeRTOS_update_threads(struct rtos *rtos) } rtos->thread_details->threadid = 1; rtos->thread_details->exists = true; - rtos->thread_details->display_str = NULL; rtos->thread_details->extra_info_str = NULL; rtos->thread_details->thread_name_str = malloc(sizeof(tmp_str)); strcpy(rtos->thread_details->thread_name_str, tmp_str); @@ -360,7 +359,6 @@ static int FreeRTOS_update_threads(struct rtos *rtos) rtos->thread_details[tasks_found].thread_name_str = malloc(strlen(tmp_str)+1); strcpy(rtos->thread_details[tasks_found].thread_name_str, tmp_str); - rtos->thread_details[tasks_found].display_str = NULL; rtos->thread_details[tasks_found].exists = true; if (rtos->thread_details[tasks_found].threadid == rtos->current_thread) { diff --git a/src/rtos/ThreadX.c b/src/rtos/ThreadX.c index 229bf72e5..8267b9f6a 100644 --- a/src/rtos/ThreadX.c +++ b/src/rtos/ThreadX.c @@ -319,7 +319,6 @@ static int ThreadX_update_threads(struct rtos *rtos) sizeof(struct thread_detail) * thread_list_size); rtos->thread_details->threadid = 1; rtos->thread_details->exists = true; - rtos->thread_details->display_str = NULL; rtos->thread_details->extra_info_str = NULL; rtos->thread_details->thread_name_str = malloc(sizeof(tmp_str)); strcpy(rtos->thread_details->thread_name_str, tmp_str); @@ -414,8 +413,6 @@ static int ThreadX_update_threads(struct rtos *rtos) rtos->thread_details[tasks_found].exists = true; - rtos->thread_details[tasks_found].display_str = NULL; - tasks_found++; prev_thread_ptr = thread_ptr; @@ -596,8 +593,6 @@ static int ThreadX_get_thread_detail(struct rtos *rtos, detail->exists = true; - detail->display_str = NULL; - return 0; } diff --git a/src/rtos/eCos.c b/src/rtos/eCos.c index e4080695c..e38e11f04 100644 --- a/src/rtos/eCos.c +++ b/src/rtos/eCos.c @@ -172,7 +172,6 @@ static int eCos_update_threads(struct rtos *rtos) sizeof(struct thread_detail) * thread_list_size); rtos->thread_details->threadid = 1; rtos->thread_details->exists = true; - rtos->thread_details->display_str = NULL; rtos->thread_details->extra_info_str = NULL; rtos->thread_details->thread_name_str = malloc(sizeof(tmp_str)); strcpy(rtos->thread_details->thread_name_str, tmp_str); @@ -267,8 +266,6 @@ static int eCos_update_threads(struct rtos *rtos) rtos->thread_details[tasks_found].exists = true; - rtos->thread_details[tasks_found].display_str = NULL; - tasks_found++; prev_thread_ptr = thread_index; diff --git a/src/rtos/embKernel.c b/src/rtos/embKernel.c index 107cbdd55..ceb313f02 100644 --- a/src/rtos/embKernel.c +++ b/src/rtos/embKernel.c @@ -143,7 +143,6 @@ static int embKernel_get_tasks_details(struct rtos *rtos, int64_t iterable, cons return retval; details->threadid = (threadid_t) task; details->exists = true; - details->display_str = NULL; int64_t name_ptr = 0; retval = target_read_buffer(rtos->target, task + param->thread_name_offset, param->pointer_width, diff --git a/src/rtos/mqx.c b/src/rtos/mqx.c index 728647c93..b8095a0cf 100644 --- a/src/rtos/mqx.c +++ b/src/rtos/mqx.c @@ -423,7 +423,6 @@ static int mqx_update_threads( /* setup thread details struct */ rtos->thread_details[i].threadid = task_id; rtos->thread_details[i].exists = true; - rtos->thread_details[i].display_str = NULL; /* set thread name */ rtos->thread_details[i].thread_name_str = malloc(strlen((void *)task_name) + 1); if (NULL == rtos->thread_details[i].thread_name_str) diff --git a/src/rtos/rtos.c b/src/rtos/rtos.c index 8f50b49e6..4c99ad233 100644 --- a/src/rtos/rtos.c +++ b/src/rtos/rtos.c @@ -296,28 +296,20 @@ int rtos_thread_packet(struct connection *connection, char const *packet, int pa struct thread_detail *detail = &target->rtos->thread_details[found]; int str_size = 0; - if (detail->display_str != NULL) - str_size += strlen(detail->display_str); if (detail->thread_name_str != NULL) str_size += strlen(detail->thread_name_str); if (detail->extra_info_str != NULL) str_size += strlen(detail->extra_info_str); - char *tmp_str = calloc(str_size + 7, sizeof(char)); + char *tmp_str = calloc(str_size + 4, sizeof(char)); char *tmp_str_ptr = tmp_str; - if (detail->display_str != NULL) - tmp_str_ptr += sprintf(tmp_str_ptr, "%s", detail->display_str); - if (detail->thread_name_str != NULL) { - if (tmp_str_ptr != tmp_str) - tmp_str_ptr += sprintf(tmp_str_ptr, " : "); + if (detail->thread_name_str != NULL) tmp_str_ptr += sprintf(tmp_str_ptr, "%s", detail->thread_name_str); - } if (detail->extra_info_str != NULL) { if (tmp_str_ptr != tmp_str) tmp_str_ptr += sprintf(tmp_str_ptr, " : "); - tmp_str_ptr += - sprintf(tmp_str_ptr, " : %s", detail->extra_info_str); + tmp_str_ptr += sprintf(tmp_str_ptr, "%s", detail->extra_info_str); } assert(strlen(tmp_str) == @@ -545,7 +537,6 @@ void rtos_free_threadlist(struct rtos *rtos) for (j = 0; j < rtos->thread_count; j++) { struct thread_detail *current_thread = &rtos->thread_details[j]; - free(current_thread->display_str); free(current_thread->thread_name_str); free(current_thread->extra_info_str); } diff --git a/src/rtos/rtos.h b/src/rtos/rtos.h index 4c6989fe8..70c1193e5 100644 --- a/src/rtos/rtos.h +++ b/src/rtos/rtos.h @@ -39,7 +39,6 @@ typedef struct symbol_table_elem_struct { struct thread_detail { threadid_t threadid; bool exists; - char *display_str; char *thread_name_str; char *extra_info_str; };