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 5FF03A04DB for ; Tue, 17 Nov 2020 12:14:50 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8318FC8B6; Tue, 17 Nov 2020 12:14:48 +0100 (CET) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by dpdk.org (Postfix) with ESMTP id 70C2E5928 for ; Tue, 17 Nov 2020 12:14:47 +0100 (CET) Received: by mail-wm1-f48.google.com with SMTP id a65so2862383wme.1 for ; Tue, 17 Nov 2020 03:14:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kD3qKh6BIqmxHJ6Sm//uERSxbJtr+igXajXEp/b/ZBg=; b=qyAzaGuiunoDBCKUxMq9Qz3wML2l2p5/18v829IYTxm1MbwdhLnOqP2mU9O4IF2CRS 1XIUknsVjIFSqQNWLdBoIHPu2DhMpvjf9j9XOzqOF9anFJ+v5aDx6sh/TJhAxZt9qCxK xNJ5+aUZUo5KJtw6Eab8BLJ96LWzWXv/RV61cd3H5/Z3yzNFT8a6k5gGPluWTqXIm4KF xCLfovR+PFemca4tEjsXR7yg9igjsWtg20nTZCsrpe1vQAJbVfIDJbMmC4IZUuV+HVzv KQutjR+TwcPsbKQbButp4ADCv9kW5XCLlB4kANvozl7SZFdSs0K9pLH8BP3uRAqwyeI0 gLFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kD3qKh6BIqmxHJ6Sm//uERSxbJtr+igXajXEp/b/ZBg=; b=GfuMUAUPdnSKqHwuVv3nmyDfN+CbwlH+ePHjL9ZSZ/NL24ZaxU4mrwAUAstYErCDQF ufTX7SupCyzXD8aUD7fxACGF5t0FfIDIn4Jw74ISJrVIpy/9xHBhquY1O0aW1yzb7d9e IJHKRe+yXZUV6085VXH/KJEEyD2cTpwzXeM8cOiwqMw/7szjlYYH3WtgYWP7ntbWMvKz SHkkSRhENPLhqcEw4KCrZoAKqqvN+Z2yzrmBqE0ZB7fe02SqZQq51pGXv/5SXbjhgMLf F/wmuHrv7zGmpwPQ1IorCVZXTHk0OgAiuovJExGgHATHjIR5bSLWuBEYP34lFKahCVzD JCdg== X-Gm-Message-State: AOAM532E3Zwll2BokYH4RVHy7Z0qFJfzp+EOVT8u89GfI+NI1iKXAnUp Q607KWkLDNmMDng+44qfJ94= X-Google-Smtp-Source: ABdhPJzMIohtGehq3llML2eeHSCbtLGNEVwc5WHxaF9t5Fc2wsagyic9FqRpPrpuw9vvN4tAb9vD8A== X-Received: by 2002:a05:600c:218a:: with SMTP id e10mr3952147wme.73.1605611686214; Tue, 17 Nov 2020 03:14:46 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id i5sm29109433wrw.45.2020.11.17.03.14.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 03:14:45 -0800 (PST) From: luca.boccassi@gmail.com To: Ciara Power Cc: dpdk stable Date: Tue, 17 Nov 2020 11:13:44 +0000 Message-Id: <20201117111416.1961049-10-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201117111416.1961049-1-luca.boccassi@gmail.com> References: <20201109185030.3478760-2-luca.boccassi@gmail.com> <20201117111416.1961049-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'usertools: fix CPU layout script to be PEP8 compliant' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/19/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/42df599aa85490c1727692b4d7ad5d8b3d8e22b9 Thanks. Luca Boccassi --- >From 42df599aa85490c1727692b4d7ad5d8b3d8e22b9 Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Fri, 6 Nov 2020 12:40:53 +0000 Subject: [PATCH] usertools: fix CPU layout script to be PEP8 compliant [ upstream commit b0dcd610529487ed6661351a735a35af5d03a222 ] The pycodestyle tool flagged the following issues, which are now fixed. $ pycodestyle cpu_layout.py cpu_layout.py:18:5: E722 do not use bare 'except' cpu_layout.py:62:14: E231 missing whitespace after ',' Fixes: deb87e6777c0 ("usertools: use sysfs for CPU layout") Fixes: c9208f1dc967 ("usertools: fix CPU layout with python 3") Signed-off-by: Ciara Power --- usertools/cpu_layout.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/usertools/cpu_layout.py b/usertools/cpu_layout.py index 6f129b1db8..39b268752a 100755 --- a/usertools/cpu_layout.py +++ b/usertools/cpu_layout.py @@ -22,8 +22,6 @@ for cpu in xrange(max_cpus + 1): fd = open("{}/cpu{}/topology/core_id".format(base_path, cpu)) except IOError: continue - except: - break core = int(fd.read()) fd.close() fd = open("{}/cpu{}/topology/physical_package_id".format(base_path, cpu)) @@ -66,7 +64,7 @@ print(output) for c in cores: output = "Core %s" % str(c).ljust(max_core_id_len) for s in sockets: - if (s,c) in core_map: + if (s, c) in core_map: output += " " + str(core_map[(s, c)]).ljust(max_core_map_len) else: output += " " * (max_core_map_len + 1) -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-17 11:13:13.406915293 +0000 +++ 0010-usertools-fix-CPU-layout-script-to-be-PEP8-compliant.patch 2020-11-17 11:13:12.873115642 +0000 @@ -1 +1 @@ -From b0dcd610529487ed6661351a735a35af5d03a222 Mon Sep 17 00:00:00 2001 +From 42df599aa85490c1727692b4d7ad5d8b3d8e22b9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b0dcd610529487ed6661351a735a35af5d03a222 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index cc39638213..891b9238fa 100755 +index 6f129b1db8..39b268752a 100755 @@ -25 +26 @@ -@@ -15,8 +15,6 @@ for cpu in range(max_cpus + 1): +@@ -22,8 +22,6 @@ for cpu in xrange(max_cpus + 1): @@ -34 +35 @@ -@@ -59,7 +57,7 @@ print(output) +@@ -66,7 +64,7 @@ print(output)