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

selftests/resctrl: Move ->setup() call outside of test specific branches 



resctrl_val() function is called only by MBM, MBA, and CMT tests which
means the else branch is never used.

Both test branches call param->setup().

Remove the unused else branch and place the ->setup() call outside of
the test specific branches reducing code duplication.

Co-developed-by: default avatarFenghua Yu <fenghua.yu@intel.com>
Signed-off-by: default avatarFenghua Yu <fenghua.yu@intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 22a8be28

tools/testing/selftests/resctrl/resctrl_val.c

+6 −13
Original line number Diff line number Diff line
@@ -734,29 +734,22 @@ int resctrl_val(char **benchmark_cmd, struct resctrl_val_param *param) 


	/* Test runs until the callback setup() tells the test to stop. */

	while (1) {

		if (!strncmp(resctrl_val, MBM_STR, sizeof(MBM_STR)) ||

		    !strncmp(resctrl_val, MBA_STR, sizeof(MBA_STR))) {

		ret = param->setup(1, param);

		if (ret) {

			ret = 0;

			break;

		}



		if (!strncmp(resctrl_val, MBM_STR, sizeof(MBM_STR)) ||

		    !strncmp(resctrl_val, MBA_STR, sizeof(MBA_STR))) {

			ret = measure_vals(param, &bw_resc_start);

			if (ret)

				break;

		} else if (!strncmp(resctrl_val, CMT_STR, sizeof(CMT_STR))) {

			ret = param->setup(1, param);

			if (ret) {

				ret = 0;

				break;

			}

			sleep(1);

			ret = measure_cache_vals(param, bm_pid);

			if (ret)

				break;

		} else {

			break;

		}

	}