linux-kernel - [tip:perf/core] perf python: Make twatch.py work with both python2 and python3

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <tip-c2ynv0ozr3eifzsyit6qgh3h@git.kernel.org>
Date:   Wed, 21 Feb 2018 02:26:38 -0800
From:   tip-bot for Arnaldo Carvalho de Melo <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     mingo@...nel.org, acme@...hat.com, adrian.hunter@...el.com,
        wangnan0@...wei.com, namhyung@...nel.org, jolsa@...nel.org,
        dsahern@...il.com, jskarvad@...hat.com, hpa@...or.com,
        tglx@...utronix.de, linux-kernel@...r.kernel.org
Subject: [tip:perf/core] perf python: Make twatch.py work with both python2
 and python3

Commit-ID:  d2ed5d2bdc5cd30b44dc52c44c63f08c0a31b845
Gitweb:     https://git.kernel.org/tip/d2ed5d2bdc5cd30b44dc52c44c63f08c0a31b845
Author:     Arnaldo Carvalho de Melo <acme@...hat.com>
AuthorDate: Mon, 19 Feb 2018 12:24:13 -0300
Committer:  Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Mon, 19 Feb 2018 12:28:08 -0300

perf python: Make twatch.py work with both python2 and python3

Will be used to test patches allowing to build perf with python3, so
that we make sure that we can build with both versions.

Cc: Adrian Hunter <adrian.hunter@...el.com>
Cc: David Ahern <dsahern@...il.com>
Cc: Jaroslav Škarvada <jskarvad@...hat.com>
Cc: Jiri Olsa <jolsa@...nel.org>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Wang Nan <wangnan0@...wei.com>
Link: https://lkml.kernel.org/n/tip-c2ynv0ozr3eifzsyit6qgh3h@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
 tools/perf/python/twatch.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/perf/python/twatch.py b/tools/perf/python/twatch.py
index c235c22..0a29c5c 100755
--- a/tools/perf/python/twatch.py
+++ b/tools/perf/python/twatch.py
@@ -42,10 +42,10 @@ def main(context_switch = 0, thread = -1):
 			event = evlist.read_on_cpu(cpu)
 			if not event:
 				continue
-			print "cpu: %2d, pid: %4d, tid: %4d" % (event.sample_cpu,
-								event.sample_pid,
-								event.sample_tid),
-			print event
+			print("cpu: {0}, pid: {1}, tid: {2} {3}".format(event.sample_cpu,
+                                                                        event.sample_pid,
+                                                                        event.sample_tid,
+                                                                        event))
 
 if __name__ == '__main__':
     """