From e6654103ba0043166a2ad1d038d4d0d0bad35d12 Mon Sep 17 00:00:00 2001 From: Andrew Boie Date: Sat, 21 Sep 2019 16:55:55 -0700 Subject: [PATCH] kernel: rename boot time globals These are renamed to z_timestamp_main and z_timestamp_idle, and now specified in kernel_internal.h. Signed-off-by: Andrew Boie --- include/kernel.h | 5 ----- kernel/idle.c | 4 ++-- kernel/include/kernel_internal.h | 5 +++++ kernel/init.c | 6 +++--- tests/benchmarks/boot_time/src/main.c | 9 +++++---- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/include/kernel.h b/include/kernel.h index d3a3de4e48e..8ff4cd61b00 100644 --- a/include/kernel.h +++ b/include/kernel.h @@ -23,11 +23,6 @@ extern "C" { #endif -#ifdef CONFIG_BOOT_TIME_MEASUREMENT -extern u32_t __main_time_stamp; /* timestamp when main task starts */ -extern u32_t __idle_time_stamp; /* timestamp when CPU goes idle */ -#endif - /** * @brief Kernel APIs * @defgroup kernel_apis Kernel APIs diff --git a/kernel/idle.c b/kernel/idle.c index 3a9f9710b52..2bbdf16d464 100644 --- a/kernel/idle.c +++ b/kernel/idle.c @@ -147,9 +147,9 @@ void idle(void *unused1, void *unused2, void *unused3) #ifdef CONFIG_BOOT_TIME_MEASUREMENT /* record timestamp when idling begins */ - extern u32_t __idle_time_stamp; + extern u32_t z_timestamp_idle; - __idle_time_stamp = k_cycle_get_32(); + z_timestamp_idle = k_cycle_get_32(); #endif while (true) { diff --git a/kernel/include/kernel_internal.h b/kernel/include/kernel_internal.h index d2b47b7bf75..13fcb7dd88a 100644 --- a/kernel/include/kernel_internal.h +++ b/kernel/include/kernel_internal.h @@ -295,6 +295,11 @@ extern u64_t z_arch_timing_value_swap_common; extern u64_t z_arch_timing_value_swap_temp; #endif /* CONFIG_EXECUTION_BENCHMARKING */ +#ifdef CONFIG_BOOT_TIME_MEASUREMENT +extern u32_t z_timestamp_main; /* timestamp when main task starts */ +extern u32_t z_timestamp_idle; /* timestamp when CPU goes idle */ +#endif + #ifdef __cplusplus } #endif diff --git a/kernel/init.c b/kernel/init.c index 21e5456f800..8ecc7d0efd1 100644 --- a/kernel/init.c +++ b/kernel/init.c @@ -66,8 +66,8 @@ LOG_MODULE_REGISTER(os); /* boot time measurement items */ #ifdef CONFIG_BOOT_TIME_MEASUREMENT -u32_t __noinit __main_time_stamp; /* timestamp when main task starts */ -u32_t __noinit __idle_time_stamp; /* timestamp when CPU goes idle */ +u32_t __noinit z_timestamp_main; /* timestamp when main task starts */ +u32_t __noinit z_timestamp_idle; /* timestamp when CPU goes idle */ #endif /* init/main and idle threads */ @@ -283,7 +283,7 @@ static void bg_thread_main(void *unused1, void *unused2, void *unused3) #endif #ifdef CONFIG_BOOT_TIME_MEASUREMENT - __main_time_stamp = k_cycle_get_32(); + z_timestamp_main = k_cycle_get_32(); #endif extern void main(void); diff --git a/tests/benchmarks/boot_time/src/main.c b/tests/benchmarks/boot_time/src/main.c index 519009de641..f85a2956bf7 100644 --- a/tests/benchmarks/boot_time/src/main.c +++ b/tests/benchmarks/boot_time/src/main.c @@ -17,6 +17,7 @@ #include #include +#include void main(void) { @@ -34,17 +35,17 @@ void main(void) int freq = sys_clock_hw_cycles_per_sec() / 1000000; - main_us = __main_time_stamp / freq; + main_us = z_timestamp_main / freq; task_us = task_time_stamp / freq; - idle_us = __idle_time_stamp / freq; + idle_us = z_timestamp_idle / freq; TC_START("Boot Time Measurement"); TC_PRINT("Boot Result: Clock Frequency: %d MHz\n", freq); - TC_PRINT("_start->main(): %u cycles, %u us\n", __main_time_stamp, + TC_PRINT("_start->main(): %u cycles, %u us\n", z_timestamp_main, main_us); TC_PRINT("_start->task : %u cycles, %u us\n", task_time_stamp, task_us); - TC_PRINT("_start->idle : %u cycles, %u us\n", __idle_time_stamp, + TC_PRINT("_start->idle : %u cycles, %u us\n", z_timestamp_idle, idle_us); TC_PRINT("Boot Time Measurement finished\n");