[tip:perf/core] perf script: Handle the num array type in python properly
Commit-ID: 8ac631cd502d6b31fd29f6d019305305b479fa3e
Gitweb: http://git.kernel.org/tip/8ac631cd502d6b31fd29f6d019305305b479fa3e
Author: Sebastian Andrzej Siewior
AuthorDate: Tue, 27 May 2014 18:14:34 +0200
Committer: Jiri Olsa
CommitDate: Fri, 27 Jun 2014 11:15:02 +0200
perf script: Handle the num array type in python properly
The raw_syscalls:sys_enter tracer for instance passes has one argument
named 'arg' which is an array of 6 integers. Right the python scripts
gets only 0 passed as an argument. The reason is that
pevent_read_number() can not handle data types of 48 and returns always
0.
This patch changes this by passing num array as list of nums which fit
the description. As a result python will now see a list named arg which
contains 6 (integer) items.
Signed-off-by: Sebastian Andrzej Siewior
Acked-by: Namhyung Kim
Link:
http://lkml.kernel.org/n/1401207274-8170-2-git-send-email-bige...@linutronix.de
Signed-off-by: Jiri Olsa
---
.../util/scripting-engines/trace-event-python.c| 43 --
1 file changed, 31 insertions(+), 12 deletions(-)
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c
b/tools/perf/util/scripting-engines/trace-event-python.c
index 99c2536..e55b65a 100644
--- a/tools/perf/util/scripting-engines/trace-event-python.c
+++ b/tools/perf/util/scripting-engines/trace-event-python.c
@@ -234,22 +234,41 @@ static inline struct event_format
*find_cache_event(struct perf_evsel *evsel)
static PyObject *get_field_numeric_entry(struct event_format *event,
struct format_field *field, void *data)
{
- PyObject *obj;
+ bool is_array = field->flags & FIELD_IS_ARRAY;
+ PyObject *obj, *list = NULL;
unsigned long long val;
+ unsigned int item_size, n_items, i;
- val = read_size(event, data + field->offset, field->size);
- if (field->flags & FIELD_IS_SIGNED) {
- if ((long long)val >= LONG_MIN &&
- (long long)val <= LONG_MAX)
- obj = PyInt_FromLong(val);
- else
- obj = PyLong_FromLongLong(val);
+ if (is_array) {
+ list = PyList_New(field->arraylen);
+ item_size = field->size / field->arraylen;
+ n_items = field->arraylen;
} else {
- if (val <= LONG_MAX)
- obj = PyInt_FromLong(val);
- else
- obj = PyLong_FromUnsignedLongLong(val);
+ item_size = field->size;
+ n_items = 1;
+ }
+
+ for (i = 0; i < n_items; i++) {
+
+ val = read_size(event, data + field->offset + i * item_size,
+ item_size);
+ if (field->flags & FIELD_IS_SIGNED) {
+ if ((long long)val >= LONG_MIN &&
+ (long long)val <= LONG_MAX)
+ obj = PyInt_FromLong(val);
+ else
+ obj = PyLong_FromLongLong(val);
+ } else {
+ if (val <= LONG_MAX)
+ obj = PyInt_FromLong(val);
+ else
+ obj = PyLong_FromUnsignedLongLong(val);
+ }
+ if (is_array)
+ PyList_SET_ITEM(list, i, obj);
}
+ if (is_array)
+ obj = list;
return obj;
}
--
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/
[tip:perf/core] perf script: Handle the num array type in python properly
Commit-ID: 8ac631cd502d6b31fd29f6d019305305b479fa3e
Gitweb: http://git.kernel.org/tip/8ac631cd502d6b31fd29f6d019305305b479fa3e
Author: Sebastian Andrzej Siewior bige...@linutronix.de
AuthorDate: Tue, 27 May 2014 18:14:34 +0200
Committer: Jiri Olsa jo...@kernel.org
CommitDate: Fri, 27 Jun 2014 11:15:02 +0200
perf script: Handle the num array type in python properly
The raw_syscalls:sys_enter tracer for instance passes has one argument
named 'arg' which is an array of 6 integers. Right the python scripts
gets only 0 passed as an argument. The reason is that
pevent_read_number() can not handle data types of 48 and returns always
0.
This patch changes this by passing num array as list of nums which fit
the description. As a result python will now see a list named arg which
contains 6 (integer) items.
Signed-off-by: Sebastian Andrzej Siewior bige...@linutronix.de
Acked-by: Namhyung Kim namhy...@kernel.org
Link:
http://lkml.kernel.org/n/1401207274-8170-2-git-send-email-bige...@linutronix.de
Signed-off-by: Jiri Olsa jo...@kernel.org
---
.../util/scripting-engines/trace-event-python.c| 43 --
1 file changed, 31 insertions(+), 12 deletions(-)
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c
b/tools/perf/util/scripting-engines/trace-event-python.c
index 99c2536..e55b65a 100644
--- a/tools/perf/util/scripting-engines/trace-event-python.c
+++ b/tools/perf/util/scripting-engines/trace-event-python.c
@@ -234,22 +234,41 @@ static inline struct event_format
*find_cache_event(struct perf_evsel *evsel)
static PyObject *get_field_numeric_entry(struct event_format *event,
struct format_field *field, void *data)
{
- PyObject *obj;
+ bool is_array = field-flags FIELD_IS_ARRAY;
+ PyObject *obj, *list = NULL;
unsigned long long val;
+ unsigned int item_size, n_items, i;
- val = read_size(event, data + field-offset, field-size);
- if (field-flags FIELD_IS_SIGNED) {
- if ((long long)val = LONG_MIN
- (long long)val = LONG_MAX)
- obj = PyInt_FromLong(val);
- else
- obj = PyLong_FromLongLong(val);
+ if (is_array) {
+ list = PyList_New(field-arraylen);
+ item_size = field-size / field-arraylen;
+ n_items = field-arraylen;
} else {
- if (val = LONG_MAX)
- obj = PyInt_FromLong(val);
- else
- obj = PyLong_FromUnsignedLongLong(val);
+ item_size = field-size;
+ n_items = 1;
+ }
+
+ for (i = 0; i n_items; i++) {
+
+ val = read_size(event, data + field-offset + i * item_size,
+ item_size);
+ if (field-flags FIELD_IS_SIGNED) {
+ if ((long long)val = LONG_MIN
+ (long long)val = LONG_MAX)
+ obj = PyInt_FromLong(val);
+ else
+ obj = PyLong_FromLongLong(val);
+ } else {
+ if (val = LONG_MAX)
+ obj = PyInt_FromLong(val);
+ else
+ obj = PyLong_FromUnsignedLongLong(val);
+ }
+ if (is_array)
+ PyList_SET_ITEM(list, i, obj);
}
+ if (is_array)
+ obj = list;
return obj;
}
--
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/
