michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Rename WldT1 to _k_workload_t1

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

10
kernel/microkernel/idle.c
View file

@ -51,7 +51,7 @@ 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 _k_workload_t0 = 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 WldN0 = 0x0;
volatile unsigned int WldN1 = 0x0; volatile unsigned int WldN1 = 0x0;
volatile unsigned int Wld_i = 0x0; volatile unsigned int Wld_i = 0x0;
@ -118,14 +118,14 @@ void wlMonitorCalibrate(void)
_k_workload_t0 = timer_read(); _k_workload_t0 = timer_read();
_WlLoop(); _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; Wld_i0 = Wld_i;
#ifdef WL_SCALE #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 #else
_k_workload_ref_time = (WldT1 - _k_workload_t0) >> (4 + 6); _k_workload_ref_time = (_k_workload_t1 - _k_workload_t0) >> (4 + 6);
#endif #endif
_k_workload_slice = 100; _k_workload_slice = 100;

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

@ -43,7 +43,7 @@ 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 _k_workload_t0; 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 WldN0;
extern volatile unsigned int WldN1; extern volatile unsigned int WldN1;
extern volatile unsigned int Wld_i; extern volatile unsigned int Wld_i;

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

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