From 0eec19d740fcdc53af1653fe88712bbeea71cc1f Mon Sep 17 00:00:00 2001 From: Karol Latecki Date: Thu, 5 May 2022 11:26:44 +0200 Subject: [PATCH] scripts/nvmf_perf: move sar file name into function Move sar output file generation into measure_sar function and pass a file name prefix instead. More than one file will be created by the function based on that prefix. Signed-off-by: Karol Latecki Change-Id: I671887d4d232821c0de19eb338150d30201be204 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12525 Reviewed-by: Pawel Piatek Reviewed-by: Kamil Godzwon Reviewed-by: Tomasz Zawadzki Reviewed-by: Jim Harris Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins --- scripts/perf/nvmf/run_nvmf.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/perf/nvmf/run_nvmf.py b/scripts/perf/nvmf/run_nvmf.py index 22265f8c0..70ef6b6ce 100755 --- a/scripts/perf/nvmf/run_nvmf.py +++ b/scripts/perf/nvmf/run_nvmf.py @@ -585,9 +585,10 @@ class Target(Server): fh.write(row + "\n") self.log_print("You can find the test results in the file %s" % os.path.join(results_dir, csv_file)) - def measure_sar(self, results_dir, sar_file_name): + def measure_sar(self, results_dir, sar_file_prefix): cpu_number = os.cpu_count() sar_idle_sum = 0 + sar_file_name = sar_file_prefix + ".txt" self.log_print("Waiting %d seconds for ramp-up to finish before measuring SAR stats" % self.sar_delay) time.sleep(self.sar_delay) @@ -1526,9 +1527,8 @@ if __name__ == "__main__": t = threading.Thread(target=i.run_fio, args=(cfg, fio_run_num)) threads.append(t) if target_obj.enable_sar: - sar_file_name = "_".join([str(block_size), str(rw), str(io_depth), "sar"]) - sar_file_name = ".".join([sar_file_name, "txt"]) - t = threading.Thread(target=target_obj.measure_sar, args=(args.results, sar_file_name)) + sar_file_prefix = "%s_%s_%s_sar" % (block_size, rw, io_depth) + t = threading.Thread(target=target_obj.measure_sar, args=(args.results, sar_file_prefix)) threads.append(t) if target_obj.enable_pcm: