leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf script python: Correct handler check and spelling errors

Browse Source 
Correct the checking for handler returned by PyDict_GetItemString(),
also fix some spelling error and remove some data code in
event_analyzing_sample.py, as suggested by Namhyung Kim.

v2: restore back the wrongly removed trace_unhandled() func

Signed-off-by: Feng Tang <feng.tang@intel.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Robert Richter <robert.richter@amd.com>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/20120809134613.067104c4@feng-i7
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Feng Tang 2012-08-09 13:46:13 +08:00 committed by Arnaldo Carvalho de Melo
parent 0076d546b4
commit 87b6a3ad40
3 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/EventClass.py
View File

@ -1,12 +1,12 @@
# EventClass.py # EventClass.py
# #
# This is a libray defining some events typs classes, which could # This is a library defining some events types classes, which could
# be used by other scripts to analyzing the perf samples. # be used by other scripts to analyzing the perf samples.
# #
# Currently there are just a few classes defined for examples, # Currently there are just a few classes defined for examples,
# PerfEvent is the base class for all perf event sample, PebsEvent # PerfEvent is the base class for all perf event sample, PebsEvent
# is a HW base Intel x86 PEBS event, and user could add more SW/HW # is a HW base Intel x86 PEBS event, and user could add more SW/HW
# event classes based on requriements. # event classes based on requirements.
import struct import struct

30
tools/perf/scripts/python/event_analyzing_sample.py
View File

@ -1,15 +1,15 @@
# process_event.py: general event handler in python # event_analyzing_sample.py: general event handler in python
# #
# Current perf report is alreay very powerful with the anotation integrated, # Current perf report is already very powerful with the annotation integrated,
# and this script is not trying to be as powerful as perf report, but # and this script is not trying to be as powerful as perf report, but
# providing end user/developer a flexible way to analyze the events other # providing end user/developer a flexible way to analyze the events other
# than trace points. # than trace points.
# #
# The 2 database related functions in this script just show how to gather # The 2 database related functions in this script just show how to gather
# the basic information, and users can modify and write their own functions # the basic information, and users can modify and write their own functions
# according to their specific requirment. # according to their specific requirement.
# #
# The first sample "show_general_events" just does a baisc grouping for all # The first function "show_general_events" just does a basic grouping for all
# generic events with the help of sqlite, and the 2nd one "show_pebs_ll" is # generic events with the help of sqlite, and the 2nd one "show_pebs_ll" is
# for a x86 HW PMU event: PEBS with load latency data. # for a x86 HW PMU event: PEBS with load latency data.
# #
@ -85,7 +85,7 @@ def process_event(param_dict):
else: else:
symbol = "Unknown_symbol" symbol = "Unknown_symbol"
# Creat the event object and insert it to the right table in database # Create the event object and insert it to the right table in database
event = create_event(name, comm, dso, symbol, raw_buf) event = create_event(name, comm, dso, symbol, raw_buf)
insert_db(event) insert_db(event)
@ -109,7 +109,7 @@ def trace_end():
# #
# As the event number may be very big, so we can't use linear way # As the event number may be very big, so we can't use linear way
# to show the histgram in real number, but use a log2 algorithm. # to show the histogram in real number, but use a log2 algorithm.
# #
def num2sym(num): def num2sym(num):
@ -130,18 +130,18 @@ def show_general_events():
# Group by thread # Group by thread
commq = con.execute("select comm, count(comm) from gen_events group by comm order by -count(comm)") commq = con.execute("select comm, count(comm) from gen_events group by comm order by -count(comm)")
print "\n%16s %8s %16s\n%s" % ("comm", "number", "histgram", "="*42) print "\n%16s %8s %16s\n%s" % ("comm", "number", "histogram", "="*42)
for row in commq: for row in commq:
print "%16s %8d %s" % (row[0], row[1], num2sym(row[1])) print "%16s %8d %s" % (row[0], row[1], num2sym(row[1]))
# Group by symbol # Group by symbol
print "\n%32s %8s %16s\n%s" % ("symbol", "number", "histgram", "="*58) print "\n%32s %8s %16s\n%s" % ("symbol", "number", "histogram", "="*58)
symbolq = con.execute("select symbol, count(symbol) from gen_events group by symbol order by -count(symbol)") symbolq = con.execute("select symbol, count(symbol) from gen_events group by symbol order by -count(symbol)")
for row in symbolq: for row in symbolq:
print "%32s %8d %s" % (row[0], row[1], num2sym(row[1])) print "%32s %8d %s" % (row[0], row[1], num2sym(row[1]))
# Group by dso # Group by dso
print "\n%40s %8s %16s\n%s" % ("dso", "number", "histgram", "="*74) print "\n%40s %8s %16s\n%s" % ("dso", "number", "histogram", "="*74)
dsoq = con.execute("select dso, count(dso) from gen_events group by dso order by -count(dso)") dsoq = con.execute("select dso, count(dso) from gen_events group by dso order by -count(dso)")
for row in dsoq: for row in dsoq:
print "%40s %8d %s" % (row[0], row[1], num2sym(row[1])) print "%40s %8d %s" % (row[0], row[1], num2sym(row[1]))
@ -163,31 +163,27 @@ def show_pebs_ll():
# Group by thread # Group by thread
commq = con.execute("select comm, count(comm) from pebs_ll group by comm order by -count(comm)") commq = con.execute("select comm, count(comm) from pebs_ll group by comm order by -count(comm)")
print "\n%16s %8s %16s\n%s" % ("comm", "number", "histgram", "="*42) print "\n%16s %8s %16s\n%s" % ("comm", "number", "histogram", "="*42)
for row in commq: for row in commq:
print "%16s %8d %s" % (row[0], row[1], num2sym(row[1])) print "%16s %8d %s" % (row[0], row[1], num2sym(row[1]))
# Group by symbol # Group by symbol
print "\n%32s %8s %16s\n%s" % ("symbol", "number", "histgram", "="*58) print "\n%32s %8s %16s\n%s" % ("symbol", "number", "histogram", "="*58)
symbolq = con.execute("select symbol, count(symbol) from pebs_ll group by symbol order by -count(symbol)") symbolq = con.execute("select symbol, count(symbol) from pebs_ll group by symbol order by -count(symbol)")
for row in symbolq: for row in symbolq:
print "%32s %8d %s" % (row[0], row[1], num2sym(row[1])) print "%32s %8d %s" % (row[0], row[1], num2sym(row[1]))
# Group by dse # Group by dse
dseq = con.execute("select dse, count(dse) from pebs_ll group by dse order by -count(dse)") dseq = con.execute("select dse, count(dse) from pebs_ll group by dse order by -count(dse)")
print "\n%32s %8s %16s\n%s" % ("dse", "number", "histgram", "="*58) print "\n%32s %8s %16s\n%s" % ("dse", "number", "histogram", "="*58)
for row in dseq: for row in dseq:
print "%32s %8d %s" % (row[0], row[1], num2sym(row[1])) print "%32s %8d %s" % (row[0], row[1], num2sym(row[1]))
# Group by latency # Group by latency
latq = con.execute("select lat, count(lat) from pebs_ll group by lat order by lat") latq = con.execute("select lat, count(lat) from pebs_ll group by lat order by lat")
print "\n%32s %8s %16s\n%s" % ("latency", "number", "histgram", "="*58) print "\n%32s %8s %16s\n%s" % ("latency", "number", "histogram", "="*58)
for row in latq: for row in latq:
print "%32s %8d %s" % (row[0], row[1], num2sym(row[1])) print "%32s %8d %s" % (row[0], row[1], num2sym(row[1]))
def trace_unhandled(event_name, context, event_fields_dict): def trace_unhandled(event_name, context, event_fields_dict):
print ' '.join(['%s=%s'%(k,str(v))for k,v in sorted(event_fields_dict.items())]) print ' '.join(['%s=%s'%(k,str(v))for k,v in sorted(event_fields_dict.items())])
def print_header(event_name, cpu, secs, nsecs, pid, comm):
print "%-20s %5u %05u.%09u %8u %-20s " % \
(event_name, cpu, secs, nsecs, pid, comm),

