[RFC PATCH v1] perf data: Add fields when converting to json

[RFC PATCH v1] perf data: Add fields when converting to json

[Dmitrii Dolgov]

When converting recorded data into json format, perf data omits probe
variables. Add them to the output in the format "field name": "field value"
using tep_print_field:

    $ perf data convert --to-json output.json

    // output.json
    {
        "linux-perf-json-version": 1,
        "headers": { ... },
        "samples": [
            {
            "timestamp": 29182079082999,
            "pid": 309194,
                    [...]
            "__probe_ip": "0x93ee35",
            "query_string_string": "select 2;",
            "nxids": "0"
            }
        ]
    }

Signed-off-by: Dmitrii Dolgov <9erthalion6@gmail.com>
---
 tools/perf/util/data-convert-json.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tools/perf/util/data-convert-json.c b/tools/perf/util/data-convert-json.c
index 613d6ae82663..d30816eafb2f 100644
--- a/tools/perf/util/data-convert-json.c
+++ b/tools/perf/util/data-convert-json.c
@@ -217,6 +217,26 @@ static int process_sample_event(struct perf_tool *tool,
 	}
 	output_json_format(out, false, 3, "]");
 
+	if (sample->raw_data) {
+		int i;
+		struct tep_format_field **fields;
+
+		fields = tep_event_fields(evsel->tp_format);
+		if (fields != NULL) {
+			i = 0;
+			while (fields[i]) {
+				struct trace_seq s;
+
+				trace_seq_init(&s);
+				tep_print_field(&s, sample->raw_data, fields[i]);
+				output_json_key_string(out, true, 3, fields[i]->name, s.buffer);
+
+				i++;
+			}
+			free(fields);
+		}
+	}
+
 	output_json_format(out, false, 2, "}");
 	return 0;
 }
-- 
2.27.0

Re: [RFC PATCH v1] perf data: Add fields when converting to json

[Ian Rogers]

On Tue, Nov 8, 2022 at 11:00 AM Dmitrii Dolgov <9erthalion6@gmail.com> wrote:
>
> When converting recorded data into json format, perf data omits probe
> variables. Add them to the output in the format "field name": "field value"
> using tep_print_field:
>
>     $ perf data convert --to-json output.json
>
>     // output.json
>     {
>         "linux-perf-json-version": 1,
>         "headers": { ... },
>         "samples": [
>             {
>             "timestamp": 29182079082999,
>             "pid": 309194,
>                     [...]
>             "__probe_ip": "0x93ee35",
>             "query_string_string": "select 2;",
>             "nxids": "0"
>             }
>         ]
>     }
>
> Signed-off-by: Dmitrii Dolgov <9erthalion6@gmail.com>

Acked-by: Ian Rogers <irogers@google.com>

Thanks,
Ian

> ---
>  tools/perf/util/data-convert-json.c | 20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)
>
> diff --git a/tools/perf/util/data-convert-json.c b/tools/perf/util/data-convert-json.c
> index 613d6ae82663..d30816eafb2f 100644
> --- a/tools/perf/util/data-convert-json.c
> +++ b/tools/perf/util/data-convert-json.c
> @@ -217,6 +217,26 @@ static int process_sample_event(struct perf_tool *tool,
>         }
>         output_json_format(out, false, 3, "]");
>
> +       if (sample->raw_data) {
> +               int i;
> +               struct tep_format_field **fields;
> +
> +               fields = tep_event_fields(evsel->tp_format);
> +               if (fields != NULL) {

nit: just "if(fields) {" as you did above with sample->raw_data

> +                       i = 0;
> +                       while (fields[i]) {
> +                               struct trace_seq s;
> +
> +                               trace_seq_init(&s);
> +                               tep_print_field(&s, sample->raw_data, fields[i]);
> +                               output_json_key_string(out, true, 3, fields[i]->name, s.buffer);
> +
> +                               i++;
> +                       }
> +                       free(fields);
> +               }
> +       }
> +
>         output_json_format(out, false, 2, "}");
>         return 0;
>  }
> --
> 2.27.0
>

Re: [RFC PATCH v1] perf data: Add fields when converting to json

[Dmitry Dolgov]

> On Tue, Nov 08, 2022 at 05:35:28PM -0800, Ian Rogers wrote:
> On Tue, Nov 8, 2022 at 11:00 AM Dmitrii Dolgov <9erthalion6@gmail.com> wrote:
> > ---
> >  tools/perf/util/data-convert-json.c | 20 ++++++++++++++++++++
> >  1 file changed, 20 insertions(+)
> >
> > diff --git a/tools/perf/util/data-convert-json.c b/tools/perf/util/data-convert-json.c
> > index 613d6ae82663..d30816eafb2f 100644
> > --- a/tools/perf/util/data-convert-json.c
> > +++ b/tools/perf/util/data-convert-json.c
> > @@ -217,6 +217,26 @@ static int process_sample_event(struct perf_tool *tool,
> >         }
> >         output_json_format(out, false, 3, "]");
> >
> > +       if (sample->raw_data) {
> > +               int i;
> > +               struct tep_format_field **fields;
> > +
> > +               fields = tep_event_fields(evsel->tp_format);
> > +               if (fields != NULL) {
>
> nit: just "if(fields) {" as you did above with sample->raw_data

Thanks for looking into it, will send a new one shortly.

Re: [RFC PATCH v1] perf data: Add fields when converting to json

[Arnaldo Carvalho de Melo]

Em Tue, Nov 08, 2022 at 05:35:28PM -0800, Ian Rogers escreveu:
> On Tue, Nov 8, 2022 at 11:00 AM Dmitrii Dolgov <9erthalion6@gmail.com> wrote:
> >
> > When converting recorded data into json format, perf data omits probe
> > variables. Add them to the output in the format "field name": "field value"
> > using tep_print_field:
> >
> >     $ perf data convert --to-json output.json
> >
> >     // output.json
> >     {
> >         "linux-perf-json-version": 1,
> >         "headers": { ... },
> >         "samples": [
> >             {
> >             "timestamp": 29182079082999,
> >             "pid": 309194,
> >                     [...]
> >             "__probe_ip": "0x93ee35",
> >             "query_string_string": "select 2;",
> >             "nxids": "0"
> >             }
> >         ]
> >     }
> >
> > Signed-off-by: Dmitrii Dolgov <9erthalion6@gmail.com>
> 
> Acked-by: Ian Rogers <irogers@google.com>

Thanks, applied.

- Arnaldo