From: Seeteena Thoufeek <s1seetee@linux.vnet.ibm.com>
To: peterz@infradead.org, mingo@redhat.com, acme@kernel.org,
alexander.shishkin@linux.intel.com, jolsa@redhat.com,
namhyung@kernel.org, linux-kernel@vger.kernel.org
Cc: s1seetee@linux.vnet.ibm.com, ravi.bangoria@linux.ibm.com
Subject: [PATCH] perf scripts python: Add Python 3 support to exported-sql-viewer.py
Date: Wed, 16 Jan 2019 21:53:31 +0530 [thread overview]
Message-ID: <1547655825-28754-3-git-send-email-s1seetee@linux.vnet.ibm.com> (raw)
In-Reply-To: <1547655825-28754-1-git-send-email-s1seetee@linux.vnet.ibm.com>
Support both Python 2 and Python 3 in exported-sql-viewer.py.
``print`` is now a function rather than a statement. This should have
no functional change.
Add support of _pickle module in Python3
Signed-off-by: Seeteena Thoufeek <s1seetee@linux.vnet.ibm.com>
Reviewed-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
---
tools/perf/scripts/python/exported-sql-viewer.py | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/tools/perf/scripts/python/exported-sql-viewer.py b/tools/perf/scripts/python/exported-sql-viewer.py
index f278ce5..02f964a 100755
--- a/tools/perf/scripts/python/exported-sql-viewer.py
+++ b/tools/perf/scripts/python/exported-sql-viewer.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python2
# SPDX-License-Identifier: GPL-2.0
# exported-sql-viewer.py: view data from sql database
# Copyright (c) 2014-2018, Intel Corporation.
@@ -92,7 +91,6 @@ import sys
import weakref
import threading
import string
-import cPickle
import re
import os
from PySide.QtCore import *
@@ -102,6 +100,11 @@ from decimal import *
from ctypes import *
from multiprocessing import Process, Array, Value, Event
+if sys.version_info[0] < 3:
+ import cPickle
+else:
+ import _pickle as cPickle
+
# Data formatting helpers
def tohex(ip):
@@ -1560,7 +1563,7 @@ class SQLTableDialogDataItem():
return str(lower_id)
def ConvertRelativeTime(self, val):
- print "val ", val
+ print("val ", val)
mult = 1
suffix = val[-2:]
if suffix == "ms":
@@ -1582,29 +1585,29 @@ class SQLTableDialogDataItem():
return str(val)
def ConvertTimeRange(self, vrange):
- print "vrange ", vrange
+ print("vrange ", vrange)
if vrange[0] == "":
vrange[0] = str(self.first_time)
if vrange[1] == "":
vrange[1] = str(self.last_time)
vrange[0] = self.ConvertRelativeTime(vrange[0])
vrange[1] = self.ConvertRelativeTime(vrange[1])
- print "vrange2 ", vrange
+ print("vrange2 ", vrange)
if not self.IsNumber(vrange[0]) or not self.IsNumber(vrange[1]):
return False
- print "ok1"
+ print("ok1")
beg_range = max(int(vrange[0]), self.first_time)
end_range = min(int(vrange[1]), self.last_time)
if beg_range > self.last_time or end_range < self.first_time:
return False
- print "ok2"
+ print("ok2")
vrange[0] = self.BinarySearchTime(0, self.last_id, beg_range, True)
vrange[1] = self.BinarySearchTime(1, self.last_id + 1, end_range, False)
- print "vrange3 ", vrange
+ print("vrange3 ", vrange)
return True
def AddTimeRange(self, value, ranges):
- print "value ", value
+ print("value ", value)
n = value.count("-")
if n == 1:
pass
--
1.8.3.1
next prev parent reply other threads:[~2019-01-16 16:24 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-16 16:23 [PATCH] perf scripts python: Add Python 3 support to check-perf-trace.py Seeteena Thoufeek
2019-01-16 16:23 ` [PATCH] perf scripts python: Add Python 3 support to event_analyzing_sample.py Seeteena Thoufeek
2019-01-16 16:23 ` Seeteena Thoufeek [this message]
2019-01-16 16:23 ` [PATCH] perf scripts python: Add Python 3 support to export-to-sqlite.py Seeteena Thoufeek
2019-01-16 16:23 ` [PATCH] perf scripts python: Add Python 3 support to failed-syscalls-by-pid.py Seeteena Thoufeek
2019-01-16 16:23 ` [PATCH] perf scripts python: Add Python 3 support to futex-contention.py Seeteena Thoufeek
2019-01-16 16:23 ` [PATCH] perf scripts python: Add Python 3 support to intel-pt-events.py Seeteena Thoufeek
2019-01-16 16:23 ` [PATCH] perf scripts python: Add Python 3 support to mem-phys-addr.py Seeteena Thoufeek
2019-01-16 16:32 ` Jonathan Corbet
2019-01-17 9:48 ` seeteena
2019-01-21 23:45 ` Tony Jones
2019-01-16 16:23 ` [PATCH] perf scripts python: Add Python 3 support to netdev-times.py Seeteena Thoufeek
2019-01-16 16:23 ` [PATCH] perf scripts python: Add Python 3 support to net_dropmonitor.py Seeteena Thoufeek
2019-01-16 16:23 ` [PATCH] perf scripts python: Add Python 3 support to powerpc-hcalls.py Seeteena Thoufeek
2019-01-16 16:23 ` [PATCH] perf scripts python: Add Python 3 support to sctop.py Seeteena Thoufeek
2019-01-16 16:23 ` [PATCH] perf scripts python: Add Python 3 support to stackcollapse.py Seeteena Thoufeek
2019-01-16 16:23 ` [PATCH] perf scripts python: Add Python 3 support to stat-cpi.py Seeteena Thoufeek
2019-01-16 16:23 ` [PATCH] perf scripts python: Add Python 3 support to syscall-counts-by-pid.py Seeteena Thoufeek
2019-01-16 16:23 ` [PATCH] perf scripts python: Add Python 3 support to syscall-counts.py Seeteena Thoufeek
2019-01-16 16:23 ` [PATCH] perf scripts python: Add Python 3 support to export-to-postgresql.py Seeteena Thoufeek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1547655825-28754-3-git-send-email-s1seetee@linux.vnet.ibm.com \
--to=s1seetee@linux.vnet.ibm.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=ravi.bangoria@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®