Commit 0eec19d7 authored by Karol Latecki's avatar Karol Latecki Committed by Tomasz Zawadzki
Browse files

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: default avatarKarol Latecki <karol.latecki@intel.com>
Change-Id: I671887d4d232821c0de19eb338150d30201be204
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12525


Reviewed-by: default avatarPawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: default avatarKamil Godzwon <kamilx.godzwon@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 6acfe379

scripts/perf/nvmf/run_nvmf.py

+4 −4
Original line number Diff line number Diff line
@@ -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: