RTOS: Add logging to FreeRTOS and general RTOS

[openocd.git] / src / rtos / FreeRTOS.c

diff --git a/src/rtos/FreeRTOS.c b/src/rtos/FreeRTOS.c
index 1e699c6adfe1983256c3bc76741fafc8dcc1c035..667875c370c931329eef3c5b08dfbbdc4c0c60f6 100644 (file)
--- a/src/rtos/FreeRTOS.c
+++ b/src/rtos/FreeRTOS.c
@@ -166,6 +166,9 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
                        rtos->symbols[FreeRTOS_VAL_uxCurrentNumberOfTasks].address,
                        param->thread_count_width,
                        (uint8_t *)&thread_list_size);
+       LOG_DEBUG("FreeRTOS: Read uxCurrentNumberOfTasks at 0x%" PRIx64 ", value %d\r\n",
+                                                                               rtos->symbols[FreeRTOS_VAL_uxCurrentNumberOfTasks].address,
+                                                                               thread_list_size);
 
        if (retval != ERROR_OK) {
                LOG_ERROR("Could not read FreeRTOS thread count from target");
@@ -184,6 +187,9 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
                LOG_ERROR("Error reading current thread in FreeRTOS thread list");
                return retval;
        }
+       LOG_DEBUG("FreeRTOS: Read pxCurrentTCB at 0x%" PRIx64 ", value 0x%" PRIx64 "\r\n",
+                                                                               rtos->symbols[FreeRTOS_VAL_pxCurrentTCB].address,
+                                                                               rtos->current_thread);
 
        if ((thread_list_size  == 0) || (rtos->current_thread == 0)) {
                /* Either : No RTOS threads - there is always at least the current execution though */
@@ -227,6 +233,9 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
                        (uint8_t *)&max_used_priority);
        if (retval != ERROR_OK)
                return retval;
+       LOG_DEBUG("FreeRTOS: Read uxTopUsedPriority at 0x%" PRIx64 ", value %" PRId64 "\r\n",
+                                                                               rtos->symbols[FreeRTOS_VAL_uxTopUsedPriority].address,
+                                                                               max_used_priority);
        if (max_used_priority > FREERTOS_MAX_PRIORITIES) {
                LOG_ERROR("FreeRTOS maximum used priority is unreasonably big, not proceeding: %" PRId64 "",
                        max_used_priority);
@@ -267,6 +276,8 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
                        free(list_of_lists);
                        return retval;
                }
+               LOG_DEBUG("FreeRTOS: Read thread count for list %d at 0x%" PRIx64 ", value %" PRId64 "\r\n",
+                                                                               i, list_of_lists[i], list_thread_count);
 
                if (list_thread_count == 0)
                        continue;
@@ -283,6 +294,8 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
                        free(list_of_lists);
                        return retval;
                }
+               LOG_DEBUG("FreeRTOS: Read first item for list %d at 0x%" PRIx64 ", value 0x%" PRIx64 "\r\n",
+                                                                               i, list_of_lists[i] + param->list_next_offset, list_elem_ptr);
 
                while ((list_thread_count > 0) && (list_elem_ptr != 0) &&
                                (list_elem_ptr != prev_list_elem_ptr) &&
@@ -298,6 +311,9 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
                                free(list_of_lists);
                                return retval;
                        }
+                       LOG_DEBUG("FreeRTOS: Read Thread ID at 0x%" PRIx64 ", value 0x%" PRIx64 "\r\n",
+                                                                               list_elem_ptr + param->list_elem_content_offset,
+                                                                               rtos->thread_details[tasks_found].threadid);
 
                        /* get thread name */
 
@@ -315,6 +331,9 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
                                return retval;
                        }
                        tmp_str[FREERTOS_THREAD_NAME_STR_SIZE-1] = '\x00';
+                       LOG_DEBUG("FreeRTOS: Read Thread Name at 0x%" PRIx64 ", value \"%s\"\r\n",
+                                                                               rtos->thread_details[tasks_found].threadid + param->thread_name_offset,
+                                                                               tmp_str);
 
                        if (tmp_str[0] == '\x00')
                                strcpy(tmp_str, "No Name");
@@ -348,6 +367,9 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
                                free(list_of_lists);
                                return retval;
                        }
+                       LOG_DEBUG("FreeRTOS: Read next thread location at 0x%" PRIx64 ", value 0x%" PRIx64 "\r\n",
+                                                                               prev_list_elem_ptr + param->list_elem_next_offset,
+                                                                               list_elem_ptr);
                }
        }
 
@@ -383,6 +405,9 @@ static int FreeRTOS_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, ch
                LOG_ERROR("Error reading stack frame from FreeRTOS thread");
                return retval;
        }
+       LOG_DEBUG("FreeRTOS: Read stack pointer at 0x%" PRIx64 ", value 0x%" PRIx64 "\r\n",
+                                                                               thread_id + param->thread_stack_offset,
+                                                                               stack_ptr);
 
        return rtos_generic_stack_read(rtos->target, param->stacking_info, stack_ptr, hex_reg_list);
 }
@@ -390,8 +415,8 @@ static int FreeRTOS_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, ch
 static int FreeRTOS_get_symbol_list_to_lookup(symbol_table_elem_t *symbol_list[])
 {
        unsigned int i;
-       *symbol_list = malloc(
-                       sizeof(symbol_table_elem_t) * ARRAY_SIZE(FreeRTOS_symbol_list));
+       *symbol_list = calloc(
+                       ARRAY_SIZE(FreeRTOS_symbol_list), sizeof(symbol_table_elem_t));
 
        for (i = 0; i < ARRAY_SIZE(FreeRTOS_symbol_list); i++)
                (*symbol_list)[i].symbol_name = FreeRTOS_symbol_list[i];