From d9ac92a739ee7f20abd85052fff9141eb5347b1c Mon Sep 17 00:00:00 2001 From: Haibo Huang Date: Wed, 24 Feb 2021 17:34:50 -0800 Subject: [PATCH] [libprocessgroup] Use new jsoncpp API Reader / StyledWriter are deprecated upstream Bug: 170642246 Change-Id: Iadc944af17cad9640ed31364116d16f2b971434f --- libprocessgroup/setup/cgroup_map_write.cpp | 8 +++++--- libprocessgroup/task_profiles.cpp | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libprocessgroup/setup/cgroup_map_write.cpp b/libprocessgroup/setup/cgroup_map_write.cpp index 753fd2dfc..aa41acbdc 100644 --- a/libprocessgroup/setup/cgroup_map_write.cpp +++ b/libprocessgroup/setup/cgroup_map_write.cpp @@ -183,10 +183,12 @@ static bool ReadDescriptorsFromFile(const std::string& file_name, return false; } - Json::Reader reader; + Json::CharReaderBuilder builder; + std::unique_ptr reader(builder.newCharReader()); Json::Value root; - if (!reader.parse(json_doc, root)) { - LOG(ERROR) << "Failed to parse cgroups description: " << reader.getFormattedErrorMessages(); + std::string errorMessage; + if (!reader->parse(&*json_doc.begin(), &*json_doc.end(), &root, &errorMessage)) { + LOG(ERROR) << "Failed to parse cgroups description: " << errorMessage; return false; } diff --git a/libprocessgroup/task_profiles.cpp b/libprocessgroup/task_profiles.cpp index 8d4ce2545..f13a6815c 100644 --- a/libprocessgroup/task_profiles.cpp +++ b/libprocessgroup/task_profiles.cpp @@ -425,10 +425,12 @@ bool TaskProfiles::Load(const CgroupMap& cg_map, const std::string& file_name) { return false; } - Json::Reader reader; + Json::CharReaderBuilder builder; + std::unique_ptr reader(builder.newCharReader()); Json::Value root; - if (!reader.parse(json_doc, root)) { - LOG(ERROR) << "Failed to parse task profiles: " << reader.getFormattedErrorMessages(); + std::string errorMessage; + if (!reader->parse(&*json_doc.begin(), &*json_doc.end(), &root, &errorMessage)) { + LOG(ERROR) << "Failed to parse task profiles: " << errorMessage; return false; }