From 89c1ab6b18300b43bf30db16bd2c258e36150a61 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Thu, 18 Jan 2018 16:50:08 -0500 Subject: [PATCH] ring_buffer: remove broken object_tracing support The library has incomplete tracing support. Given that we are not a true kernel object, remove support instead of fixing it. Signed-off-by: Anas Nashif --- include/debug/object_tracing.h | 2 -- include/debug/object_tracing_common.h | 4 ---- include/ring_buffer.h | 5 ----- 3 files changed, 11 deletions(-) diff --git a/include/debug/object_tracing.h b/include/debug/object_tracing.h index 010d3ffc8c9..6827d52d334 100644 --- a/include/debug/object_tracing.h +++ b/include/debug/object_tracing.h @@ -28,8 +28,6 @@ extern struct k_msgq *_trace_list_k_msgq; extern struct k_mbox *_trace_list_k_mbox; extern struct k_pipe *_trace_list_k_pipe; -extern struct ring_buf *_trace_list_sys_ring_buf; - /** * @def SYS_TRACING_HEAD * diff --git a/include/debug/object_tracing_common.h b/include/debug/object_tracing_common.h index 2c3a15df988..cfa88c44f29 100644 --- a/include/debug/object_tracing_common.h +++ b/include/debug/object_tracing_common.h @@ -97,9 +97,5 @@ } \ while (0) -struct ring_buf; - -extern struct ring_buf *_trace_list_sys_ring_buf; - #endif /*CONFIG_OBJECT_TRACING*/ #endif /*_OBJECT_TRACING_COMMON_H_*/ diff --git a/include/ring_buffer.h b/include/ring_buffer.h index 88e993360b5..d7fb814a2e2 100644 --- a/include/ring_buffer.h +++ b/include/ring_buffer.h @@ -11,7 +11,6 @@ #define __RING_BUFFER_H__ #include -#include #include #include @@ -33,9 +32,6 @@ struct ring_buf { u32_t size; /**< Size of buf in 32-bit chunks */ u32_t *buf; /**< Memory region for stored entries */ u32_t mask; /**< Modulo mask if size is a power of 2 */ -#ifdef CONFIG_OBJECT_TRACING - struct ring_buf *__next; -#endif }; /** @@ -118,7 +114,6 @@ static inline void sys_ring_buf_init(struct ring_buf *buf, u32_t size, buf->mask = 0; } - SYS_TRACING_OBJ_INIT(sys_ring_buf, buf); } /**