8
tools/perf/util/scripting-engines/trace-event-python.c
View File

@ -343,7 +343,7 @@ static void python_process_general_event(union perf_event *perf_event __unused,
struct perf_sample *sample, struct perf_sample *sample,
struct perf_evsel *evsel, struct perf_evsel *evsel,
struct machine *machine __unused, struct machine *machine __unused,
struct addr_location *al __unused) struct addr_location *al)
{ {
PyObject *handler, *retval, *t, *dict; PyObject *handler, *retval, *t, *dict;
static char handler_name[64]; static char handler_name[64];
@ -352,7 +352,7 @@ static void python_process_general_event(union perf_event *perf_event __unused,
/* /*
* Use the MAX_FIELDS to make the function expandable, though * Use the MAX_FIELDS to make the function expandable, though
* currently there is only one itme for the tuple. * currently there is only one item for the tuple.
*/ */
t = PyTuple_New(MAX_FIELDS); t = PyTuple_New(MAX_FIELDS);
if (!t) if (!t)
@ -365,10 +365,8 @@ static void python_process_general_event(union perf_event *perf_event __unused,
snprintf(handler_name, sizeof(handler_name), "%s", "process_event"); snprintf(handler_name, sizeof(handler_name), "%s", "process_event");
handler = PyDict_GetItemString(main_dict, handler_name); handler = PyDict_GetItemString(main_dict, handler_name);
if (handler && !PyCallable_Check(handler)) { if (!handler || !PyCallable_Check(handler))
handler = NULL;
goto exit; goto exit;
}
PyDict_SetItemString(dict, "ev_name", PyString_FromString(perf_evsel__name(evsel))); PyDict_SetItemString(dict, "ev_name", PyString_FromString(perf_evsel__name(evsel)));
PyDict_SetItemString(dict, "attr", PyString_FromStringAndSize( PyDict_SetItemString(dict, "attr", PyString_FromStringAndSize(