From: Jiri Pirko <jiri@mellanox.com>
To: Jiri Olsa <jolsa@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>,
lkml <linux-kernel@vger.kernel.org>,
David Ahern <dsahern@gmail.com>, Ingo Molnar <mingo@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
"Steven Rostedt (Red Hat)" <rostedt@goodmis.org>
Subject: Re: [PATCH 1/3] perf script python: Fix string vs byte array resolving
Date: Mon, 18 Jul 2016 13:44:20 +0200 [thread overview]
Message-ID: <20160718114420.GI2075@nanopsycho.orion> (raw)
In-Reply-To: <1468685480-18951-2-git-send-email-jolsa@kernel.org>
Sat, Jul 16, 2016 at 06:11:18PM CEST, jolsa@kernel.org wrote:
>Jirka reported that python code returns all arrays as strings.
>This makes impossible to get all items for byte array tracepoint
>field containing 0x00 value item.
>
>Fixing this by scanning full length of the array and returning
>it as PyByteArray object in case non printable byte is found.
>
>Link: http://lkml.kernel.org/n/tip-22f4vhhz5uytegkggy1on8u3@git.kernel.org
>Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Jiri Pirko <jiri@mellanox.com>
>---
> .../util/scripting-engines/trace-event-python.c | 39 ++++++++++++++++++----
> 1 file changed, 33 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 6ac6b7a33f42..7bd6da80533e 100644
>--- a/tools/perf/util/scripting-engines/trace-event-python.c
>+++ b/tools/perf/util/scripting-engines/trace-event-python.c
>@@ -386,6 +386,21 @@ exit:
> return pylist;
> }
>
>+static int is_printable_array(char *p, unsigned int len)
>+{
>+ unsigned int i;
>+
>+ if (!p || !len || p[len - 1] != 0)
>+ return 0;
>+
>+ len--;
>+
>+ for (i = 0; i < len; i++) {
>+ if (!isprint(p[i]) && !isspace(p[i]))
>+ return 0;
>+ }
>+ return 1;
>+}
>
> static void python_process_tracepoint(struct perf_sample *sample,
> struct perf_evsel *evsel,
>@@ -457,14 +472,26 @@ static void python_process_tracepoint(struct perf_sample *sample,
> pydict_set_item_string_decref(dict, "common_callchain", callchain);
> }
> for (field = event->format.fields; field; field = field->next) {
>- if (field->flags & FIELD_IS_STRING) {
>- int offset;
>+ unsigned int offset, len;
>+ unsigned long long val;
>+
>+ if (field->flags & FIELD_IS_ARRAY) {
>+ offset = field->offset;
>+ len = field->size;
> if (field->flags & FIELD_IS_DYNAMIC) {
>- offset = *(int *)(data + field->offset);
>+ val = pevent_read_number(scripting_context->pevent,
>+ data + offset, len);
>+ offset = val;
>+ len = offset >> 16;
> offset &= 0xffff;
>- } else
>- offset = field->offset;
>- obj = PyString_FromString((char *)data + offset);
>+ }
>+ if (field->flags & FIELD_IS_STRING &&
>+ is_printable_array(data + offset, len)) {
>+ obj = PyString_FromString((char *) data + offset);
>+ } else {
>+ obj = PyByteArray_FromStringAndSize((const char *) data + offset, len);
>+ field->flags &= ~FIELD_IS_STRING;
>+ }
> } else { /* FIELD_IS_NUMERIC */
> obj = get_field_numeric_entry(event, field, data);
> }
>--
>2.4.11
>
next prev parent reply other threads:[~2016-07-18 12:17 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-16 16:11 [PATCHv3 0/3] perf python: Add support to access tracepoint fields Jiri Olsa
2016-07-16 16:11 ` [PATCH 1/3] perf script python: Fix string vs byte array resolving Jiri Olsa
2016-07-18 11:44 ` Jiri Pirko [this message]
2016-07-19 6:54 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-07-16 16:11 ` [PATCH 2/3] perf tools: Make is_printable_array global Jiri Olsa
2016-07-18 11:44 ` Jiri Pirko
2016-07-19 6:54 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-07-16 16:11 ` [PATCH 3/3] perf tests: Add is_printable_array test Jiri Olsa
2016-07-18 11:46 ` Jiri Pirko
2016-07-18 12:14 ` Jiri Olsa
2016-07-18 22:49 ` Arnaldo Carvalho de Melo
2016-07-19 6:55 ` [tip:perf/core] " tip-bot for Jiri Olsa
-- strict thread matches above, loose matches on Subject: below --
2016-07-15 7:29 [PATCHv2 0/3] perf python: Add support to access tracepoint fields Jiri Olsa
2016-07-15 7:29 ` [PATCH 1/3] perf script python: Fix string vs byte array resolving Jiri Olsa
2016-07-15 7:32 ` Jiri Olsa
2016-07-15 15:30 ` Steven Rostedt
2016-07-15 15:51 ` Jiri Pirko
2016-07-15 16:02 ` Steven Rostedt
2016-07-15 16:13 ` Jiri Olsa
2016-07-15 16:37 ` Arnaldo Carvalho de Melo
2016-07-15 16:38 ` Arnaldo Carvalho de Melo
2016-07-15 17:16 ` Steven Rostedt
2016-07-15 17:18 ` Steven Rostedt
2016-07-16 15:58 ` Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160718114420.GI2075@nanopsycho.orion \
--to=jiri@mellanox.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=dsahern@gmail.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).