Received: by 2002:ac0:b08d:0:0:0:0:0 with SMTP id l13csp1978125imc; Fri, 22 Feb 2019 15:07:52 -0800 (PST) X-Google-Smtp-Source: AHgI3Ibjz5Htd8C8aIEGHQBEB8e1UUU4IycBv/Xkz8jqy3rwRLJOEg2zFmBVty1ihVLNYJD4e5Zh X-Received: by 2002:a17:902:290b:: with SMTP id g11mr6593939plb.269.1550876872757; Fri, 22 Feb 2019 15:07:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550876872; cv=none; d=google.com; s=arc-20160816; b=zydERJHCtBTg5BL9acfiSOVCeL5j+U4jV5t+lP3sNcRWo67tpH4Q3whAw03OygcXk7 xBDZ8qfFwih4KImPYc4c73P4vNK3eiKiHr0phltfrxG8lMAXOSERY+U0FL8HeL4gCajO k2LrEcJ2ARIZ4ooUNlfiqbJYtwDtq1n9YwYR5M+1vijDrWByZEZmToeEzmZcvifwBEow RSYXPCKI3AJuCUdkvzy62uCsaGd1KZ7beqB+7j3G3hAW/huM2eAbBGEhUJo0ntf6aEPv wNvzNKuy5pCmLKl0D07WTOpryWtWwCMTytDbuNrviX6b1Skpp03kEqZGQ47sH6JL4RBl fvYg== 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=73WDnc3cFPQr7S5PBPeLLKYfcm3M4edNMf6vjvXcHKQ=; b=WfKUC/tpCGNIL2NFLcKsNE6Ra4pI+Km7EKH+QfrPefdATiES2HGZuq301wxOrDtQ1e xztbJZlKlyZumreHJpk7ZJhVzObk7nmU49OgCCRd4q45/gkKWOhI04SY+0fSlK1tgOET PoirbRLEG/PBNxgTSAm31SzsI5vCvWYDPb5KKxT4GSUfH3NQoxniYzIpGT3AqpOtueqA rxrKyNiVg962Bksg4NBmU7r1aDR07TWL4lr9YxyAMjbNl2ew7nBS9vsVY4v9ASLwu1Hv muTWb5vXUNbgR50pRQJqqdn17HERphvzUS7Vxk9j5sF+SpB2rN8cZhYAGpMuSXP4oI8w 2QpA== 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 l5si2519522pgn.17.2019.02.22.15.07.38; Fri, 22 Feb 2019 15:07:52 -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 S1727555AbfBVXG4 (ORCPT + 99 others); Fri, 22 Feb 2019 18:06:56 -0500 Received: from mx2.suse.de ([195.135.220.15]:52480 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726595AbfBVXGv (ORCPT ); Fri, 22 Feb 2019 18:06:51 -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 992FFB017; Fri, 22 Feb 2019 23:06:50 +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 Subject: [PATCH 07/15] perf script python: add Python3 support to mem-phys-addr.py Date: Fri, 22 Feb 2019 15:06:11 -0800 Message-Id: <20190222230619.17887-8-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 mem-phys-addr.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 --- tools/perf/scripts/python/mem-phys-addr.py | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/tools/perf/scripts/python/mem-phys-addr.py b/tools/perf/scripts/python/mem-phys-addr.py index ebee2c5ae496..fb0bbcbfa0f0 100644 --- a/tools/perf/scripts/python/mem-phys-addr.py +++ b/tools/perf/scripts/python/mem-phys-addr.py @@ -4,6 +4,8 @@ # Copyright (c) 2018, Intel Corporation. from __future__ import division +from __future__ import print_function + import os import sys import struct @@ -31,21 +33,23 @@ def parse_iomem(): for i, j in enumerate(f): m = re.split('-|:',j,2) if m[2].strip() == 'System RAM': - system_ram.append(long(m[0], 16)) - system_ram.append(long(m[1], 16)) + system_ram.append(int(m[0], 16)) + system_ram.append(int(m[1], 16)) if m[2].strip() == 'Persistent Memory': - pmem.append(long(m[0], 16)) - pmem.append(long(m[1], 16)) + pmem.append(int(m[0], 16)) + pmem.append(int(m[1], 16)) def print_memory_type(): - print "Event: %s" % (event_name) - print "%-40s %10s %10s\n" % ("Memory type", "count", "percentage"), - print "%-40s %10s %10s\n" % ("----------------------------------------", \ + print("Event: %s" % (event_name)) + print("%-40s %10s %10s\n" % ("Memory type", "count", "percentage"), end='') + print("%-40s %10s %10s\n" % ("----------------------------------------", "-----------", "-----------"), + end=''); total = sum(load_mem_type_cnt.values()) for mem_type, count in sorted(load_mem_type_cnt.most_common(), \ - key = lambda(k, v): (v, k), reverse = True): - print "%-40s %10d %10.1f%%\n" % (mem_type, count, 100 * count / total), + key = lambda kv: (kv[1], kv[0]), reverse = True): + print("%-40s %10d %10.1f%%\n" % (mem_type, count, 100 * count / total), + end='') def trace_begin(): parse_iomem() @@ -80,7 +84,7 @@ def find_memory_type(phys_addr): f.seek(0, 0) for j in f: m = re.split('-|:',j,2) - if long(m[0], 16) <= phys_addr <= long(m[1], 16): + if int(m[0], 16) <= phys_addr <= int(m[1], 16): return m[2] return "N/A" -- 2.20.1