mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-11 13:04:03 +08:00
selftests/resctrl: Don't use variable argument list for ->setup()
struct resctrl_val_param has ->setup() function that accepts variable argument list. All test cases use only 1 argument as input and it's the struct resctrl_val_param pointer. Instead of variable argument list, directly pass struct resctrl_val_param pointer as the only parameter to ->setup(). Co-developed-by: Fenghua Yu <fenghua.yu@intel.com> Signed-off-by: Fenghua Yu <fenghua.yu@intel.com> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Reviewed-by: Reinette Chatre <reinette.chatre@intel.com> Tested-by: Babu Moger <babu.moger@amd.com> Tested-by: Shaopeng Tan (Fujitsu) <tan.shaopeng@fujitsu.com> Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
This commit is contained in:
parent
7f3c980c77
commit
8ee592a638
@ -236,7 +236,7 @@ int cat_val(struct resctrl_val_param *param)
|
||||
/* Test runs until the callback setup() tells the test to stop. */
|
||||
while (1) {
|
||||
if (!strncmp(resctrl_val, CAT_STR, sizeof(CAT_STR))) {
|
||||
ret = param->setup(1, param);
|
||||
ret = param->setup(param);
|
||||
if (ret == END_OF_TESTS) {
|
||||
ret = 0;
|
||||
break;
|
||||
|
@ -27,17 +27,11 @@ static unsigned long cache_size;
|
||||
* con_mon grp, mon_grp in resctrl FS.
|
||||
* Run 5 times in order to get average values.
|
||||
*/
|
||||
static int cat_setup(int num, ...)
|
||||
static int cat_setup(struct resctrl_val_param *p)
|
||||
{
|
||||
struct resctrl_val_param *p;
|
||||
char schemata[64];
|
||||
va_list param;
|
||||
int ret = 0;
|
||||
|
||||
va_start(param, num);
|
||||
p = va_arg(param, struct resctrl_val_param *);
|
||||
va_end(param);
|
||||
|
||||
/* Run NUM_OF_RUNS times */
|
||||
if (p->num_of_runs >= NUM_OF_RUNS)
|
||||
return END_OF_TESTS;
|
||||
|
@ -21,15 +21,8 @@ static char cbm_mask[256];
|
||||
static unsigned long long_mask;
|
||||
static unsigned long cache_size;
|
||||
|
||||
static int cmt_setup(int num, ...)
|
||||
static int cmt_setup(struct resctrl_val_param *p)
|
||||
{
|
||||
struct resctrl_val_param *p;
|
||||
va_list param;
|
||||
|
||||
va_start(param, num);
|
||||
p = va_arg(param, struct resctrl_val_param *);
|
||||
va_end(param);
|
||||
|
||||
/* Run NUM_OF_RUNS times */
|
||||
if (p->num_of_runs >= NUM_OF_RUNS)
|
||||
return END_OF_TESTS;
|
||||
|
@ -22,18 +22,12 @@
|
||||
* con_mon grp, mon_grp in resctrl FS.
|
||||
* For each allocation, run 5 times in order to get average values.
|
||||
*/
|
||||
static int mba_setup(int num, ...)
|
||||
static int mba_setup(struct resctrl_val_param *p)
|
||||
{
|
||||
static int runs_per_allocation, allocation = 100;
|
||||
struct resctrl_val_param *p;
|
||||
char allocation_str[64];
|
||||
va_list param;
|
||||
int ret;
|
||||
|
||||
va_start(param, num);
|
||||
p = va_arg(param, struct resctrl_val_param *);
|
||||
va_end(param);
|
||||
|
||||
if (runs_per_allocation >= NUM_OF_RUNS)
|
||||
runs_per_allocation = 0;
|
||||
|
||||
|
@ -86,16 +86,10 @@ static int check_results(size_t span)
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int mbm_setup(int num, ...)
|
||||
static int mbm_setup(struct resctrl_val_param *p)
|
||||
{
|
||||
struct resctrl_val_param *p;
|
||||
va_list param;
|
||||
int ret = 0;
|
||||
|
||||
va_start(param, num);
|
||||
p = va_arg(param, struct resctrl_val_param *);
|
||||
va_end(param);
|
||||
|
||||
/* Run NUM_OF_RUNS times */
|
||||
if (p->num_of_runs >= NUM_OF_RUNS)
|
||||
return END_OF_TESTS;
|
||||
|
@ -3,7 +3,6 @@
|
||||
#ifndef RESCTRL_H
|
||||
#define RESCTRL_H
|
||||
#include <stdio.h>
|
||||
#include <stdarg.h>
|
||||
#include <math.h>
|
||||
#include <errno.h>
|
||||
#include <sched.h>
|
||||
@ -68,7 +67,7 @@ struct resctrl_val_param {
|
||||
char *bw_report;
|
||||
unsigned long mask;
|
||||
int num_of_runs;
|
||||
int (*setup)(int num, ...);
|
||||
int (*setup)(struct resctrl_val_param *param);
|
||||
};
|
||||
|
||||
#define MBM_STR "mbm"
|
||||
|
@ -759,7 +759,7 @@ int resctrl_val(char **benchmark_cmd, struct resctrl_val_param *param)
|
||||
|
||||
/* Test runs until the callback setup() tells the test to stop. */
|
||||
while (1) {
|
||||
ret = param->setup(1, param);
|
||||
ret = param->setup(param);
|
||||
if (ret == END_OF_TESTS) {
|
||||
ret = 0;
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user