Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c45b168e authored by Jeremy Cline's avatar Jeremy Cline Committed by Arnaldo Carvalho de Melo
Browse files

perf scripts python: Add Python 3 support to Util.py 



Support both Python 2 and Python 3 in Util.py. The dict class no longer
has a ``has_key`` method and print is now a function rather than a
statement. This should have no functional change.

Signed-off-by: default avatarJeremy Cline <jeremy@jcline.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Herton Krzesinski <herton@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/0100016341a730c6-8db8b9b1-da2d-4ee3-96bf-47e0ae9796bd-000000@email.amazonses.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 2ab89262

tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py

+6 −5
Original line number Original line Diff line number Diff line
@@ -5,6 +5,7 @@ 
# This software may be distributed under the terms of the GNU General

# This software may be distributed under the terms of the GNU General

# Public License ("GPL") version 2 as published by the Free Software

# Public License ("GPL") version 2 as published by the Free Software

# Foundation.

# Foundation.

from __future__ import print_function





import errno, os

import errno, os
@@ -33,7 +34,7 @@ def nsecs_str(nsecs): 
    return str

    return str





def add_stats(dict, key, value):

def add_stats(dict, key, value):

	if not dict.has_key(key):

	if key not in dict:

		dict[key] = (value, value, value, 1)

		dict[key] = (value, value, value, 1)

	else:

	else:

		min, max, avg, count = dict[key]

		min, max, avg, count = dict[key]
@@ -72,10 +73,10 @@ try: 
except:

except:

	if not audit_package_warned:

	if not audit_package_warned:

		audit_package_warned = True

		audit_package_warned = True

		print "Install the audit-libs-python package to get syscall names.\n" \

		print("Install the audit-libs-python package to get syscall names.\n"

                    "For example:\n  # apt-get install python-audit (Ubuntu)" \

                    "For example:\n  # apt-get install python-audit (Ubuntu)"

                    "\n  # yum install audit-libs-python (Fedora)" \

                    "\n  # yum install audit-libs-python (Fedora)"

                    "\n  etc.\n"

                    "\n  etc.\n")





def syscall_name(id):

def syscall_name(id):

	try:

	try: