d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test/power: fix CPU frequency check

Browse Source 
Different drivers present the current cpu core frequency in different
sysfs files. Some present it in cpuinfo_cur_freq, some in scaling_cur_freq,
and some actually present it in both.

This patch attempts to open one, if that fails, tries the other.

Fixes: d550a8cc31 ("app/test: enhance power manager unit tests")
Cc: stable@dpdk.org

Signed-off-by: David Hunt <david.hunt@intel.com>
This commit is contained in:
David Hunt 2021-05-12 17:32:51 +01:00 committed by Thomas Monjalon
parent 705b04af1c
commit ff6dfb8e49
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/test/test_power_cpufreq.c
View File

@ -39,8 +39,10 @@ test_power_caps(void)
#define TEST_FREQ_ROUNDING_DELTA 50000
#define TEST_ROUND_FREQ_TO_N_100000 100000
#define TEST_POWER_SYSFILE_CUR_FREQ \
#define TEST_POWER_SYSFILE_CPUINFO_FREQ \
"/sys/devices/system/cpu/cpu%u/cpufreq/cpuinfo_cur_freq"
#define TEST_POWER_SYSFILE_SCALING_FREQ \
"/sys/devices/system/cpu/cpu%u/cpufreq/scaling_cur_freq"
static uint32_t total_freq_num;
static uint32_t freqs[TEST_POWER_FREQS_NUM_MAX];
@ -58,12 +60,19 @@ check_cur_freq(unsigned lcore_id, uint32_t idx)
int i;
if (snprintf(fullpath, sizeof(fullpath),
TEST_POWER_SYSFILE_CUR_FREQ, lcore_id) < 0) {
TEST_POWER_SYSFILE_SCALING_FREQ, lcore_id) < 0) {
return 0;
}
f = fopen(fullpath, "r");
if (f == NULL) {
return 0;
if (snprintf(fullpath, sizeof(fullpath),
TEST_POWER_SYSFILE_CPUINFO_FREQ, lcore_id) < 0) {
return 0;
}
f = fopen(fullpath, "r");
if (f == NULL) {
return 0;
}
}
for (i = 0; i < MAX_LOOP; i++) {
fflush(f);