perf data: Prefer sampled CPU when exporting JSON
PATCH 1/1 perf data: Prefer sampled CPU when exporting JSON
When CPU has been explicitly sampled (via --sample-cpu), prefer this sampled value over the thread CPU value when exporting to JSON.
--- tools/perf/util/data-convert-json.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/perf/util/data-convert-json.c +4 -1
@@ -149,6 +149,7 @@ static int process_sample_event(struct perf_tool *tool, struct convert_json *c = container_of(tool, struct convert_json, tool);FILE *out = c->out;struct addr_location al, tal; +u64 sample_type =__evlist__combined_sample_type (evsel->evlist);u8 cpumode =PERF_RECORD_MISC_USER ;if (machine__resolve (machine, &al, sample) <0 ) {
@@ -168,7 +169,9 @@ 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 ) +if ((sample_type &PERF_SAMPLE_CPU )) +output_json_key_format (out, true,3 ,"cpu" ,"%i" , sample->cpu); +else if (al.thread->cpu >=0 )output_json_key_format (out, true,3 ,"cpu" ,"%i" , al.thread->cpu);output_json_key_string (out, true,3 ,"comm" ,thread__comm_str (al.thread));
Signature · 1 line
2.36.1
Quoted 34 lines · Shawn M. Chapla
When CPU has been explicitly sampled (via --sample-cpu), prefer this sampled value over the thread CPU value when exporting to JSON.
Signed-off-by Shawn M. Chapla <[email protected]>--- tools/perf/util/data-convert-json.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)tools/perf/util/data-convert-json.c +4
-1@@ -149,6 +149,7 @@ static int process_sample_event(struct perf_tool *tool, struct convert_json *c = container_of(tool, struct convert_json, tool);FILE *out = c->out;struct addr_location al, tal; +u64 sample_type =__evlist__combined_sample_type (evsel->evlist);u8 cpumode =PERF_RECORD_MISC_USER ;if (machine__resolve (machine, &al, sample) <0 ) {@@ -168,7 +169,9 @@ 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 ) +if ((sample_type &PERF_SAMPLE_CPU )) +output_json_key_format (out, true,3 ,"cpu" ,"%i" , sample->cpu); +else if (al.thread->cpu >=0 )output_json_key_format (out, true,3 ,"cpu" ,"%i" , al.thread->cpu);output_json_key_string (out, true,3 ,"comm" ,thread__comm_str (al.thread));Signature · 1 line
2.36.1
Just checking in to see if anyone has had a chance to take a look at this yet.
Thanks,
Shawn
Arnaldo Carvalho de Melo
maintainerEm Wed, Jun 22, 2022 at 10:42:43AM -0400, Shawn M. Chapla escreveu:
Quoted 31 lines · Shawn M. Chapla
Quoted 30 lines
When CPU has been explicitly sampled (via --sample-cpu), prefer this sampled value over the thread CPU value when exporting to JSON.
Signed-off-by Shawn M. Chapla <[email protected]>--- tools/perf/util/data-convert-json.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)tools/perf/util/data-convert-json.c +4
-1@@ -149,6 +149,7 @@ static int process_sample_event(struct perf_tool *tool, struct convert_json *c = container_of(tool, struct convert_json, tool);FILE *out = c->out;struct addr_location al, tal; +u64 sample_type =__evlist__combined_sample_type (evsel->evlist);u8 cpumode =PERF_RECORD_MISC_USER ;if (machine__resolve (machine, &al, sample) <0 ) {@@ -168,7 +169,9 @@ 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 ) +if ((sample_type &PERF_SAMPLE_CPU )) +output_json_key_format (out, true,3 ,"cpu" ,"%i" , sample->cpu); +else if (al.thread->cpu >=0 )output_json_key_format (out, true,3 ,"cpu" ,"%i" , al.thread->cpu);
Quoted 7 lines
Quoted 4 lines
tools/perf/util/data-convert-json.c +0
-0output_json_key_string (out, true,3 ,"comm" ,thread__comm_str (al.thread));Signature · 1 line
2.36.1Just checking in to see if anyone has had a chance to take a look at this yet.
Seems sensible, applying to perf/core for 5.20.
- Arnaldo
Quoted 40 lines · Arnaldo Carvalho de Melo
Em Wed, Jun 22, 2022 at 10:42:43AM -0400, Shawn M. Chapla escreveu:
Quoted 31 lines · Shawn M. Chapla
Quoted 30 lines
When CPU has been explicitly sampled (via --sample-cpu), prefer this sampled value over the thread CPU value when exporting to JSON.
Signed-off-by Shawn M. Chapla <[email protected]>--- tools/perf/util/data-convert-json.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)tools/perf/util/data-convert-json.c +4
-1@@ -149,6 +149,7 @@ static int process_sample_event(struct perf_tool *tool, struct convert_json *c = container_of(tool, struct convert_json, tool);FILE *out = c->out;struct addr_location al, tal; +u64 sample_type =__evlist__combined_sample_type (evsel->evlist);u8 cpumode =PERF_RECORD_MISC_USER ;if (machine__resolve (machine, &al, sample) <0 ) {@@ -168,7 +169,9 @@ 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 ) +if ((sample_type &PERF_SAMPLE_CPU )) +output_json_key_format (out, true,3 ,"cpu" ,"%i" , sample->cpu); +else if (al.thread->cpu >=0 )output_json_key_format (out, true,3 ,"cpu" ,"%i" , al.thread->cpu);Quoted 7 lines
Quoted 4 lines
tools/perf/util/data-convert-json.c +0
-0output_json_key_string (out, true,3 ,"comm" ,thread__comm_str (al.thread));Signature · 1 line
2.36.1Just checking in to see if anyone has had a chance to take a look at this yet.
Quoted 3 lines
Seems sensible, applying to perf/core for 5.20.
- Arnaldo
Thank you! I appreciate it.
Cheers,
Shawn