michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tracing: rename CONFIG_DEBUG_TRACING_KERNEL_OBJECTS

Browse source 
Use a short name for this option CONFIG_OBJECT_TRACING.

Change-Id: Id27de7ef9ca299492b6b7d2324d9f5bcf8059a31
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2016-12-18 06:57:45 -05:00
commit 2f203c2f92
15 changed files with 66 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/debug/object_tracing.h
View file

@ -22,7 +22,7 @@
#ifndef _OBJECT_TRACING_H_
#define _OBJECT_TRACING_H_
#ifdef CONFIG_DEBUG_TRACING_KERNEL_OBJECTS
#ifdef CONFIG_OBJECT_TRACING
#include <kernel.h>
extern struct k_timer *_trace_list_k_timer;
@ -66,7 +66,7 @@ extern struct ring_buf *_trace_list_sys_ring_buf;
*/
#define SYS_TRACING_NEXT(type, name, obj) (((type *)obj)->__next)
#endif /*CONFIG_DEBUG_TRACING_KERNEL_OBJECTS*/
#endif /*CONFIG_OBJECT_TRACING*/
#ifdef CONFIG_THREAD_MONITOR

4
include/debug/object_tracing_common.h
View file

@ -22,7 +22,7 @@
#ifndef _OBJECT_TRACING_COMMON_H_
#define _OBJECT_TRACING_COMMON_H_
#ifndef CONFIG_DEBUG_TRACING_KERNEL_OBJECTS
#ifndef CONFIG_OBJECT_TRACING
#define SYS_TRACING_OBJ_INIT(name, obj) do { } while ((0))
#define SYS_TRACING_OBJ_INIT_DLL(name, obj) do { } while ((0))
@ -111,5 +111,5 @@ struct ring_buf;
struct ring_buf *_trace_list_sys_ring_buf;
#endif /*CONFIG_DEBUG_TRACING_KERNEL_OBJECTS*/
#endif /*CONFIG_OBJECT_TRACING*/
#endif /*_OBJECT_TRACING_COMMON_H_*/

56
include/kernel.h
View file

