perf tools: Generate a Python script compatible with Python 2 and 3
When generating a Python script with "perf script -g python", produce one that is compatible with Python 2 and 3. The difference between the two generated scripts is: --- python2-perf-script.py 2018-05-08 15:35:00.865889705 -0400 +++ python3-perf-script.py 2018-05-08 15:34:49.019789564 -0400 @@ -7,6 +7,8 @@ # be retrieved using Python functions of the form common_*(context). # See the perf-script-python Documentation for the list of available functions. +from __future__ import print_function + import os import sys @@ -18,10 +20,10 @@ def trace_begin(): - print "in trace_begin" + print("in trace_begin") def trace_end(): - print "in trace_end" + print("in trace_end") def raw_syscalls__sys_enter(event_name, context, common_cpu, common_secs, common_nsecs, common_pid, common_comm, @@ -29,26 +31,26 @@ print_header(event_name, common_cpu, common_secs, common_nsecs, common_pid, common_comm) - print "id=%d, args=%s" % \ - (id, args) + print("id=%d, args=%s" % \ + (id, args)) - print 'Sample: {'+get_dict_as_string(perf_sample_dict['sample'], ', ')+'}' + print('Sample: {'+get_dict_as_string(perf_sample_dict['sample'], ', ')+'}') for node in common_callchain: if 'sym' in node: - print "\t[%x] %s" % (node['ip'], node['sym']['name']) + print("\t[%x] %s" % (node['ip'], node['sym']['name'])) else: - print " [%x]" % (node['ip']) + print(" [%x]" % (node['ip'])) - print "\n" + print() def trace_unhandled(event_name, context, event_fields_dict, perf_sample_dict): - print get_dict_as_string(event_fields_dict) - print 'Sample: {'+get_dict_as_string(perf_sample_dict['sample'], ', ')+'}' + print(get_dict_as_string(event_fields_dict)) + print('Sample: {'+get_dict_as_string(perf_sample_dict['sample'], ', ')+'}') def print_header(event_name, cpu, secs, nsecs, pid, comm): - print "%-20s %5u %05u.%09u %8u %-20s " % \ - (event_name, cpu, secs, nsecs, pid, comm), + print("%-20s %5u %05u.%09u %8u %-20s " % \ + (event_name, cpu, secs, nsecs, pid, comm), end="") def get_dict_as_string(a_dict, delimiter=' '): return delimiter.join(['%s=%s'%(k,str(v))for k,v in sorted(a_dict.items())]) Signed-off-by: Jeremy 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/0100016341a7278a-d178c724-2b0f-49ca-be93-80a7d51aaa0d-000000@email.amazonses.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
092150a25c
commit
877cc63968
|
@ -1627,6 +1627,7 @@ static int python_generate_script(struct pevent *pevent, const char *outfile)
|
|||
fprintf(ofp, "# See the perf-script-python Documentation for the list "
|
||||
"of available functions.\n\n");
|
||||
|
||||
fprintf(ofp, "from __future__ import print_function\n\n");
|
||||
fprintf(ofp, "import os\n");
|
||||
fprintf(ofp, "import sys\n\n");
|
||||
|
||||
|
@ -1636,10 +1637,10 @@ static int python_generate_script(struct pevent *pevent, const char *outfile)
|
|||
fprintf(ofp, "from Core import *\n\n\n");
|
||||
|
||||
fprintf(ofp, "def trace_begin():\n");
|
||||
fprintf(ofp, "\tprint \"in trace_begin\"\n\n");
|
||||
fprintf(ofp, "\tprint(\"in trace_begin\")\n\n");
|
||||
|
||||
fprintf(ofp, "def trace_end():\n");
|
||||
fprintf(ofp, "\tprint \"in trace_end\"\n\n");
|
||||
fprintf(ofp, "\tprint(\"in trace_end\")\n\n");
|
||||
|
||||
while ((event = trace_find_next_event(pevent, event))) {
|
||||
fprintf(ofp, "def %s__%s(", event->system, event->name);
|
||||
|
@ -1675,7 +1676,7 @@ static int python_generate_script(struct pevent *pevent, const char *outfile)
|
|||
"common_secs, common_nsecs,\n\t\t\t"
|
||||
"common_pid, common_comm)\n\n");
|
||||
|
||||
fprintf(ofp, "\t\tprint \"");
|
||||
fprintf(ofp, "\t\tprint(\"");
|
||||
|
||||
not_first = 0;
|
||||
count = 0;
|
||||
|
@ -1736,31 +1737,31 @@ static int python_generate_script(struct pevent *pevent, const char *outfile)
|
|||
fprintf(ofp, "%s", f->name);
|
||||
}
|
||||
|
||||
fprintf(ofp, ")\n\n");
|
||||
fprintf(ofp, "))\n\n");
|
||||
|
||||
fprintf(ofp, "\t\tprint 'Sample: {'+"
|
||||
"get_dict_as_string(perf_sample_dict['sample'], ', ')+'}'\n\n");
|
||||
fprintf(ofp, "\t\tprint('Sample: {'+"
|
||||
"get_dict_as_string(perf_sample_dict['sample'], ', ')+'}')\n\n");
|
||||
|
||||
fprintf(ofp, "\t\tfor node in common_callchain:");
|
||||
fprintf(ofp, "\n\t\t\tif 'sym' in node:");
|
||||
fprintf(ofp, "\n\t\t\t\tprint \"\\t[%%x] %%s\" %% (node['ip'], node['sym']['name'])");
|
||||
fprintf(ofp, "\n\t\t\t\tprint(\"\\t[%%x] %%s\" %% (node['ip'], node['sym']['name']))");
|
||||
fprintf(ofp, "\n\t\t\telse:");
|
||||
fprintf(ofp, "\n\t\t\t\tprint \"\t[%%x]\" %% (node['ip'])\n\n");
|
||||
fprintf(ofp, "\t\tprint \"\\n\"\n\n");
|
||||
fprintf(ofp, "\n\t\t\t\tprint(\"\t[%%x]\" %% (node['ip']))\n\n");
|
||||
fprintf(ofp, "\t\tprint()\n\n");
|
||||
|
||||
}
|
||||
|
||||
fprintf(ofp, "def trace_unhandled(event_name, context, "
|
||||
"event_fields_dict, perf_sample_dict):\n");
|
||||
|
||||
fprintf(ofp, "\t\tprint get_dict_as_string(event_fields_dict)\n");
|
||||
fprintf(ofp, "\t\tprint 'Sample: {'+"
|
||||
"get_dict_as_string(perf_sample_dict['sample'], ', ')+'}'\n\n");
|
||||
fprintf(ofp, "\t\tprint(get_dict_as_string(event_fields_dict))\n");
|
||||
fprintf(ofp, "\t\tprint('Sample: {'+"
|
||||
"get_dict_as_string(perf_sample_dict['sample'], ', ')+'}')\n\n");
|
||||
|
||||
fprintf(ofp, "def print_header("
|
||||
"event_name, cpu, secs, nsecs, pid, comm):\n"
|
||||
"\tprint \"%%-20s %%5u %%05u.%%09u %%8u %%-20s \" %% \\\n\t"
|
||||
"(event_name, cpu, secs, nsecs, pid, comm),\n\n");
|
||||
"\tprint(\"%%-20s %%5u %%05u.%%09u %%8u %%-20s \" %% \\\n\t"
|
||||
"(event_name, cpu, secs, nsecs, pid, comm), end=\"\")\n\n");
|
||||
|
||||
fprintf(ofp, "def get_dict_as_string(a_dict, delimiter=' '):\n"
|
||||
"\treturn delimiter.join"
|
||||
|
|
Loading…
Reference in a new issue