On Wed, 8 Aug 2012 17:57:53 +0800, Feng Tang wrote:
> Also as suggested by Arnaldo, pack all these parameters to a dictionary,
> which is more expandable for adding new parameters while keeping the
> compatibility for old scripts.
>
Just minor nits.
> Signed-off-by: Feng Tang <feng.t...@intel.com>
> Cc: David Ahern <dsah...@gmail.com>
> Cc: Peter Zijlstra <pet...@infradead.org>
> Cc: Robert Richter <robert.rich...@amd.com>
> Cc: Andi Kleen <a...@firstfloor.org>
> Cc: Stephane Eranian <eran...@google.com>
> ---
> .../util/scripting-engines/trace-event-python.c | 35 ++++++++++++++++---
> 1 files changed, 29 insertions(+), 6 deletions(-)
>
> diff --git a/tools/perf/util/scripting-engines/trace-event-python.c
> b/tools/perf/util/scripting-engines/trace-event-python.c
> index 24711b3..7e3f576 100644
> --- a/tools/perf/util/scripting-engines/trace-event-python.c
> +++ b/tools/perf/util/scripting-engines/trace-event-python.c
> @@ -345,15 +345,23 @@ static void python_process_general_event(union
> perf_event *perf_event __unused,
> struct machine *machine __unused,
> struct addr_location *al __unused)
@al is used now.
> {
> - PyObject *handler, *retval, *t;
> + PyObject *handler, *retval, *t, *dict;
> static char handler_name[64];
> unsigned n = 0;
> - void *data = sample->raw_data;
> + struct thread *thread = al->thread;
>
> + /*
> + * Use the MAX_FIELDS to make the function expandable, though
> + * currently there is only one itme for the tuple.
s/itme/item/
Thanks,
Namhyung
> + */
> t = PyTuple_New(MAX_FIELDS);
> if (!t)
> Py_FatalError("couldn't create Python tuple");
>
> + dict = PyDict_New();
> + if (!dict)
> + Py_FatalError("couldn't create Python dictionary");
> +
> snprintf(handler_name, sizeof(handler_name), "%s", "process_event");
>
> handler = PyDict_GetItemString(main_dict, handler_name);
> @@ -362,11 +370,25 @@ static void python_process_general_event(union
> perf_event *perf_event __unused,
> goto exit;
> }
>
> - /* Pass 4 parameters: event_attr, perf_sample, raw data, thread name */
> - PyTuple_SetItem(t, n++, PyString_FromStringAndSize((void
> *)&evsel->attr, sizeof(evsel->attr)));
> - PyTuple_SetItem(t, n++, PyString_FromStringAndSize((void *)sample,
> sizeof(*sample)));
> - PyTuple_SetItem(t, n++, PyString_FromStringAndSize(data,
> sample->raw_size));
> + PyDict_SetItemString(dict, "ev_name",
> PyString_FromString(perf_evsel__name(evsel)));
> + PyDict_SetItemString(dict, "attr", PyString_FromStringAndSize(
> + (const char *)&evsel->attr, sizeof(evsel->attr)));
> + PyDict_SetItemString(dict, "sample", PyString_FromStringAndSize(
> + (const char *)sample, sizeof(*sample)));
> + PyDict_SetItemString(dict, "raw_buf", PyString_FromStringAndSize(
> + (const char *)sample->raw_data, sample->raw_size));
> + PyDict_SetItemString(dict, "comm",
> + PyString_FromString(thread->comm));
> + if (al->map) {
> + PyDict_SetItemString(dict, "dso",
> + PyString_FromString(al->map->dso->name));
> + }
> + if (al->sym) {
> + PyDict_SetItemString(dict, "symbol",
> + PyString_FromString(al->sym->name));
> + }
>
> + PyTuple_SetItem(t, n++, dict);
> if (_PyTuple_Resize(&t, n) == -1)
> Py_FatalError("error resizing Python tuple");
>
> @@ -374,6 +396,7 @@ static void python_process_general_event(union perf_event
> *perf_event __unused,
> if (retval == NULL)
> handler_call_die(handler_name);
> exit:
> + Py_DECREF(dict);
> Py_DECREF(t);
> }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
