MINOR: freq_ctr: unify freq_ctr and freq_ctr_period into freq_ctr
Both structures are identical except the name of the field starting
the period and its description. Let's call them all freq_ctr and the
period's start "curr_tick" which is generic.
This is only a temporary change and fields are expected to remain
the same with no code change (verified).
diff --git a/src/freq_ctr.c b/src/freq_ctr.c
index d68a784..3d14163 100644
--- a/src/freq_ctr.c
+++ b/src/freq_ctr.c
@@ -37,7 +37,7 @@
__ha_compiler_barrier();
_past = ctr->prev_ctr;
__ha_compiler_barrier();
- _curr_sec = ctr->curr_sec;
+ _curr_sec = ctr->curr_tick;
__ha_compiler_barrier();
if (_curr_sec & 0x80000000)
continue;
@@ -45,7 +45,7 @@
__ha_compiler_barrier();
past = ctr->prev_ctr;
__ha_compiler_barrier();
- curr_sec = ctr->curr_sec;
+ curr_sec = ctr->curr_tick;
__ha_compiler_barrier();
if (_curr == curr && _past == past && _curr_sec == curr_sec)
break;
@@ -80,7 +80,7 @@
__ha_compiler_barrier();
_past = ctr->prev_ctr;
__ha_compiler_barrier();
- _curr_sec = ctr->curr_sec;
+ _curr_sec = ctr->curr_tick;
__ha_compiler_barrier();
if (_curr_sec & 0x80000000)
continue;
@@ -88,7 +88,7 @@
__ha_compiler_barrier();
past = ctr->prev_ctr;
__ha_compiler_barrier();
- curr_sec = ctr->curr_sec;
+ curr_sec = ctr->curr_tick;
__ha_compiler_barrier();
if (_curr == curr && _past == past && _curr_sec == curr_sec)
break;
@@ -127,7 +127,7 @@
__ha_compiler_barrier();
_past = ctr->prev_ctr;
__ha_compiler_barrier();
- _curr_sec = ctr->curr_sec;
+ _curr_sec = ctr->curr_tick;
__ha_compiler_barrier();
if (_curr_sec & 0x80000000)
continue;
@@ -135,7 +135,7 @@
__ha_compiler_barrier();
past = ctr->prev_ctr;
__ha_compiler_barrier();
- curr_sec = ctr->curr_sec;
+ curr_sec = ctr->curr_tick;
__ha_compiler_barrier();
if (_curr == curr && _past == past && _curr_sec == curr_sec)
break;
@@ -176,7 +176,7 @@
* read_freq_ctr_period() to avoid reporting ups and downs on low-frequency
* events when the past value is <= 1.
*/
-ullong freq_ctr_total(struct freq_ctr_period *ctr, uint period, int pend)
+ullong freq_ctr_total(struct freq_ctr *ctr, uint period, int pend)
{
ullong curr, past;
uint curr_tick;