Unverified Commit 918c8391 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6625 v2 perf data convert: Fix segfault when converting to json when cpu_desc isn't set 

Merge Pull Request from: @ci-robot 
 
PR sync from: SuperSix173 <liuchao173@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/WVSC4AYI7XP2A243CC2IG7L263SMHGD3/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9IEXU 
 
Link:https://gitee.com/openeuler/kernel/pulls/6625

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Signed-off-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
parents 6773f12a 719e17c8

tools/perf/util/data-convert-json.c

+3 −1
Original line number Diff line number Diff line
@@ -284,7 +284,9 @@ static void output_headers(struct perf_session *session, struct convert_json *c) 
	output_json_key_string(out, true, 2, "os-release", header->env.os_release);

	output_json_key_string(out, true, 2, "arch", header->env.arch);



	if (header->env.cpu_desc)

		output_json_key_string(out, true, 2, "cpu-desc", header->env.cpu_desc);



	output_json_key_string(out, true, 2, "cpuid", header->env.cpuid);

	output_json_key_format(out, true, 2, "nrcpus-online", "%u", header->env.nr_cpus_online);

	output_json_key_format(out, true, 2, "nrcpus-avail", "%u", header->env.nr_cpus_avail);