diff --git a/kernel/microkernel/idle.c b/kernel/microkernel/idle.c index 7b923df58e7..72188d0fecf 100644 --- a/kernel/microkernel/idle.c +++ b/kernel/microkernel/idle.c @@ -51,7 +51,7 @@ unsigned int _k_workload_slice = 0x0; unsigned int _k_workload_ticks = 0x0; unsigned int _k_workload_ref_time = 0x0; unsigned int _k_workload_t0 = 0x0; -unsigned int WldT1 = 0x0; +unsigned int _k_workload_t1 = 0x0; volatile unsigned int WldN0 = 0x0; volatile unsigned int WldN1 = 0x0; volatile unsigned int Wld_i = 0x0; @@ -118,14 +118,14 @@ void wlMonitorCalibrate(void) _k_workload_t0 = timer_read(); _WlLoop(); - WldT1 = timer_read(); + _k_workload_t1 = timer_read(); - WldTDelta = WldT1 - _k_workload_t0; + WldTDelta = _k_workload_t1 - _k_workload_t0; Wld_i0 = Wld_i; #ifdef WL_SCALE - _k_workload_ref_time = (WldT1 - _k_workload_t0) >> (K_wl_scale); + _k_workload_ref_time = (_k_workload_t1 - _k_workload_t0) >> (K_wl_scale); #else - _k_workload_ref_time = (WldT1 - _k_workload_t0) >> (4 + 6); + _k_workload_ref_time = (_k_workload_t1 - _k_workload_t0) >> (4 + 6); #endif _k_workload_slice = 100; diff --git a/kernel/microkernel/include/kticks.h b/kernel/microkernel/include/kticks.h index f45949293b4..5ee4e45e79c 100644 --- a/kernel/microkernel/include/kticks.h +++ b/kernel/microkernel/include/kticks.h @@ -43,7 +43,7 @@ extern unsigned int _k_workload_slice; extern unsigned int _k_workload_ticks; extern unsigned int _k_workload_ref_time; extern unsigned int _k_workload_t0; -extern unsigned int WldT1; +extern unsigned int _k_workload_t1; extern volatile unsigned int WldN0; extern volatile unsigned int WldN1; extern volatile unsigned int Wld_i; diff --git a/kernel/microkernel/timer/ticker.c b/kernel/microkernel/timer/ticker.c index aafdb3ae7de..c7c23d97162 100644 --- a/kernel/microkernel/timer/ticker.c +++ b/kernel/microkernel/timer/ticker.c @@ -137,8 +137,8 @@ static inline void _WlMonitorUpdate(void) { #ifdef CONFIG_WORKLOAD_MONITOR if (--_k_workload_ticks == 0) { - _k_workload_t0 = WldT1; - WldT1 = timer_read(); + _k_workload_t0 = _k_workload_t1; + _k_workload_t1 = timer_read(); WldN0 = WldN1; WldN1 = Wld_i - 1; _k_workload_ticks = _k_workload_slice;