michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Rename Wld_i0 to _k_workload_i0

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

4
kernel/microkernel/idle.c
View file

@ -55,7 +55,7 @@ unsigned int _k_workload_t1 = 0x0;
volatile unsigned int _k_workload_n0 = 0x0; volatile unsigned int _k_workload_n0 = 0x0;
volatile unsigned int _k_workload_n1 = 0x0; volatile unsigned int _k_workload_n1 = 0x0;
volatile unsigned int _k_workload_i = 0x0; volatile unsigned int _k_workload_i = 0x0;
volatile unsigned int Wld_i0 = 0x0; volatile unsigned int _k_workload_i0 = 0x0;
volatile unsigned int WldTDelta = 0x0; volatile unsigned int WldTDelta = 0x0;
volatile unsigned int WldT_start = 0x0; volatile unsigned int WldT_start = 0x0;
volatile unsigned int WldT_end = 0x0; volatile unsigned int WldT_end = 0x0;
@ -121,7 +121,7 @@ void wlMonitorCalibrate(void)
_k_workload_t1 = timer_read(); _k_workload_t1 = timer_read();
WldTDelta = _k_workload_t1 - _k_workload_t0; WldTDelta = _k_workload_t1 - _k_workload_t0;
Wld_i0 = _k_workload_i; _k_workload_i0 = _k_workload_i;
#ifdef WL_SCALE #ifdef WL_SCALE
_k_workload_ref_time = (_k_workload_t1 - _k_workload_t0) >> (K_wl_scale); _k_workload_ref_time = (_k_workload_t1 - _k_workload_t0) >> (K_wl_scale);
#else #else

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

@ -47,7 +47,7 @@ extern unsigned int _k_workload_t1;
extern volatile unsigned int _k_workload_n0; extern volatile unsigned int _k_workload_n0;
extern volatile unsigned int _k_workload_n1; extern volatile unsigned int _k_workload_n1;
extern volatile unsigned int _k_workload_i; extern volatile unsigned int _k_workload_i;
extern volatile unsigned int Wld_i0; extern volatile unsigned int _k_workload_i0;
extern volatile unsigned int WldTDelta; extern volatile unsigned int WldTDelta;
extern volatile unsigned int WldT_start; extern volatile unsigned int WldT_start;
extern volatile unsigned int WldT_end; extern volatile unsigned int WldT_end;

4
kernel/nanokernel/core/microk.c
View file

@ -143,7 +143,7 @@ FUNC_NORETURN void K_swapper(int parameter1, /* not used */
* power save mode * power save mode
*/ */
extern volatile unsigned int _k_workload_i; extern volatile unsigned int _k_workload_i;
extern volatile unsigned int Wld_i0; extern volatile unsigned int _k_workload_i0;
extern volatile unsigned int WldTDelta; extern volatile unsigned int WldTDelta;
extern volatile unsigned int WldT_start; extern volatile unsigned int WldT_start;
extern volatile unsigned int WldT_end; extern volatile unsigned int WldT_end;
@ -153,7 +153,7 @@ FUNC_NORETURN void K_swapper(int parameter1, /* not used */
} }
if (_k_current_task->Ident == 0x00000000) { if (_k_current_task->Ident == 0x00000000) {
WldT_end = timer_read(); WldT_end = timer_read();
_k_workload_i += (Wld_i0 * (WldT_end - WldT_start)) / _k_workload_i += (_k_workload_i0 * (WldT_end - WldT_start)) /
WldTDelta; WldTDelta;
} }
#endif #endif