tracing: ctf: add timer support (6a9540a7) · Commits · Wenxi XU / zephyr

include/zephyr/tracing/tracing.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -1823,8 +1823,10 @@
		/**
		* @brief Trace Timer start
		* @param timer Timer object
		* @param duration Timer duration
		* @param period Timer period
		*/
		#define sys_port_trace_k_timer_start(timer)
		#define sys_port_trace_k_timer_start(timer, duration, period)

		/**
		* @brief Trace Timer stop

include/zephyr/tracing/tracking.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@ extern struct k_queue *_track_list_k_queue;
		#define sys_port_track_k_mutex_init(mutex, ret) \
		sys_track_k_mutex_init(mutex)
		#define sys_port_track_k_timer_stop(timer)
		#define sys_port_track_k_timer_start(timer)
		#define sys_port_track_k_timer_start(timer, duration, period)
		#define sys_port_track_k_timer_init(timer) \
		sys_track_k_timer_init(timer)
		#define sys_port_track_k_queue_peek_tail(queue, ret)
		@@ -117,7 +117,7 @@ void sys_track_k_queue_init(struct k_queue *queue);
		#define sys_port_track_k_work_init(work)
		#define sys_port_track_k_mutex_init(mutex, ret)
		#define sys_port_track_k_timer_stop(timer)
		#define sys_port_track_k_timer_start(timer)
		#define sys_port_track_k_timer_start(timer, duration, period)
		#define sys_port_track_k_timer_init(timer)
		#define sys_port_track_k_queue_peek_tail(queue, ret)
		#define sys_port_track_k_queue_peek_head(queue, ret)

kernel/timer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -111,7 +111,7 @@ void k_timer_init(struct k_timer *timer,
		void z_impl_k_timer_start(struct k_timer *timer, k_timeout_t duration,
		k_timeout_t period)
		{
		SYS_PORT_TRACING_OBJ_FUNC(k_timer, start, timer);
		SYS_PORT_TRACING_OBJ_FUNC(k_timer, start, timer, duration, period);

		if (K_TIMEOUT_EQ(duration, K_FOREVER)) {
		return;

subsys/tracing/ctf/ctf_top.c

+27 −3

Original line number	Diff line number	Diff line
		@@ -274,24 +274,48 @@ void sys_trace_k_mutex_unlock_exit(struct k_mutex *mutex, int ret)
		}

		/* Timer */
		void sys_trace_k_timer_init(struct k_timer *timer, k_timer_expiry_t expiry_fn,
		k_timer_expiry_t stop_fn)
		void sys_trace_k_timer_init(struct k_timer *timer)
		{
		ctf_top_timer_init(
		(uint32_t)(uintptr_t)timer);
		}

		void sys_trace_k_timer_start(struct k_timer *timer, k_timeout_t duration,
		k_timeout_t period)
		{
		ctf_top_timer_start(
		(uint32_t)(uintptr_t)timer,
		k_ticks_to_us_floor32((uint32_t)duration.ticks),
		k_ticks_to_us_floor32((uint32_t)period.ticks)
		);
		}

		void sys_trace_k_timer_stop(struct k_timer *timer)
		{
		ctf_top_timer_stop(
		(uint32_t)(uintptr_t)timer
		);
		}

		void sys_trace_k_timer_status_sync_enter(struct k_timer *timer)
		{
		ctf_top_timer_status_sync_enter(
		(uint32_t)(uintptr_t)timer
		);
		}

		void sys_trace_k_timer_status_sync_blocking(struct k_timer *timer)
		void sys_trace_k_timer_status_sync_blocking(struct k_timer *timer, k_timeout_t timeout)
		{
		ctf_top_timer_status_sync_blocking(
		(uint32_t)(uintptr_t)timer,
		k_ticks_to_us_floor32((uint32_t)timeout.ticks)
		);
		}

		void sys_trace_k_timer_status_sync_exit(struct k_timer *timer, uint32_t result)
		{
		ctf_top_timer_status_sync_exit(
		(uint32_t)(uintptr_t)timer,
		result
		);
		}

subsys/tracing/ctf/ctf_top.h

+39 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,13 @@ typedef enum {
		CTF_EVENT_MUTEX_LOCK_EXIT = 0x2B,
		CTF_EVENT_MUTEX_UNLOCK_ENTER = 0x2C,
		CTF_EVENT_MUTEX_UNLOCK_EXIT = 0x2D,
		CTF_EVENT_TIMER_INIT = 0x2E,
		CTF_EVENT_TIMER_START = 0x2F,
		CTF_EVENT_TIMER_STOP = 0x30,
		CTF_EVENT_TIMER_STATUS_SYNC_ENTER = 0x31,
		CTF_EVENT_TIMER_STATUS_SYNC_BLOCKING = 0x32,
		CTF_EVENT_TIMER_STATUS_SYNC_EXIT = 0x33

		} ctf_event_t;

		typedef struct {
		@@ -290,4 +297,36 @@ static inline void ctf_top_mutex_unlock_exit(uint32_t mutex_id, int32_t ret)
		CTF_EVENT(CTF_LITERAL(uint8_t, CTF_EVENT_MUTEX_UNLOCK_EXIT), mutex_id);
		}

		/* Timer */
		static inline void ctf_top_timer_init(uint32_t timer)
		{
		CTF_EVENT(CTF_LITERAL(uint8_t, CTF_EVENT_TIMER_INIT), timer);
		}

		static inline void ctf_top_timer_start(uint32_t timer, uint32_t duration, uint32_t period)
		{
		CTF_EVENT(CTF_LITERAL(uint8_t, CTF_EVENT_TIMER_START), timer, duration, period);
		}

		static inline void ctf_top_timer_stop(uint32_t timer)
		{
		CTF_EVENT(CTF_LITERAL(uint8_t, CTF_EVENT_TIMER_STOP), timer);
		}

		static inline void ctf_top_timer_status_sync_enter(uint32_t timer)
		{
		CTF_EVENT(CTF_LITERAL(uint8_t, CTF_EVENT_TIMER_STATUS_SYNC_ENTER), timer);
		}

		static inline void ctf_top_timer_status_sync_blocking(uint32_t timer, uint32_t timeout)
		{
		CTF_EVENT(CTF_LITERAL(uint8_t, CTF_EVENT_TIMER_STATUS_SYNC_BLOCKING), timer, timeout);
		}

		static inline void ctf_top_timer_status_sync_exit(uint32_t timer, uint32_t result)
		{
		CTF_EVENT(CTF_LITERAL(uint8_t, CTF_EVENT_TIMER_STATUS_SYNC_EXIT), timer, result);
		}


		#endif /* SUBSYS_DEBUG_TRACING_CTF_TOP_H */

Admin message