From: Like Xu <likexu@xxxxxxxxxxx>
The current measure_one() forces the common case to pass in unnecessary
information in order to give flexibility to a single use case. It's just
syntatic sugar, but it really does help readers as it's not obvious that
the "1" specifies the number of events, whereas multiple_many() and
measure_one() are relatively self-explanatory.
Suggested-by: Sean Christopherson <seanjc@xxxxxxxxxx>
Signed-off-by: Like Xu <likexu@xxxxxxxxxxx>
---
x86/pmu.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/x86/pmu.c b/x86/pmu.c
index 817b4d0..277fa6c 100644
--- a/x86/pmu.c
+++ b/x86/pmu.c
@@ -181,7 +181,7 @@ static void stop_event(pmu_counter_t *evt)
evt->count = rdmsr(evt->ctr);
}
-static void measure(pmu_counter_t *evt, int count)
+static void multiple_many(pmu_counter_t *evt, int count)
{
int i;
for (i = 0; i < count; i++)
@@ -191,6 +191,11 @@ static void measure(pmu_counter_t *evt, int count)
stop_event(&evt[i]);
}
+static void measure_one(pmu_counter_t *evt)
+{
+ multiple_many(evt, 1);
+}
+
static void __measure(pmu_counter_t *evt, uint64_t count)
{
__start_event(evt, count);
@@ -220,7 +225,7 @@ static void check_gp_counter(struct pmu_event *evt)
int i;
for (i = 0; i < nr_gp_counters; i++, cnt.ctr++) {
- measure(&cnt, 1);
+ measure_one(&cnt);
report(verify_event(cnt.count, evt), "%s-%d", evt->name, i);
}
}
@@ -247,7 +252,7 @@ static void check_fixed_counters(void)
for (i = 0; i < nr_fixed_counters; i++) {
cnt.ctr = fixed_events[i].unit_sel;
- measure(&cnt, 1);
+ measure_one(&cnt);
report(verify_event(cnt.count, &fixed_events[i]), "fixed-%d", i);
}
}
@@ -274,7 +279,7 @@ static void check_counters_many(void)
n++;
}
- measure(cnt, n);
+ multiple_many(cnt, n);
for (i = 0; i < n; i++)
if (!verify_counter(&cnt[i]))
@@ -338,7 +343,7 @@ static void check_gp_counter_cmask(void)
.config = EVNTSEL_OS | EVNTSEL_USR | gp_events[1].unit_sel /* instructions */,
};
cnt.config |= (0x2 << EVNTSEL_CMASK_SHIFT);
- measure(&cnt, 1);
+ measure_one(&cnt);
report(cnt.count < gp_events[1].min, "cmask");
}
--
2.37.2
