[PATCH] perf: add missing cpu entry in json output

[PATCH] perf: add missing cpu entry in json output

[Oleg Latin]

After converting perf.data with 'perf covert data --to-json' the
resulting json file missing cpu entries:

	{
	    "timestamp": 5716840788599,
	    "pid": 79661,
	    "tid": 79661,
	    "comm": "python3",
	    "callchain": [
		{
		    "ip": "0xffffffffafd05fc0"
		}
	    ]
	},

Seems addr_location::thread::cpu is never assigned during
machine__resolve() call. This patch uses addr_location::cpu to store it
in json file.

Signed-off-by: Oleg Latin <oleglatin@yandex-team.ru>
---
 tools/perf/util/data-convert-json.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/data-convert-json.c b/tools/perf/util/data-convert-json.c
index f1ab6edba446..b0e3d69c6835 100644
--- a/tools/perf/util/data-convert-json.c
+++ b/tools/perf/util/data-convert-json.c
@@ -168,8 +168,8 @@ static int process_sample_event(struct perf_tool *tool,
 	output_json_key_format(out, true, 3, "pid", "%i", al.thread->pid_);
 	output_json_key_format(out, true, 3, "tid", "%i", al.thread->tid);
 
-	if (al.thread->cpu >= 0)
-		output_json_key_format(out, true, 3, "cpu", "%i", al.thread->cpu);
+	if (al.cpu >= 0)
+		output_json_key_format(out, true, 3, "cpu", "%i", al.cpu);
 
 	output_json_key_string(out, true, 3, "comm", thread__comm_str(al.thread));
 
-- 
2.25.1

Re: [PATCH] perf: add missing cpu entry in json output

[Jiri Olsa]

On Fri, Nov 12, 2021 at 02:57:38PM +0300, Oleg Latin wrote:
> After converting perf.data with 'perf covert data --to-json' the
> resulting json file missing cpu entries:
> 
> 	{
> 	    "timestamp": 5716840788599,
> 	    "pid": 79661,
> 	    "tid": 79661,
> 	    "comm": "python3",
> 	    "callchain": [
> 		{
> 		    "ip": "0xffffffffafd05fc0"
> 		}
> 	    ]
> 	},
> 
> Seems addr_location::thread::cpu is never assigned during
> machine__resolve() call. This patch uses addr_location::cpu to store it
> in json file.
> 
> Signed-off-by: Oleg Latin <oleglatin@yandex-team.ru>

Acked-by: Jiri Olsa <jolsa@redhat.com>

thanks,
jirka

> ---
>  tools/perf/util/data-convert-json.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/perf/util/data-convert-json.c b/tools/perf/util/data-convert-json.c
> index f1ab6edba446..b0e3d69c6835 100644
> --- a/tools/perf/util/data-convert-json.c
> +++ b/tools/perf/util/data-convert-json.c
> @@ -168,8 +168,8 @@ static int process_sample_event(struct perf_tool *tool,
>  	output_json_key_format(out, true, 3, "pid", "%i", al.thread->pid_);
>  	output_json_key_format(out, true, 3, "tid", "%i", al.thread->tid);
>  
> -	if (al.thread->cpu >= 0)
> -		output_json_key_format(out, true, 3, "cpu", "%i", al.thread->cpu);
> +	if (al.cpu >= 0)
> +		output_json_key_format(out, true, 3, "cpu", "%i", al.cpu);
>  
>  	output_json_key_string(out, true, 3, "comm", thread__comm_str(al.thread));
>  
> -- 
> 2.25.1
>