From d9c42ab326fd761b74d9aa9796255d215d500239 Mon Sep 17 00:00:00 2001 From: Ken Van Hoeylandt Date: Mon, 15 Jan 2024 00:21:38 +0100 Subject: [PATCH] Removed heap tracing and custom output --- components/tactility-core/src/thread.c | 68 -------------------------- 1 file changed, 68 deletions(-) diff --git a/components/tactility-core/src/thread.c b/components/tactility-core/src/thread.c index baffd7a5..92f50962 100644 --- a/components/tactility-core/src/thread.c +++ b/components/tactility-core/src/thread.c @@ -5,8 +5,6 @@ #include "freertos/FreeRTOS.h" #include "freertos/task.h" #include "kernel.h" -#include "log.h" -#include "tt_string.h" #include #define TAG "Thread" @@ -20,13 +18,6 @@ #define THREAD_FLAGS_INVALID_BITS (~((1UL << MAX_BITS_TASK_NOTIFY) - 1U)) #define EVENT_FLAGS_INVALID_BITS (~((1UL << MAX_BITS_EVENT_GROUPS) - 1U)) -typedef struct ThreadStdout ThreadStdout; - -struct ThreadStdout { - ThreadStdoutWriteCallback write_callback; - TtString* buffer; -}; - struct Thread { ThreadState state; int32_t ret; @@ -43,21 +34,14 @@ struct Thread { ThreadPriority priority; TaskHandle_t task_handle; - size_t heap_size; - - ThreadStdout output; // Keep all non-alignable byte types in one place, // this ensures that the size of this structure is minimal bool is_static; - bool heap_trace_enabled; configSTACK_DEPTH_TYPE stack_size; }; -static size_t __tt_thread_stdout_write(Thread* thread, const char* data, size_t size); -static int32_t __tt_thread_stdout_flush(Thread* thread); - /** Catch threads that are trying to exit wrong way */ __attribute__((__noreturn__)) void tt_thread_catch() { //-V1082 // If you're here it means you're probably doing something wrong @@ -98,9 +82,6 @@ static void tt_thread_body(void* context) { ); } - // flush stdout - __tt_thread_stdout_flush(thread); - tt_thread_set_state(thread, ThreadStateStopped); vTaskDelete(NULL); @@ -111,7 +92,6 @@ Thread* tt_thread_alloc() { Thread* thread = malloc(sizeof(Thread)); // TODO: create default struct instead of using memset() memset(thread, 0, sizeof(Thread)); - thread->output.buffer = tt_string_alloc(); thread->is_static = false; Thread* parent = NULL; @@ -129,16 +109,6 @@ Thread* tt_thread_alloc() { tt_thread_set_appid(thread, "driver"); } - /*HalRtcHeapTrackMode mode = tt_hal_rtc_get_heap_track_mode(); - if(mode == HalRtcHeapTrackModeAll) { - thread->heap_trace_enabled = true; - } else if(mode == HalRtcHeapTrackModeTree && tt_thread_get_current_id()) { - if(parent) thread->heap_trace_enabled = parent->heap_trace_enabled; - } else */ - { - thread->heap_trace_enabled = false; - } - return thread; } @@ -165,7 +135,6 @@ void tt_thread_free(Thread* thread) { if (thread->name) free(thread->name); if (thread->appid) free(thread->appid); - tt_string_free(thread->output.buffer); free(thread); } @@ -309,24 +278,6 @@ ThreadId tt_thread_get_id(Thread* thread) { return thread->task_handle; } -void tt_thread_enable_heap_trace(Thread* thread) { - tt_assert(thread); - tt_assert(thread->state == ThreadStateStopped); - thread->heap_trace_enabled = true; -} - -void tt_thread_disable_heap_trace(Thread* thread) { - tt_assert(thread); - tt_assert(thread->state == ThreadStateStopped); - thread->heap_trace_enabled = false; -} - -size_t tt_thread_get_heap_size(Thread* thread) { - tt_assert(thread); - tt_assert(thread->heap_trace_enabled == true); - return thread->heap_size; -} - int32_t tt_thread_get_return_code(Thread* thread) { tt_assert(thread); tt_assert(thread->state == ThreadStateStopped); @@ -560,25 +511,6 @@ uint32_t tt_thread_get_stack_space(ThreadId thread_id) { return (sz); } -static size_t __tt_thread_stdout_write(Thread* thread, const char* data, size_t size) { - if (thread->output.write_callback != NULL) { - thread->output.write_callback(data, size); - } else { - TT_LOG_I(thread->name, "%s", data); - } - return size; -} - -static int32_t __tt_thread_stdout_flush(Thread* thread) { - TtString* buffer = thread->output.buffer; - size_t size = tt_string_size(buffer); - if (size > 0) { - __tt_thread_stdout_write(thread, tt_string_get_cstr(buffer), size); - tt_string_reset(buffer); - } - return 0; -} - void tt_thread_suspend(ThreadId thread_id) { TaskHandle_t hTask = (TaskHandle_t)thread_id; vTaskSuspend(hTask);