@ -69,12 +69,12 @@ extern "C" {
typedef sys_dlist_t _wait_q_t;
#ifdef CONFIG_DEBUG_TRACING_KERNEL_OBJECTS
#define _DEBUG_TRACING_KERNEL_OBJECTS_NEXT_PTR(type) struct type *__next
#define _DEBUG_TRACING_KERNEL_OBJECTS_INIT .__next = NULL,
#ifdef CONFIG_OBJECT_TRACING
#define _OBJECT_TRACING_NEXT_PTR(type) struct type *__next
#define _OBJECT_TRACING_INIT .__next = NULL,
#else
#define _DEBUG_TRACING_KERNEL_OBJECTS_INIT
#define _DEBUG_TRACING_KERNEL_OBJECTS_NEXT_PTR(type)
#define _OBJECT_TRACING_INIT
#define _OBJECT_TRACING_NEXT_PTR(type)
#endif
#define tcs k_thread
@ -696,7 +696,7 @@ struct k_timer {
/* used to support legacy timer APIs */
void *_legacy_data;
_DEBUG_TRACING_KERNEL_OBJECTS_NEXT_PTR(k_timer);
_OBJECT_TRACING_NEXT_PTR(k_timer);
};
#define K_TIMER_INITIALIZER(obj, expiry, stop) \
@ -710,7 +710,7 @@ struct k_timer {
.stop_fn = stop, \
.status = 0, \
._legacy_data = NULL, \
_DEBUG_TRACING_KERNEL_OBJECTS_INIT \
_OBJECT_TRACING_INIT \
}
/**
@ -952,14 +952,14 @@ struct k_fifo {
_wait_q_t wait_q;
sys_slist_t data_q;
_DEBUG_TRACING_KERNEL_OBJECTS_NEXT_PTR(k_fifo);
_OBJECT_TRACING_NEXT_PTR(k_fifo);
};
#define K_FIFO_INITIALIZER(obj) \
{ \
.wait_q = SYS_DLIST_STATIC_INIT(&obj.wait_q), \
.data_q = SYS_SLIST_STATIC_INIT(&obj.data_q), \
_DEBUG_TRACING_KERNEL_OBJECTS_INIT \
_OBJECT_TRACING_INIT \
}
/**
@ -1077,14 +1077,14 @@ struct k_lifo {
_wait_q_t wait_q;
void *list;
_DEBUG_TRACING_KERNEL_OBJECTS_NEXT_PTR(k_lifo);
_OBJECT_TRACING_NEXT_PTR(k_lifo);
};
#define K_LIFO_INITIALIZER(obj) \
{ \
.wait_q = SYS_DLIST_STATIC_INIT(&obj.wait_q), \
.list = NULL, \
_DEBUG_TRACING_KERNEL_OBJECTS_INIT \
_OBJECT_TRACING_INIT \
}
/**
@ -1167,7 +1167,7 @@ struct k_stack {
_wait_q_t wait_q;
uint32_t *base, *next, *top;
_DEBUG_TRACING_KERNEL_OBJECTS_NEXT_PTR(k_stack);
_OBJECT_TRACING_NEXT_PTR(k_stack);
};
#define K_STACK_INITIALIZER(obj, stack_buffer, stack_num_entries) \
@ -1176,7 +1176,7 @@ struct k_stack {
.base = stack_buffer, \
.next = stack_buffer, \
.top = stack_buffer + stack_num_entries, \
_DEBUG_TRACING_KERNEL_OBJECTS_INIT \
_OBJECT_TRACING_INIT \
}
/**
@ -1569,7 +1569,7 @@ struct k_mutex {
int num_conflicts;
#endif
_DEBUG_TRACING_KERNEL_OBJECTS_NEXT_PTR(k_mutex);
_OBJECT_TRACING_NEXT_PTR(k_mutex);
};
#ifdef CONFIG_OBJECT_MONITOR
@ -1586,7 +1586,7 @@ struct k_mutex {
.lock_count = 0, \
.owner_orig_prio = K_LOWEST_THREAD_PRIO, \
_MUTEX_INIT_OBJECT_MONITOR \
_DEBUG_TRACING_KERNEL_OBJECTS_INIT \
_OBJECT_TRACING_INIT \
}
/**
@ -1675,7 +1675,7 @@ struct k_sem {
unsigned int count;
unsigned int limit;
_DEBUG_TRACING_KERNEL_OBJECTS_NEXT_PTR(k_sem);
_OBJECT_TRACING_NEXT_PTR(k_sem);
};
#define K_SEM_INITIALIZER(obj, initial_count, count_limit) \
@ -1683,7 +1683,7 @@ struct k_sem {
.wait_q = SYS_DLIST_STATIC_INIT(&obj.wait_q), \
.count = initial_count, \
.limit = count_limit, \
_DEBUG_TRACING_KERNEL_OBJECTS_INIT \
_OBJECT_TRACING_INIT \
}
/**
@ -1832,7 +1832,7 @@ struct k_alert {
struct k_work work_item;
struct k_sem sem;
_DEBUG_TRACING_KERNEL_OBJECTS_NEXT_PTR(k_alert);
_OBJECT_TRACING_NEXT_PTR(k_alert);
};
extern void _alert_deliver(struct k_work *work);
@ -1843,7 +1843,7 @@ extern void _alert_deliver(struct k_work *work);
.send_count = ATOMIC_INIT(0), \
.work_item = K_WORK_INITIALIZER(_alert_deliver), \
.sem = K_SEM_INITIALIZER(obj.sem, 0, max_num_pending_alerts), \
_DEBUG_TRACING_KERNEL_OBJECTS_INIT \
_OBJECT_TRACING_INIT \
}
/**
@ -1943,7 +1943,7 @@ struct k_msgq {
char *write_ptr;
uint32_t used_msgs;
_DEBUG_TRACING_KERNEL_OBJECTS_NEXT_PTR(k_msgq);
_OBJECT_TRACING_NEXT_PTR(k_msgq);
};
#define K_MSGQ_INITIALIZER(obj, q_buffer, q_msg_size, q_max_msgs) \
@ -1956,7 +1956,7 @@ struct k_msgq {
.read_ptr = q_buffer, \
.write_ptr = q_buffer, \
.used_msgs = 0, \
_DEBUG_TRACING_KERNEL_OBJECTS_INIT \
_OBJECT_TRACING_INIT \
}
/**
@ -2156,14 +2156,14 @@ struct k_mbox {
_wait_q_t tx_msg_queue;
_wait_q_t rx_msg_queue;
_DEBUG_TRACING_KERNEL_OBJECTS_NEXT_PTR(k_mbox);
_OBJECT_TRACING_NEXT_PTR(k_mbox);
};
#define K_MBOX_INITIALIZER(obj) \
{ \
.tx_msg_queue = SYS_DLIST_STATIC_INIT(&obj.tx_msg_queue), \
.rx_msg_queue = SYS_DLIST_STATIC_INIT(&obj.rx_msg_queue), \
_DEBUG_TRACING_KERNEL_OBJECTS_INIT \
_OBJECT_TRACING_INIT \
}
/**
@ -2327,7 +2327,7 @@ struct k_pipe {
_wait_q_t writers; /* Writer wait queue */
} wait_q;
_DEBUG_TRACING_KERNEL_OBJECTS_NEXT_PTR(k_pipe);
_OBJECT_TRACING_NEXT_PTR(k_pipe);
};
#define K_PIPE_INITIALIZER(obj, pipe_buffer, pipe_buffer_size) \
@ -2339,7 +2339,7 @@ struct k_pipe {
.write_index = 0, \
.wait_q.writers = SYS_DLIST_STATIC_INIT(&obj.wait_q.writers), \
.wait_q.readers = SYS_DLIST_STATIC_INIT(&obj.wait_q.readers), \
_DEBUG_TRACING_KERNEL_OBJECTS_INIT \
_OBJECT_TRACING_INIT \
}
/**
@ -2466,7 +2466,7 @@ struct k_mem_slab {
char *free_list;
uint32_t num_used;
_DEBUG_TRACING_KERNEL_OBJECTS_NEXT_PTR(k_mem_slab);
_OBJECT_TRACING_NEXT_PTR(k_mem_slab);
};
#define K_MEM_SLAB_INITIALIZER(obj, slab_buffer, slab_block_size, \
@ -2478,7 +2478,7 @@ struct k_mem_slab {
.buffer = slab_buffer, \
.free_list = NULL, \
.num_used = 0, \
_DEBUG_TRACING_KERNEL_OBJECTS_INIT \
_OBJECT_TRACING_INIT \
}
/**
@ -2648,7 +2648,7 @@ struct k_mem_pool {
struct k_mem_pool_block_set *block_set;
char *bufblock;
_wait_q_t wait_q;
_DEBUG_TRACING_KERNEL_OBJECTS_NEXT_PTR(k_mem_pool);
_OBJECT_TRACING_NEXT_PTR(k_mem_pool);
};
#ifdef CONFIG_ARM

2
include/misc/ring_buffer.h
View file

@ -43,7 +43,7 @@ struct ring_buf {
uint32_t size; /**< Size of buf in 32-bit chunks */
uint32_t *buf; /**< Memory region for stored entries */
uint32_t mask; /**< Modulo mask if size is a power of 2 */
#ifdef CONFIG_DEBUG_TRACING_KERNEL_OBJECTS
#ifdef CONFIG_OBJECT_TRACING
struct ring_buf *__next;
#endif
};

