ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripts/nvmf: Fix subsystem divide and format error

Browse Source 
Signed-off-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: I874c3a28c453737d0ba6ab42ec0d0a9fbc4719f7
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1679
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Maciej Wawryk 2020-04-03 16:30:04 +02:00 committed by Tomasz Zawadzki
parent 6397735bc9
commit 7c1e69b3fa
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/perf/nvmf/run_nvmf.py
View File

@ -338,6 +338,8 @@ runtime={run_time}
for cpu in cpus: for cpu in cpus:
if "-" in cpu: if "-" in cpu:
a, b = cpu.split("-") a, b = cpu.split("-")
a = int(a)
b = int(b)
cpus_num += len(range(a, b)) cpus_num += len(range(a, b))
else: else:
cpus_num += 1 cpus_num += 1
@ -690,7 +692,7 @@ class KernelInitiator(Initiator):
remainder = len(nvme_list) % threads remainder = len(nvme_list) % threads
iterator = iter(filenames) iterator = iter(filenames)
result = [] result = []
for i in range(threads): for i in range(len(threads)):
result.append([]) result.append([])
for j in range(nvme_per_split): for j in range(nvme_per_split):
result[i].append(next(iterator)) result[i].append(next(iterator))
@ -743,12 +745,14 @@ class SPDKInitiator(Initiator):
def gen_fio_filename_conf(self, subsystems, threads): def gen_fio_filename_conf(self, subsystems, threads):
filename_section = "" filename_section = ""
filenames = ["Nvme%sn1" % x for x in range(0, subsystems)] if len(threads) >= len(subsystems):
nvme_per_split = int(subsystems / threads) threads = range(0, len(subsystems))
remainder = subsystems % threads filenames = ["Nvme%sn1" % x for x in range(0, len(subsystems))]
nvme_per_split = int(len(subsystems) / len(threads))
remainder = len(subsystems) % len(threads)
iterator = iter(filenames) iterator = iter(filenames)
result = [] result = []
for i in range(threads): for i in range(len(threads)):
result.append([]) result.append([])
for j in range(nvme_per_split): for j in range(nvme_per_split):
result[i].append(next(iterator)) result[i].append(next(iterator))