From 48cecd0ad155dd56118258010c7d5de3c8e27f07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 19 Sep 2023 10:50:52 +0800 Subject: [PATCH] CPU: update JSON format structure --- src/modules/cpu/cpu.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/modules/cpu/cpu.c b/src/modules/cpu/cpu.c index 644cda9f4..3cd5a6cf7 100644 --- a/src/modules/cpu/cpu.c +++ b/src/modules/cpu/cpu.c @@ -152,11 +152,16 @@ void ffGenerateCPUJson(FFCPUOptions* options, yyjson_mut_doc* doc, yyjson_mut_va yyjson_mut_val* obj = yyjson_mut_obj_add_obj(doc, module, "result"); yyjson_mut_obj_add_strbuf(doc, obj, "cpu", &cpu.name); yyjson_mut_obj_add_strbuf(doc, obj, "vendor", &cpu.vendor); - yyjson_mut_obj_add_uint(doc, obj, "coresPhysical", cpu.coresPhysical); - yyjson_mut_obj_add_uint(doc, obj, "coresLogical", cpu.coresLogical); - yyjson_mut_obj_add_uint(doc, obj, "coresOnline", cpu.coresOnline); - yyjson_mut_obj_add_real(doc, obj, "frequencyMin", cpu.frequencyMin); - yyjson_mut_obj_add_real(doc, obj, "frequencyMax", cpu.frequencyMax); + + yyjson_mut_val* cores = yyjson_mut_obj_add_obj(doc, obj, "cores"); + yyjson_mut_obj_add_uint(doc, cores, "physical", cpu.coresPhysical); + yyjson_mut_obj_add_uint(doc, cores, "logical", cpu.coresLogical); + yyjson_mut_obj_add_uint(doc, cores, "online", cpu.coresOnline); + + yyjson_mut_val* frequency = yyjson_mut_obj_add_obj(doc, obj, "frequency"); + yyjson_mut_obj_add_real(doc, frequency, "min", cpu.frequencyMin); + yyjson_mut_obj_add_real(doc, frequency, "max", cpu.frequencyMax); + yyjson_mut_obj_add_real(doc, obj, "temperature", cpu.temperature); }