Commit 7c1e69b3 authored by Maciej Wawryk's avatar Maciej Wawryk Committed by Tomasz Zawadzki
Browse files

scripts/nvmf: Fix subsystem divide and format error 



Signed-off-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: I874c3a28c453737d0ba6ab42ec0d0a9fbc4719f7
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1679


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 6397735b

scripts/perf/nvmf/run_nvmf.py

+9 −5
Original line number Diff line number Diff line
@@ -338,6 +338,8 @@ runtime={run_time} 
            for cpu in cpus:

                if "-" in cpu:

                    a, b = cpu.split("-")

                    a = int(a)

                    b = int(b)

                    cpus_num += len(range(a, b))

                else:

                    cpus_num += 1
@@ -690,7 +692,7 @@ class KernelInitiator(Initiator): 
        remainder = len(nvme_list) % threads

        iterator = iter(filenames)

        result = []

        for i in range(threads):

        for i in range(len(threads)):

            result.append([])

            for j in range(nvme_per_split):

                result[i].append(next(iterator))
@@ -743,12 +745,14 @@ class SPDKInitiator(Initiator): 


    def gen_fio_filename_conf(self, subsystems, threads):

        filename_section = ""

        filenames = ["Nvme%sn1" % x for x in range(0, subsystems)]

        nvme_per_split = int(subsystems / threads)

        remainder = subsystems % threads

        if len(threads) >= len(subsystems):

            threads = range(0, len(subsystems))

        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)

        result = []

        for i in range(threads):

        for i in range(len(threads)):

            result.append([])

            for j in range(nvme_per_split):

                result[i].append(next(iterator))