Received: by 2002:ac0:b08d:0:0:0:0:0 with SMTP id l13csp1979709imc; Fri, 22 Feb 2019 15:09:42 -0800 (PST) X-Google-Smtp-Source: AHgI3IardRVdEs/GtRA+F2Z/oc01b+OqgfJHhTsVNRbWoUnrsgE/F+KjQm8kDgwmZsMnqoXVHztZ X-Received: by 2002:a17:902:7590:: with SMTP id j16mr6633720pll.304.1550876982330; Fri, 22 Feb 2019 15:09:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550876982; cv=none; d=google.com; s=arc-20160816; b=lrUTZvcyCCT8xV7y8laRV64xJ3vf659SlTI8r6VTyGA02NCTC9YpvBN8xPeB8u22DK +XF1wSVQejhf8LkU1i2pbVZ3JndyQbNK1Wuhkox7hkpOdt4R1gVoV8e8WwsAahLqn9Mp cTWI2coVkNs7Ix5ARUj7xjp/lFB6qeOU8Arq9FYcRl2s3fnnawDvg33YLdJX4ONM1KrL qVwzy0TXkzhfQobn20iqIB6+DHN7XUWu3F+qZLaLT1O4Hh5HAP4Mm1Fdf/hZIFscPC4j 29497OfPO9RNqfeccyXqpHOoABCjQLfOInfqFeotwId8jcRhqlRxGxxtcjuVh8dEhxT0 1HYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=s6bLA27zrRy/VQzCemTt6nTJSR72ifggFSm1dxUb55I=; b=GbRt60wugi3DOWJxja64SBAk5gJ/NVHD83zzJL+BIdvaeGOfpgD7lKxF9NCM3SMqZP BeWeuN9PtqXsFfSUehZyoBE8d4JOLb3HLWSkHhlSnT47ZyN9aU9sfCUGbToMWskY0cxw Xwa/dIyq7EJB3aNzUcVINXg3uo/rVClnMsY3TI9P/mg1nn+FM29CfV+PX+FLwEHJPJAd uDkf6WcHSupQnhsPbX9yH6U6R14Cy6QDElYzLzyBLkYHIiN42vEkSOK2DIvXsMNx0gLq U6d3mzQlsGtzNbZPzttlwzobNscklRelfeX40srerzbySt4uRocbr7i5jo3YqJoK+118 IIaQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y18si2440430pgf.247.2019.02.22.15.09.27; Fri, 22 Feb 2019 15:09:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727615AbfBVXHA (ORCPT + 99 others); Fri, 22 Feb 2019 18:07:00 -0500 Received: from mx2.suse.de ([195.135.220.15]:52496 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727531AbfBVXG4 (ORCPT ); Fri, 22 Feb 2019 18:06:56 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 5D100B017; Fri, 22 Feb 2019 23:06:55 +0000 (UTC) From: Tony Jones To: linux-kernel@vger.kernel.org Cc: linux-perf-users@vger.kernel.org, acme@kernel.org, Tony Jones , Seeteena Thoufeek , Neil Horman Subject: [PATCH 08/15] perf script python: add Python3 support to net_dropmonitor.py Date: Fri, 22 Feb 2019 15:06:12 -0800 Message-Id: <20190222230619.17887-9-tonyj@suse.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190222230619.17887-1-tonyj@suse.de> References: <20190222230619.17887-1-tonyj@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Support both Python2 and Python3 in the net_dropmonitor.py script There may be differences in the ordering of output lines due to differences in dictionary ordering etc. However the format within lines should be unchanged. The use of 'from __future__' implies the minimum supported Python2 version is now v2.6 Signed-off-by: Tony Jones Signed-off-by: Seeteena Thoufeek Cc: Neil Horman --- tools/perf/scripts/python/net_dropmonitor.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/perf/scripts/python/net_dropmonitor.py b/tools/perf/scripts/python/net_dropmonitor.py index a150164b44a3..212557a02c50 100755 --- a/tools/perf/scripts/python/net_dropmonitor.py +++ b/tools/perf/scripts/python/net_dropmonitor.py @@ -1,6 +1,8 @@ # Monitor the system for dropped packets and proudce a report of drop locations and counts # SPDX-License-Identifier: GPL-2.0 +from __future__ import print_function + import os import sys @@ -50,19 +52,19 @@ def get_sym(sloc): return (None, 0) def print_drop_table(): - print "%25s %25s %25s" % ("LOCATION", "OFFSET", "COUNT") + print("%25s %25s %25s" % ("LOCATION", "OFFSET", "COUNT")) for i in drop_log.keys(): (sym, off) = get_sym(i) if sym == None: sym = i - print "%25s %25s %25s" % (sym, off, drop_log[i]) + print("%25s %25s %25s" % (sym, off, drop_log[i])) def trace_begin(): - print "Starting trace (Ctrl-C to dump results)" + print("Starting trace (Ctrl-C to dump results)") def trace_end(): - print "Gathering kallsyms data" + print("Gathering kallsyms data") get_kallsyms_table() print_drop_table() -- 2.20.1