60 lines
1.9 KiB
Diff
60 lines
1.9 KiB
Diff
From: Tony Jones <tonyj@suse.de>
|
|
Date: Fri, 22 Feb 2019 15:06:12 -0800
|
|
Subject: perf script python: Add Python3 support to net_dropmonitor.py
|
|
Origin: https://git.kernel.org/linus/8c42b9600e561666233b9c557a5209d0dc853ba1
|
|
Bug-Debian: https://bugs.debian.org/944641
|
|
|
|
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 <tonyj@suse.de>
|
|
Acked-by: Neil Horman <nhorman@tuxdriver.com>
|
|
Link: http://lkml.kernel.org/r/20190222230619.17887-9-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/net_dropmonitor.py | 10 ++++++----
|
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
|
|
|
--- 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()
|
|
|