michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Rename WldT0 to _k_workload_t0

Browse source 
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 <yonattan.a.louise.mendoza@intel.com>
This commit is contained in:
Yonattan Louise 2015-04-27 10:28:31 -05:00 • committed by Anas Nashif
commit d56d0af493
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
kernel/microkernel/idle.c
View file

@ -50,7 +50,7 @@ task, depending on how the kernel is configured.
unsigned int _k_workload_slice = 0x0; unsigned int _k_workload_slice = 0x0;
unsigned int _k_workload_ticks = 0x0; unsigned int _k_workload_ticks = 0x0;
unsigned int _k_workload_ref_time = 0x0; unsigned int _k_workload_ref_time = 0x0;
unsigned int WldT0 = 0x0; unsigned int _k_workload_t0 = 0x0;
unsigned int WldT1 = 0x0; unsigned int WldT1 = 0x0;
volatile unsigned int WldN0 = 0x0; volatile unsigned int WldN0 = 0x0;
volatile unsigned int WldN1 = 0x0; volatile unsigned int WldN1 = 0x0;
@ -116,16 +116,16 @@ void wlMonitorCalibrate(void)
WldN0 = Wld_i = 0; WldN0 = Wld_i = 0;
WldN1 = 1000; WldN1 = 1000;
WldT0 = timer_read(); _k_workload_t0 = timer_read();
_WlLoop(); _WlLoop();
WldT1 = timer_read(); WldT1 = timer_read();
WldTDelta = WldT1 - WldT0; WldTDelta = WldT1 - _k_workload_t0;
Wld_i0 = Wld_i; Wld_i0 = Wld_i;
#ifdef WL_SCALE #ifdef WL_SCALE
_k_workload_ref_time = (WldT1 - WldT0) >> (K_wl_scale); _k_workload_ref_time = (WldT1 - _k_workload_t0) >> (K_wl_scale);
#else #else
_k_workload_ref_time = (WldT1 - WldT0) >> (4 + 6); _k_workload_ref_time = (WldT1 - _k_workload_t0) >> (4 + 6);
#endif #endif
_k_workload_slice = 100; _k_workload_slice = 100;
@ -143,9 +143,9 @@ void K_workload(struct k_args *P)
k = (Wld_i - WldN0) * _k_workload_ref_time; k = (Wld_i - WldN0) * _k_workload_ref_time;
#ifdef WL_SCALE #ifdef WL_SCALE
t = (timer_read() - WldT0) >> (K_wl_scale); t = (timer_read() - _k_workload_t0) >> (K_wl_scale);
#else #else
t = (timer_read() - WldT0) >> (4 + 6); t = (timer_read() - _k_workload_t0) >> (4 + 6);
#endif #endif
iret = MSEC_PER_SEC - k / t; iret = MSEC_PER_SEC - k / t;

2
kernel/microkernel/include/kticks.h
View file

@ -42,7 +42,7 @@ extern int64_t _k_sys_clock_tick_count;
extern unsigned int _k_workload_slice; extern unsigned int _k_workload_slice;
extern unsigned int _k_workload_ticks; extern unsigned int _k_workload_ticks;
extern unsigned int _k_workload_ref_time; extern unsigned int _k_workload_ref_time;
extern unsigned int WldT0; extern unsigned int _k_workload_t0;
extern unsigned int WldT1; extern unsigned int WldT1;
extern volatile unsigned int WldN0; extern volatile unsigned int WldN0;
extern volatile unsigned int WldN1; extern volatile unsigned int WldN1;

2
kernel/microkernel/timer/ticker.c
View file

@ -137,7 +137,7 @@ static inline void _WlMonitorUpdate(void)
{ {
#ifdef CONFIG_WORKLOAD_MONITOR #ifdef CONFIG_WORKLOAD_MONITOR
if (--_k_workload_ticks == 0) { if (--_k_workload_ticks == 0) {
WldT0 = WldT1; _k_workload_t0 = WldT1;
WldT1 = timer_read(); WldT1 = timer_read();
WldN0 = WldN1; WldN0 = WldN1;
WldN1 = Wld_i - 1; WldN1 = Wld_i - 1;