4
kernel/alert.c
View file

@ -32,7 +32,7 @@ extern struct k_alert _k_alert_list_end[];
struct k_alert *_trace_list_k_alert;
#ifdef CONFIG_DEBUG_TRACING_KERNEL_OBJECTS
#ifdef CONFIG_OBJECT_TRACING
/*
* Complete initialization of statically defined alerts.
@ -51,7 +51,7 @@ static int init_alert_module(struct device *dev)
SYS_INIT(init_alert_module, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_OBJECTS);
#endif /* CONFIG_DEBUG_TRACING_KERNEL_OBJECTS */
#endif /* CONFIG_OBJECT_TRACING */
void _alert_deliver(struct k_work *work)
{

4
kernel/fifo.c
View file

@ -36,7 +36,7 @@ extern struct k_fifo _k_fifo_list_end[];
struct k_fifo *_trace_list_k_fifo;
#ifdef CONFIG_DEBUG_TRACING_KERNEL_OBJECTS
#ifdef CONFIG_OBJECT_TRACING
/*
* Complete initialization of statically defined fifos.
@ -55,7 +55,7 @@ static int init_fifo_module(struct device *dev)
SYS_INIT(init_fifo_module, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_OBJECTS);
#endif /* CONFIG_DEBUG_TRACING_KERNEL_OBJECTS */
#endif /* CONFIG_OBJECT_TRACING */
void k_fifo_init(struct k_fifo *fifo)
{

4
kernel/lifo.c
View file

@ -33,7 +33,7 @@ extern struct k_lifo _k_lifo_list_end[];
struct k_lifo *_trace_list_k_lifo;
#ifdef CONFIG_DEBUG_TRACING_KERNEL_OBJECTS
#ifdef CONFIG_OBJECT_TRACING
/*
* Complete initialization of statically defined lifos.
@ -52,7 +52,7 @@ static int init_lifo_module(struct device *dev)
SYS_INIT(init_lifo_module, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_OBJECTS);
#endif /* CONFIG_DEBUG_TRACING_KERNEL_OBJECTS */
#endif /* CONFIG_OBJECT_TRACING */
void k_lifo_init(struct k_lifo *lifo)
{

8
kernel/mailbox.c
View file

@ -63,7 +63,7 @@ extern struct k_mbox _k_mbox_list_end[];
struct k_mbox *_trace_list_k_mbox;
#if (CONFIG_NUM_MBOX_ASYNC_MSGS > 0) || \
defined(CONFIG_DEBUG_TRACING_KERNEL_OBJECTS)
defined(CONFIG_OBJECT_TRACING)
/*
* Do run-time initialization of mailbox object subsystem.
@ -95,20 +95,20 @@ static int init_mbox_module(struct device *dev)
/* Complete initialization of statically defined mailboxes. */
#ifdef CONFIG_DEBUG_TRACING_KERNEL_OBJECTS
#ifdef CONFIG_OBJECT_TRACING
struct k_mbox *mbox;
for (mbox = _k_mbox_list_start; mbox < _k_mbox_list_end; mbox++) {
SYS_TRACING_OBJ_INIT(k_mbox, mbox);
}
#endif /* CONFIG_DEBUG_TRACING_KERNEL_OBJECTS */
#endif /* CONFIG_OBJECT_TRACING */
return 0;
}
SYS_INIT(init_mbox_module, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_OBJECTS);
#endif /* CONFIG_NUM_MBOX_ASYNC_MSGS or CONFIG_DEBUG_TRACING_KERNEL_OBJECTS */
#endif /* CONFIG_NUM_MBOX_ASYNC_MSGS or CONFIG_OBJECT_TRACING */
void k_mbox_init(struct k_mbox *mbox_ptr)
{

4
kernel/msg_q.c
View file

@ -35,7 +35,7 @@ extern struct k_msgq _k_msgq_list_end[];
struct k_msgq *_trace_list_k_msgq;
#ifdef CONFIG_DEBUG_TRACING_KERNEL_OBJECTS
#ifdef CONFIG_OBJECT_TRACING
/*
* Complete initialization of statically defined message queues.
@ -54,7 +54,7 @@ static int init_msgq_module(struct device *dev)
SYS_INIT(init_msgq_module, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_OBJECTS);
#endif /* CONFIG_DEBUG_TRACING_KERNEL_OBJECTS */
#endif /* CONFIG_OBJECT_TRACING */
void k_msgq_init(struct k_msgq *q, char *buffer,
size_t msg_size, uint32_t max_msgs)

4
kernel/mutex.c
View file

@ -70,7 +70,7 @@ extern struct k_mutex _k_mutex_list_end[];
struct k_mutex *_trace_list_k_mutex;
#ifdef CONFIG_DEBUG_TRACING_KERNEL_OBJECTS
#ifdef CONFIG_OBJECT_TRACING
/*
* Complete initialization of statically defined mutexes.
@ -89,7 +89,7 @@ static int init_mutex_module(struct device *dev)
SYS_INIT(init_mutex_module, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_OBJECTS);
#endif /* CONFIG_DEBUG_TRACING_KERNEL_OBJECTS */
#endif /* CONFIG_OBJECT_TRACING */
void k_mutex_init(struct k_mutex *mutex)
{

8
kernel/pipes.c
View file

@ -88,7 +88,7 @@ static void _pipe_async_finish(struct k_pipe_async *async_desc)
#endif /* CONFIG_NUM_PIPE_ASYNC_MSGS > 0 */
#if (CONFIG_NUM_PIPE_ASYNC_MSGS > 0) || \
defined(CONFIG_DEBUG_TRACING_KERNEL_OBJECTS)
defined(CONFIG_OBJECT_TRACING)
/*
* Do run-time initialization of pipe object subsystem.
@ -119,20 +119,20 @@ static int init_pipes_module(struct device *dev)
/* Complete initialization of statically defined mailboxes. */
#ifdef CONFIG_DEBUG_TRACING_KERNEL_OBJECTS
#ifdef CONFIG_OBJECT_TRACING
struct k_pipe *pipe;
for (pipe = _k_pipe_list_start; pipe < _k_pipe_list_end; pipe++) {
SYS_TRACING_OBJ_INIT(k_pipe, pipe);
}
#endif /* CONFIG_DEBUG_TRACING_KERNEL_OBJECTS */
#endif /* CONFIG_OBJECT_TRACING */
return 0;
}
SYS_INIT(init_pipes_module, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_OBJECTS);
#endif /* CONFIG_NUM_PIPE_ASYNC_MSGS or CONFIG_DEBUG_TRACING_KERNEL_OBJECTS */
#endif /* CONFIG_NUM_PIPE_ASYNC_MSGS or CONFIG_OBJECT_TRACING */
void k_pipe_init(struct k_pipe *pipe, unsigned char *buffer, size_t size)
{

4
kernel/sem.c
View file

@ -54,7 +54,7 @@ extern struct k_sem _k_sem_list_end[];
struct k_sem *_trace_list_k_sem;
#ifdef CONFIG_DEBUG_TRACING_KERNEL_OBJECTS
#ifdef CONFIG_OBJECT_TRACING
/*
* Complete initialization of statically defined semaphores.
@ -73,7 +73,7 @@ static int init_sem_module(struct device *dev)
SYS_INIT(init_sem_module, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_OBJECTS);
#endif /* CONFIG_DEBUG_TRACING_KERNEL_OBJECTS */
#endif /* CONFIG_OBJECT_TRACING */
void k_sem_init(struct k_sem *sem, unsigned int initial_count,
unsigned int limit)

4
kernel/stack.c
View file

@ -33,7 +33,7 @@ extern struct k_stack _k_stack_list_end[];
struct k_stack *_trace_list_k_stack;
#ifdef CONFIG_DEBUG_TRACING_KERNEL_OBJECTS
#ifdef CONFIG_OBJECT_TRACING
/*
* Complete initialization of statically defined stacks.
@ -52,7 +52,7 @@ static int init_stack_module(struct device *dev)
SYS_INIT(init_stack_module, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_OBJECTS);
#endif /* CONFIG_DEBUG_TRACING_KERNEL_OBJECTS */
#endif /* CONFIG_OBJECT_TRACING */
void k_stack_init(struct k_stack *stack, uint32_t *buffer, int num_entries)
{

4
kernel/timer.c
View file

@ -24,7 +24,7 @@ extern struct k_timer _k_timer_list_end[];
struct k_timer *_trace_list_k_timer;
#ifdef CONFIG_DEBUG_TRACING_KERNEL_OBJECTS
#ifdef CONFIG_OBJECT_TRACING
/*
* Complete initialization of statically defined timers.
@ -43,7 +43,7 @@ static int init_timer_module(struct device *dev)
SYS_INIT(init_timer_module, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_OBJECTS);
#endif /* CONFIG_DEBUG_TRACING_KERNEL_OBJECTS */
#endif /* CONFIG_OBJECT_TRACING */
/**
* @brief Handle expiration of a kernel timer object.

11
misc/Kconfig
View file

@ -202,12 +202,19 @@ config ASSERT_LEVEL
Level 2: on + no warning
config DEBUG_TRACING_KERNEL_OBJECTS
bool "Kernel object tracing (deprecated)"
select OBJECT_TRACING
default n
help
For backward compatibility only
config OBJECT_TRACING
bool
prompt "Debug tracing object"
prompt "Kernel object tracing"
default n
help
This option enable the feature for tracing kernel objects. This option
is for debug purposes and increase the memory footprint of the kernel.
is for debug purposes and increases the memory footprint of the kernel.
config OMIT_FRAME_POINTER
bool