@@ -3,7 +3,7 @@
#include <stdint.h>
#include "resctrl.h"
-struct read_format {
+struct perf_event_read {
__u64 nr; /* The number of events */
struct {
__u64 value; /* The value of the event */
@@ -11,11 +11,11 @@ struct read_format {
};
static struct perf_event_attr pea_llc_miss;
-static struct read_format rf_cqm;
-static int fd_lm;
+static struct perf_event_read pe_read;
+static int pe_fd;
char llc_occup_path[1024];
-static void initialize_perf_event_attr(void)
+static void perf_event_attr_initialize(void)
{
pea_llc_miss.type = PERF_TYPE_HARDWARE;
pea_llc_miss.size = sizeof(struct perf_event_attr);
@@ -29,31 +29,31 @@ static void initialize_perf_event_attr(void)
pea_llc_miss.disabled = 1;
}
-static void initialize_llc_perf(void)
+static void perf_event_initialize(void)
{
memset(&pea_llc_miss, 0, sizeof(struct perf_event_attr));
- memset(&rf_cqm, 0, sizeof(struct read_format));
+ memset(&pe_read, 0, sizeof(struct perf_event_read));
/* Initialize perf_event_attr structures for HW_CACHE_MISSES */
- initialize_perf_event_attr();
+ perf_event_attr_initialize();
pea_llc_miss.config = PERF_COUNT_HW_CACHE_MISSES;
- rf_cqm.nr = 1;
+ pe_read.nr = 1;
}
-static int reset_enable_llc_perf(pid_t pid, int cpu_no)
+static int perf_event_reset_enable(pid_t pid, int cpu_no)
{
- fd_lm = perf_event_open(&pea_llc_miss, pid, cpu_no, -1, PERF_FLAG_FD_CLOEXEC);
- if (fd_lm == -1) {
+ pe_fd = perf_event_open(&pea_llc_miss, pid, cpu_no, -1, PERF_FLAG_FD_CLOEXEC);
+ if (pe_fd == -1) {
perror("Error opening leader");
ctrlc_handler(0, NULL, NULL);
return -1;
}
/* Start counters to log values */
- ioctl(fd_lm, PERF_EVENT_IOC_RESET, 0);
- ioctl(fd_lm, PERF_EVENT_IOC_ENABLE, 0);
+ ioctl(pe_fd, PERF_EVENT_IOC_RESET, 0);
+ ioctl(pe_fd, PERF_EVENT_IOC_ENABLE, 0);
return 0;
}
@@ -122,28 +122,28 @@ static int print_results_cache(char *filename, int bm_pid, __u64 llc_value)
}
/*
- * measure_llc_perf: measure perf events
+ * perf_event_measure: measure perf events
* @bm_pid: child pid that runs benchmark
*
* Measure things like cache misses from perf events.
*
* Return: =0 on success. <0 on failure.
*/
-static int measure_llc_perf(struct resctrl_val_param *param, int bm_pid)
+static int perf_event_measure(struct resctrl_val_param *param, int bm_pid)
{
int ret;
/* Stop counters after one span to get miss rate */
- ioctl(fd_lm, PERF_EVENT_IOC_DISABLE, 0);
+ ioctl(pe_fd, PERF_EVENT_IOC_DISABLE, 0);
- ret = read(fd_lm, &rf_cqm, sizeof(struct read_format));
- close(fd_lm);
+ ret = read(pe_fd, &pe_read, sizeof(struct perf_event_read));
+ close(pe_fd);
if (ret == -1) {
perror("Could not get perf value");
return -1;
}
- return print_results_cache(param->filename, bm_pid, rf_cqm.values[0].value);
+ return print_results_cache(param->filename, bm_pid, pe_read.values[0].value);
}
int measure_llc_resctrl(struct resctrl_val_param *param, int bm_pid)
@@ -192,7 +192,7 @@ int cat_val(struct resctrl_val_param *param, size_t span)
if (ret)
return ret;
- initialize_llc_perf();
+ perf_event_initialize();
/* Test runs until the callback setup() tells the test to stop. */
while (1) {
@@ -203,7 +203,7 @@ int cat_val(struct resctrl_val_param *param, size_t span)
}
if (ret < 0)
break;
- ret = reset_enable_llc_perf(bm_pid, param->cpu_no);
+ ret = perf_event_reset_enable(bm_pid, param->cpu_no);
if (ret)
break;
@@ -214,7 +214,7 @@ int cat_val(struct resctrl_val_param *param, size_t span)
}
sleep(1);
- ret = measure_llc_perf(param, bm_pid);
+ ret = perf_event_measure(param, bm_pid);
if (ret)
goto pe_close;
}
@@ -222,7 +222,7 @@ int cat_val(struct resctrl_val_param *param, size_t span)
return ret;
pe_close:
- close(fd_lm);
+ close(pe_fd);
return ret;
}
Naming for perf event related functions, types, and variables is currently inconsistent. Make struct read_format and all functions related to perf events start with perf_event. Adjust variable names towards the same direction but use shorter names for variables where appropriate (pe prefix). Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> --- tools/testing/selftests/resctrl/cache.c | 46 ++++++++++++------------- 1 file changed, 23 insertions(+), 23 deletions(-)