From: tip-bot for Tony Jones <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, mingo@kernel.org, tonyj@suse.de,
tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org,
s1seetee@linux.vnet.ibm.com
Subject: [tip:perf/urgent] perf script python: Add Python3 support to futex-contention.py
Date: Sat, 9 Mar 2019 12:02:51 -0800 [thread overview]
Message-ID: <tip-de2ec16bd438945813198d4de2339a396904c206@git.kernel.org> (raw)
In-Reply-To: <20190302011903.2416-3-tonyj@suse.de>
Commit-ID: de2ec16bd438945813198d4de2339a396904c206
Gitweb: https://git.kernel.org/tip/de2ec16bd438945813198d4de2339a396904c206
Author: Tony Jones <tonyj@suse.de>
AuthorDate: Fri, 1 Mar 2019 17:18:58 -0800
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 6 Mar 2019 18:10:43 -0300
perf script python: Add Python3 support to futex-contention.py
Support both Python2 and Python3 in the futex-contention.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 <tonyj@suse.de>
Link: http://lkml.kernel.org/r/20190302011903.2416-3-tonyj@suse.de
Signed-off-by: Seeteena Thoufeek <s1seetee@linux.vnet.ibm.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/scripts/python/futex-contention.py | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/tools/perf/scripts/python/futex-contention.py b/tools/perf/scripts/python/futex-contention.py
index f221c62e0a10..0c4841acf75d 100644
--- a/tools/perf/scripts/python/futex-contention.py
+++ b/tools/perf/scripts/python/futex-contention.py
@@ -10,6 +10,8 @@
#
# Measures futex contention
+from __future__ import print_function
+
import os, sys
sys.path.append(os.environ['PERF_EXEC_PATH'] + '/scripts/python/Perf-Trace-Util/lib/Perf/Trace')
from Util import *
@@ -33,18 +35,18 @@ def syscalls__sys_enter_futex(event, ctxt, cpu, s, ns, tid, comm, callchain,
def syscalls__sys_exit_futex(event, ctxt, cpu, s, ns, tid, comm, callchain,
nr, ret):
- if thread_blocktime.has_key(tid):
+ if tid in thread_blocktime:
elapsed = nsecs(s, ns) - thread_blocktime[tid]
add_stats(lock_waits, (tid, thread_thislock[tid]), elapsed)
del thread_blocktime[tid]
del thread_thislock[tid]
def trace_begin():
- print "Press control+C to stop and show the summary"
+ print("Press control+C to stop and show the summary")
def trace_end():
for (tid, lock) in lock_waits:
min, max, avg, count = lock_waits[tid, lock]
- print "%s[%d] lock %x contended %d times, %d avg ns" % \
- (process_names[tid], tid, lock, count, avg)
+ print("%s[%d] lock %x contended %d times, %d avg ns" %
+ (process_names[tid], tid, lock, count, avg))
next prev parent reply other threads:[~2019-03-09 20:03 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-02 1:18 [PATCH v2 0/7] perf script python: add Python3 support Tony Jones
2019-03-02 1:18 ` [PATCH v2 1/7] perf script python: remove mixed indentation Tony Jones
2019-03-05 10:39 ` Adrian Hunter
2019-03-06 21:09 ` Arnaldo Carvalho de Melo
2019-03-09 20:02 ` [tip:perf/urgent] perf script python: Remove " tip-bot for Tony Jones
2019-03-02 1:18 ` [PATCH v2 2/7] perf script python: add Python3 support to futex-contention.py Tony Jones
2019-03-06 21:11 ` Arnaldo Carvalho de Melo
2019-03-09 20:02 ` tip-bot for Tony Jones [this message]
2019-03-02 1:18 ` [PATCH v2 3/7] perf script python: add Python3 support to check-perf-trace.py Tony Jones
2019-03-06 21:11 ` Arnaldo Carvalho de Melo
2019-03-09 20:03 ` [tip:perf/urgent] " tip-bot for Tony Jones
2019-03-02 1:19 ` [PATCH v2 4/7] perf script python: add Python3 support to event_analyzing_sample.py Tony Jones
2019-03-06 21:11 ` Arnaldo Carvalho de Melo
2019-03-09 20:04 ` [tip:perf/urgent] perf script python: Add " tip-bot for Tony Jones
2019-03-02 1:19 ` [PATCH v2 5/7] perf script python: add Python3 support to intel-pt-events.py Tony Jones
2019-03-05 10:16 ` Adrian Hunter
2019-03-05 15:02 ` Tony Jones
2019-03-05 16:10 ` Tony Jones
2019-03-05 16:19 ` Tony Jones
2019-03-06 9:28 ` Adrian Hunter
2019-03-06 21:12 ` Arnaldo Carvalho de Melo
2019-03-09 20:04 ` [tip:perf/urgent] perf script python: Add " tip-bot for Tony Jones
2019-03-02 1:19 ` [PATCH v2 6/7] perf script python: add Python3 support to sql scripts Tony Jones
2019-03-06 9:26 ` Adrian Hunter
2019-03-06 16:32 ` Tony Jones
2019-03-07 18:51 ` Arnaldo Carvalho de Melo
2019-03-08 9:47 ` Adrian Hunter
2019-03-08 14:36 ` Arnaldo Carvalho de Melo
2019-03-02 1:19 ` [PATCH v2 7/7] perf script python: add printdate function to SQL exporters Tony Jones
2019-03-06 21:13 ` Arnaldo Carvalho de Melo
2019-03-08 12:50 ` Adrian Hunter
2019-03-05 9:55 ` [PATCH v2 0/7] perf script python: add Python3 support Adrian Hunter
2019-03-05 14:53 ` Tony Jones
2019-03-05 15:18 ` Tony Jones
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=tip-de2ec16bd438945813198d4de2339a396904c206@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=s1seetee@linux.vnet.ibm.com \
--cc=tglx@linutronix.de \
--cc=tonyj@suse.de \
/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;
as well as URLs for NNTP newsgroup(s).