From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758147Ab2F1JUm (ORCPT ); Thu, 28 Jun 2012 05:20:42 -0400 Received: from mga09.intel.com ([134.134.136.24]:35329 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756799Ab2F1JTv (ORCPT ); Thu, 28 Jun 2012 05:19:51 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.67,352,1309762800"; d="scan'208";a="159147526" From: Feng Tang To: Arnaldo Carvalho de Melo , David Ahern , Peter Zijlstra , Ingo Molnar , linux-kernel@vger.kernel.org Cc: Robert Richter , Andi Kleen , Stephane Eranian , Feng Tang , David Ahern , Peter Zijlstra Subject: [PATCH v4 3/5] perf script/python: Pass event/thread/dso name and symbol info to event handler in python Date: Thu, 28 Jun 2012 17:15:32 +0800 Message-Id: <1340874934-25661-4-git-send-email-feng.tang@intel.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1340874934-25661-1-git-send-email-feng.tang@intel.com> References: <1340874934-25661-1-git-send-email-feng.tang@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Signed-off-by: Feng Tang Cc: David Ahern Cc: Peter Zijlstra Cc: Robert Richter Cc: Andi Kleen Cc: Stephane Eranian --- .../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 0be4ec0..b20d633 100644 --- a/tools/perf/util/scripting-engines/trace-event-python.c +++ b/tools/perf/util/scripting-engines/trace-event-python.c @@ -340,15 +340,23 @@ static void python_process_general_event(union perf_event *perf_event __unused, struct machine *machine __unused, struct addr_location *al __unused) { - 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. + */ 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); @@ -357,11 +365,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"); @@ -369,6 +391,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); } -- 1.7.1