From d56d0af493f7f168b9e13c405806e8e8638a6a6c Mon Sep 17 00:00:00 2001 From: Yonattan Louise Date: Mon, 27 Apr 2015 10:28:31 -0500 Subject: [PATCH] Rename WldT0 to _k_workload_t0 Updating global variable's name to follow a consistent naming convention. Change accomplished with the following script: #!/bin/bash echo "Searching for ${1} to replace with ${2}" find ./ \( -name "*.[chs]" -o -name "sysgen.py" -o -name "*.kconf" \) \ ! -path "./host/src/genIdt/*" \ ! -path "*/outdir/*" | xargs sed -i 's/\b'${1}'\b/'${2}'/g'; Change-Id: Ic1d437b33789369515aa7f29401be8d365eac279 Signed-off-by: Yonattan Louise --- kernel/microkernel/idle.c | 14 +++++++------- kernel/microkernel/include/kticks.h | 2 +- kernel/microkernel/timer/ticker.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kernel/microkernel/idle.c b/kernel/microkernel/idle.c index 8034296a7b8..7b923df58e7 100644 --- a/kernel/microkernel/idle.c +++ b/kernel/microkernel/idle.c @@ -50,7 +50,7 @@ task, depending on how the kernel is configured. unsigned int _k_workload_slice = 0x0; unsigned int _k_workload_ticks = 0x0; unsigned int _k_workload_ref_time = 0x0; -unsigned int WldT0 = 0x0; +unsigned int _k_workload_t0 = 0x0; unsigned int WldT1 = 0x0; volatile unsigned int WldN0 = 0x0; volatile unsigned int WldN1 = 0x0; @@ -116,16 +116,16 @@ void wlMonitorCalibrate(void) WldN0 = Wld_i = 0; WldN1 = 1000; - WldT0 = timer_read(); + _k_workload_t0 = timer_read(); _WlLoop(); WldT1 = timer_read(); - WldTDelta = WldT1 - WldT0; + WldTDelta = WldT1 - _k_workload_t0; Wld_i0 = Wld_i; #ifdef WL_SCALE - _k_workload_ref_time = (WldT1 - WldT0) >> (K_wl_scale); + _k_workload_ref_time = (WldT1 - _k_workload_t0) >> (K_wl_scale); #else - _k_workload_ref_time = (WldT1 - WldT0) >> (4 + 6); + _k_workload_ref_time = (WldT1 - _k_workload_t0) >> (4 + 6); #endif _k_workload_slice = 100; @@ -143,9 +143,9 @@ void K_workload(struct k_args *P) k = (Wld_i - WldN0) * _k_workload_ref_time; #ifdef WL_SCALE - t = (timer_read() - WldT0) >> (K_wl_scale); + t = (timer_read() - _k_workload_t0) >> (K_wl_scale); #else - t = (timer_read() - WldT0) >> (4 + 6); + t = (timer_read() - _k_workload_t0) >> (4 + 6); #endif iret = MSEC_PER_SEC - k / t; diff --git a/kernel/microkernel/include/kticks.h b/kernel/microkernel/include/kticks.h index 7a51ef3582a..f45949293b4 100644 --- a/kernel/microkernel/include/kticks.h +++ b/kernel/microkernel/include/kticks.h @@ -42,7 +42,7 @@ extern int64_t _k_sys_clock_tick_count; extern unsigned int _k_workload_slice; extern unsigned int _k_workload_ticks; extern unsigned int _k_workload_ref_time; -extern unsigned int WldT0; +extern unsigned int _k_workload_t0; extern unsigned int WldT1; extern volatile unsigned int WldN0; extern volatile unsigned int WldN1; diff --git a/kernel/microkernel/timer/ticker.c b/kernel/microkernel/timer/ticker.c index 0e092b04960..aafdb3ae7de 100644 --- a/kernel/microkernel/timer/ticker.c +++ b/kernel/microkernel/timer/ticker.c @@ -137,7 +137,7 @@ static inline void _WlMonitorUpdate(void) { #ifdef CONFIG_WORKLOAD_MONITOR if (--_k_workload_ticks == 0) { - WldT0 = WldT1; + _k_workload_t0 = WldT1; WldT1 = timer_read(); WldN0 = WldN1; WldN1 = Wld_i - 1;