From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 46748A0524 for ; Tue, 25 Feb 2020 11:35:08 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3FC72B62; Tue, 25 Feb 2020 11:35:08 +0100 (CET) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by dpdk.org (Postfix) with ESMTP id E9931B62 for ; Tue, 25 Feb 2020 11:35:06 +0100 (CET) Received: by mail-pl1-f176.google.com with SMTP id b22so5306766pls.12 for ; Tue, 25 Feb 2020 02:35:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=XPWNiFGnhSFEXOmEIY6m5Yk4PH1qY7UERbxve5V0pF8=; b=qAyykWam9fEaIB5HdMnTCqCfoHHqo1+KLACKW+jg2nI9qc6UnrHjSKe+NQfbbJT9u0 5VXl1EBBPh+FVmXvCK/ZcE/agj4lPoZYedlMJocSh1rQzB/U4kOs4RXvrPbZy6L/TUNy fI4aD/UWchrS9sOwaR1kby3ZGggNEt3VTYdf6xt6XgR8V3V2nP0tekf6frHv/VVWs2B+ U8VR1Kot/Co7IAydA1OdYfON3YcItLciJXdKHHwU3yroIpv2kVZcoiQR06MtUME8/NSg IaBo4EdLtrnsBmSFRlisLq43ECILsKh7YYk9Ovn/nMiiEyZeqIUWqpEsO0EkLP6I3nA1 EkWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=XPWNiFGnhSFEXOmEIY6m5Yk4PH1qY7UERbxve5V0pF8=; b=a85RhXb4PQ+Fodnb225piGK8yW7B2rEW3stuGgRUvc4HnM1aiyD5gtUWwwlfw+Vb7y aOBnnRf/2qyjpHtPv8JbzoUytX+ENnMovwz8Zcd6yXZGxaTBbENVn1R0XHvlxiqI2+C9 r+KG6ThLCS4qSDvsbIt61JqQ9P5GNcpYBulIRnM/D3nLPjYrw5lBLGRmgbXy80Wiqp+6 C68VShHUsSplYPGVj2Z1aYr3r8PpTNBtIlfiWqHXKQlet2qty8OfMUJO6h1woCEwUG6N f0wd3Tww0u+QPTGHYY/sE9YGqziTq+mpRk3qljuaj2F4cKpKJGDOEN14xaKHLSi0b/r7 D3QA== X-Gm-Message-State: APjAAAXa1zQN96iIlGQyv+E75wZOX6EpKpiixhG4G8//cIQGGlNH0XSi Hawnys8K4uoGuBLLEA1faydwVkMC X-Google-Smtp-Source: APXvYqwuy/2pWDsUq4i13/NOKsk5uv14dhEjIhD9qENmFhrZjFBooUQBmxwyhG+fpR+0Nc9Xj4StOA== X-Received: by 2002:a17:90b:3cc:: with SMTP id go12mr4365042pjb.89.1582626905885; Tue, 25 Feb 2020 02:35:05 -0800 (PST) Received: from localhost.localdomain ([2400:4050:c8c2:de00:35bc:b9a3:f404:3cf2]) by smtp.gmail.com with ESMTPSA id a10sm15819987pgk.71.2020.02.25.02.35.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 02:35:05 -0800 (PST) From: Yasufumi Ogawa To: spp@dpdk.org, ferruh.yigit@intel.com, yasufum.o@gmail.com Date: Tue, 25 Feb 2020 19:34:25 +0900 Message-Id: <20200225103446.8243-9-yasufum.o@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200225103446.8243-1-yasufum.o@gmail.com> References: <20200225103446.8243-1-yasufum.o@gmail.com> Subject: [spp] [PATCH 08/29] tools/sppc: update dev options of pktgen X-BeenThere: spp@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Soft Patch Panel List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: spp-bounces@dpdk.org Sender: "spp" Update options for vdevs of pktgen container app. Signed-off-by: Yasufumi Ogawa --- tools/sppc/app/pktgen.py | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/tools/sppc/app/pktgen.py b/tools/sppc/app/pktgen.py index 319557c..a7112e6 100755 --- a/tools/sppc/app/pktgen.py +++ b/tools/sppc/app/pktgen.py @@ -75,9 +75,16 @@ def main(): common.IMG_BASE_NAMES['pktgen'], args.dist_name, args.dist_ver) - # Setup for vhost devices with given device IDs. - dev_ids_list = app_helper.dev_ids_to_list(args.dev_ids) - sock_files = app_helper.sock_files(dev_ids_list) + # Setup devices with given device UIDs. + dev_uids = None + sock_files = None + if args.dev_uids is not None: + if app_helper.is_valid_dev_uids(args.dev_uids) is False: + print('Invalid option: {}'.format(args.dev_uids)) + exit() + + dev_uids_list = args.dev_uids.split(',') + sock_files = app_helper.sock_files(dev_uids_list) # Setup docker command. if args.workdir is not None: @@ -91,7 +98,11 @@ def main(): # Setup pktgen command pktgen_cmd = ['pktgen', '\\'] - file_prefix = 'spp-pktgen-container%d' % dev_ids_list[0] + # Setup EAL options. + if args.name is not None: + file_prefix = app_helper.gen_sppc_file_prefix(args.name) + else: + file_prefix = app_helper.gen_sppc_file_prefix('pktgen') eal_opts = app_helper.setup_eal_opts(args, file_prefix) # Setup matrix for assignment of cores and ports. @@ -107,31 +118,31 @@ def main(): slave_core_list = core_list[1:] nof_slave_cores = len(slave_core_list) - nof_ports = len(dev_ids_list) + nof_ports = len(dev_uids_list) nof_cores_each_port = nof_slave_cores / nof_ports if nof_cores_each_port < 1: - print("Error: Too few cores for given port(s)!") - print("%d cores required for %d port(s)" % ( + print('Error: Too few cores for given port(s)!') + print('{0:d} cores required for {1:d} port(s)'.format( (nof_slave_cores + 1), nof_ports)) exit() matrix_list = [] if nof_cores_each_port == 1: for i in range(0, nof_ports): - matrix_list.append('%d.%d' % (slave_core_list[i], i)) + matrix_list.append('{0:d}.{1:d}'.format(slave_core_list[i], i)) elif nof_cores_each_port == 2: for i in range(0, nof_ports): - matrix_list.append('[%d:%d].%d' % ( + matrix_list.append('[{0:d}:{1:d}].{2:d}'.format( slave_core_list[2*i], slave_core_list[2*i + 1], i)) elif nof_cores_each_port == 3: # Two cores for rx, one for tx for i in range(0, nof_ports): - matrix_list.append('[%d-%d:%d].%d' % ( + matrix_list.append('[{0:d}-{1:d}:{2:d}].{3:d}'.format( slave_core_list[3*i], slave_core_list[3*i + 1], slave_core_list[3*i + 2], i)) elif nof_cores_each_port == 4: for i in range(0, nof_ports): - matrix_list.append('[%d-%d:%d-%d].%d' % ( + matrix_list.append('[{0:d}-{1:d}:{2:d}-{3:d}].{4:d}'.format( slave_core_list[4*i], slave_core_list[4*i + 1], slave_core_list[4*i + 2], @@ -139,7 +150,7 @@ def main(): # Do not support more than five because it is rare case and # calculation is complex. else: - print("Error: Too many cores for calculation for ports!") + print('Error: Too many cores for calculation for ports!') print("Consider to use '--matrix' for assigning directly") exit() matrix = ','.join(matrix_list) -- 2.17.1