Commit 85b73447 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Shuah Khan
Browse files

selftests/resctrl: Move CAT/CMT test global vars to function they are used in 



CAT and CMT tests have count_of_bits, long_mask, cbm_mask, and
cache_size global variables that can be moved into the sole using
function.

Make the global variables local variables of the relevant function to
scope them better.

While at it, move cache_size initialization into the declaration line.

Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Tested-by: default avatarBabu Moger <babu.moger@amd.com>
Tested-by: default avatarShaopeng Tan (Fujitsu) <tan.shaopeng@fujitsu.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 8ee592a6

tools/testing/selftests/resctrl/cat_test.c

+4 −7
Original line number Diff line number Diff line
@@ -17,11 +17,6 @@ 
#define MAX_DIFF_PERCENT	4

#define MAX_DIFF		1000000



static int count_of_bits;

static char cbm_mask[256];

static unsigned long long_mask;

static unsigned long cache_size;



/*

 * Change schemata. Write schemata to specified

 * con_mon grp, mon_grp in resctrl FS.
@@ -96,10 +91,12 @@ int cat_perf_miss_val(int cpu_no, int n, char *cache_type) 
{

	unsigned long l_mask, l_mask_1;

	int ret, pipefd[2], sibling_cpu_no;

	unsigned long cache_size = 0;

	unsigned long long_mask;

	char cbm_mask[256];

	int count_of_bits;

	char pipe_message;



	cache_size = 0;



	/* Get default cbm mask for L3/L2 cache */

	ret = get_cbm_mask(cache_type, cbm_mask);

	if (ret)

tools/testing/selftests/resctrl/cmt_test.c

+4 −7
Original line number Diff line number Diff line
@@ -16,11 +16,6 @@ 
#define MAX_DIFF		2000000

#define MAX_DIFF_PERCENT	15



static int count_of_bits;

static char cbm_mask[256];

static unsigned long long_mask;

static unsigned long cache_size;



static int cmt_setup(struct resctrl_val_param *p)

{

	/* Run NUM_OF_RUNS times */
@@ -75,10 +70,12 @@ void cmt_test_cleanup(void) 


int cmt_resctrl_val(int cpu_no, int n, char **benchmark_cmd)

{

	unsigned long cache_size = 0;

	unsigned long long_mask;

	char cbm_mask[256];

	int count_of_bits;

	int ret;



	cache_size = 0;



	if (!validate_resctrl_feature_request(CMT_STR))

		return -1;