diff --git a/bundle.json b/bundle.json index 6b2a023178db1c23223d7cd460af5772192fe8a5..a265db1a689c77d97282fe2709f478f2f52ad22a 100644 --- a/bundle.json +++ b/bundle.json @@ -31,13 +31,11 @@ "hitrace", "init", "ipc", - "jsoncpp", "libxml2", "safwk", "samgr" ], "third_party": [ - "json" ] }, "build": { diff --git a/frameworks/concurrent_task_client/BUILD.gn b/frameworks/concurrent_task_client/BUILD.gn index f9e134c5a1362bb80a2d36aa82d191e354fdca8e..eb6556fd6c4fc288c12112c5b8284a01ab77499d 100644 --- a/frameworks/concurrent_task_client/BUILD.gn +++ b/frameworks/concurrent_task_client/BUILD.gn @@ -102,7 +102,6 @@ ohos_shared_library("concurrent_task_client") { "hilog:libhilog", "ipc:ipc_core", "ipc:ipc_single", - "jsoncpp:jsoncpp", "samgr:samgr_proxy", ] diff --git a/services/BUILD.gn b/services/BUILD.gn index e6730918b8bfa173caf7be58e6a885644b1e25b8..0052c3dd186c50bd94fb24f978cad4d7ba9e3f10 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -81,7 +81,6 @@ ohos_shared_library("concurrentsvc") { "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_single", - "jsoncpp:jsoncpp", "libxml2:libxml2", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/services/include/concurrent_task_controller_interface.h b/services/include/concurrent_task_controller_interface.h index b62fb664b8f3ae3db48364d931023be6e7cd7fe9..75eee6a07eb23936f803fc72ca0ccb62ff48aaea 100644 --- a/services/include/concurrent_task_controller_interface.h +++ b/services/include/concurrent_task_controller_interface.h @@ -18,9 +18,6 @@ #include -#include "json/json.h" -#include "json/value.h" - #include "concurrent_task_type.h" #include "concurrent_task_idl_types.h" #include "func_loader.h" @@ -28,12 +25,12 @@ namespace OHOS { namespace ConcurrentTask { -using ReportDataFunc = void (*)(uint32_t resType, int64_t value, const Json::Value& payload); -using ReportSceneInfoFunc = void (*)(uint32_t type, const Json::Value& payload); +using ReportDataFunc = void (*)(uint32_t resType, int64_t value, const std::unordered_map& payload); +using ReportSceneInfoFunc = void (*)(uint32_t type, const std::unordered_map& payload); using QueryIntervalFunc = void (*)(int queryItem, IntervalReply& queryRs); -using QueryDeadlineFunc = void (*)(int queryItem, DeadlineReply& ddlReply, const Json::Value& payload); +using QueryDeadlineFunc = void (*)(int queryItem, DeadlineReply& ddlReply, const std::unordered_map& payload); using SetAudioDeadlineFunc = void (*)(int queryItem, int tid, int grpId, IntervalReply& queryRs); -using RequestAuthFunc = void (*)(const Json::Value& payload); +using RequestAuthFunc = void (*)(const std::unordered_map& payload); using InitFunc = void (*)(); using ReleaseFunc = void (*)(); using CreateNewRtgGrpFunc = int (*)(int prioType, int rtNum); @@ -43,11 +40,11 @@ public: static TaskControllerInterface& GetInstance(); TaskControllerInterface(); virtual ~TaskControllerInterface() = default; - void RequestAuth(const Json::Value& payload); - void ReportData(uint32_t resType, int64_t value, const Json::Value& payload); - void ReportSceneInfo(uint32_t type, const Json::Value& payload); + void RequestAuth(const std::unordered_map& payload); + void ReportData(uint32_t resType, int64_t value, const std::unordered_map& payload); + void ReportSceneInfo(uint32_t type, const std::unordered_map& payload); void QueryInterval(int queryItem, IntervalReply& queryRs); - void QueryDeadline(int queryItem, DeadlineReply& ddlReply, const Json::Value& payload); + void QueryDeadline(int queryItem, DeadlineReply& ddlReply, const std::unordered_map& payload); void SetAudioDeadline(int queryItem, int tid, int grpId, IntervalReply& queryRs); void Init(); void Release(); diff --git a/services/include/concurrent_task_service.h b/services/include/concurrent_task_service.h index fe16574c692269e6ef39d8281a548ff4257b443f..a18d8c44891984b013fcb8c0994be0929f46e5f0 100644 --- a/services/include/concurrent_task_service.h +++ b/services/include/concurrent_task_service.h @@ -17,7 +17,6 @@ #define CONCURRENT_TASK_SERVICES_CONCURRENTSEVICE_INCLUDE_CONCURRENT_TASK_SEVICE_H #include -#include "json/json.h" #include "concurrent_task_type.h" #include "concurrent_task_idl_types.h" #include "concurrent_task_service_stub.h" @@ -38,7 +37,6 @@ public: ErrCode SetAudioDeadline(int queryItem, int tid, int grpId, IpcIntervalReply& IpcQueryRs) override; ErrCode RequestAuth(const std::unordered_map& payload) override; - Json::Value MapToJson(const std::unordered_map& dataMap); IntervalReply IpcToQueryRs(const IpcIntervalReply& IpcQueryRs); IpcIntervalReply QueryRsToIpc(const IntervalReply& queryRs); DeadlineReply IpcToDdlReply(const IpcDeadlineReply& IpcDdlReply); diff --git a/services/src/concurrent_task_controller_interface.cpp b/services/src/concurrent_task_controller_interface.cpp index b9f955a8662e6f435059197dd7a7fcc5423384e4..2343e0807e1847dc60754e72ab332ac58455b006 100644 --- a/services/src/concurrent_task_controller_interface.cpp +++ b/services/src/concurrent_task_controller_interface.cpp @@ -44,7 +44,7 @@ TaskControllerInterface& TaskControllerInterface::GetInstance() return instance; } -void TaskControllerInterface::RequestAuth(const Json::Value& payload) +void TaskControllerInterface::RequestAuth(const std::unordered_map& payload) { if (!inited_) { CONCUR_LOGE("[TaskControllerInterface] RequestAuth failed, funcLoader_ load func failed"); @@ -53,7 +53,7 @@ void TaskControllerInterface::RequestAuth(const Json::Value& payload) requestAuthFunc_(payload); } -void TaskControllerInterface::ReportData(uint32_t resType, int64_t value, const Json::Value& payload) +void TaskControllerInterface::ReportData(uint32_t resType, int64_t value, const std::unordered_map& payload) { if (!inited_) { CONCUR_LOGE("[TaskControllerInterface] ReportData failed, funcLoader_ load func failed"); @@ -62,7 +62,7 @@ void TaskControllerInterface::ReportData(uint32_t resType, int64_t value, const reportDataFunc_(resType, value, payload); } -void TaskControllerInterface::ReportSceneInfo(uint32_t type, const Json::Value& payload) +void TaskControllerInterface::ReportSceneInfo(uint32_t type, const std::unordered_map& payload) { if (!inited_) { CONCUR_LOGE("[TaskControllerInterface] ReportSceneInfo failed, funcLoader_ load func failed"); @@ -80,7 +80,7 @@ void TaskControllerInterface::QueryInterval(int queryItem, IntervalReply& queryR queryIntervalFunc_(queryItem, queryRs); } -void TaskControllerInterface::QueryDeadline(int queryItem, DeadlineReply& ddlReply, const Json::Value& payload) +void TaskControllerInterface::QueryDeadline(int queryItem, DeadlineReply& ddlReply, const std::unordered_map& payload) { if (!inited_) { CONCUR_LOGE("[TaskControllerInterface] QueryDeadline failed, funcLoader_ load func failed"); diff --git a/services/src/concurrent_task_service.cpp b/services/src/concurrent_task_service.cpp index 59ea934b793b53bb468533e45eecf9c9ac7a0c4c..5c5d78492cab1d0b9eefceb4693229637bbd8d17 100644 --- a/services/src/concurrent_task_service.cpp +++ b/services/src/concurrent_task_service.cpp @@ -23,16 +23,14 @@ namespace ConcurrentTask { ErrCode ConcurrentTaskService::ReportData( uint32_t resType, int64_t value, const std::unordered_map& payload) { - Json::Value payloadData = MapToJson(payload); - TaskControllerInterface::GetInstance().ReportData(resType, value, payloadData); + TaskControllerInterface::GetInstance().ReportData(resType, value, payload); return ERR_OK; } ErrCode ConcurrentTaskService::ReportSceneInfo( uint32_t type, const std::unordered_map& payload) { - Json::Value payloadData = MapToJson(payload); - TaskControllerInterface::GetInstance().ReportSceneInfo(type, payloadData); + TaskControllerInterface::GetInstance().ReportSceneInfo(type, payload); return ERR_OK; } @@ -55,28 +53,17 @@ ErrCode ConcurrentTaskService::SetAudioDeadline(int queryItem, int tid, int grpI ErrCode ConcurrentTaskService::QueryDeadline( int queryItem, const IpcDeadlineReply& IpcDdlReply, const std::unordered_map& payload) { - Json::Value payloadData = MapToJson(payload); DeadlineReply queryRs = IpcToDdlReply(IpcDdlReply); - TaskControllerInterface::GetInstance().QueryDeadline(queryItem, queryRs, payloadData); + TaskControllerInterface::GetInstance().QueryDeadline(queryItem, queryRs, payload); return ERR_OK; } ErrCode ConcurrentTaskService::RequestAuth(const std::unordered_map& payload) { - Json::Value payloadData = MapToJson(payload); - TaskControllerInterface::GetInstance().RequestAuth(payloadData); + TaskControllerInterface::GetInstance().RequestAuth(payload); return ERR_OK; } -Json::Value ConcurrentTaskService::MapToJson(const std::unordered_map& dataMap) -{ - Json::Value root; - for (const auto& pair : dataMap) { - root[pair.first] = pair.second; - } - return root; -} - IntervalReply ConcurrentTaskService::IpcToQueryRs(const IpcIntervalReply& IpcQueryRs) { IntervalReply queryRs; diff --git a/test/BUILD.gn b/test/BUILD.gn index 70496db2e7c7d6fc38790f8c48754d05e7eb6397..979d59fcc4e79e00603f11a0190a762def634cd0 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -100,7 +100,6 @@ ohos_unittest("func_loader_test") { "frame_aware_sched:rtg_interface", "hilog:libhilog", "init:libbegetutil", - "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] @@ -130,7 +129,6 @@ ohos_unittest("concurrent_task_controller_interface_test") { "frame_aware_sched:rtg_interface", "hilog:libhilog", "init:libbegetutil", - "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] @@ -157,7 +155,6 @@ ohos_unittest("concurrent_task_service_ability_test") { "c_utils:utils", "frame_aware_sched:rtg_interface", "hilog:libhilog", - "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] @@ -237,7 +234,6 @@ ohos_unittest("concurrent_task_service_test") { "c_utils:utils", "frame_aware_sched:rtg_interface", "hilog:libhilog", - "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/test/fuzztest/concurrent_fuzzer/BUILD.gn b/test/fuzztest/concurrent_fuzzer/BUILD.gn index 92043f0bd661bf4610e237126ff2190585050e73..82e29557ce52d7092359c728826c5be83d8bea7c 100644 --- a/test/fuzztest/concurrent_fuzzer/BUILD.gn +++ b/test/fuzztest/concurrent_fuzzer/BUILD.gn @@ -44,7 +44,6 @@ ohos_fuzztest("ConcurrentFuzzTest") { "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_single", - "jsoncpp:jsoncpp", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/test/fuzztest/concurrent_fuzzer/concurrent_fuzzer.cpp b/test/fuzztest/concurrent_fuzzer/concurrent_fuzzer.cpp index e442480cc61bef57b68daa8fc3626e030d0edb07..8e3a5f9b27a0faf6c679fce61b1d99d9c491218c 100644 --- a/test/fuzztest/concurrent_fuzzer/concurrent_fuzzer.cpp +++ b/test/fuzztest/concurrent_fuzzer/concurrent_fuzzer.cpp @@ -404,10 +404,10 @@ bool FuzzConcurrentTaskControllerInterfaceReportData(const uint8_t* data, size_t if (size > sizeof(uint32_t) + sizeof(int64_t) + sizeof(uint32_t) + sizeof(uint32_t)) { uint32_t resType = fdp.ConsumeIntegral(); int64_t value = fdp.ConsumeIntegral(); - Json::Value jsValue; - jsValue["1111"] = std::to_string(fdp.ConsumeIntegral()); - jsValue["2222"] = std::to_string(fdp.ConsumeIntegral()); - TaskControllerInterface::GetInstance().ReportData(resType, value, jsValue); + std::unordered_map payload; + payload["1111"] = std::to_string(fdp.ConsumeIntegral()); + payload["2222"] = std::to_string(fdp.ConsumeIntegral()); + TaskControllerInterface::GetInstance().ReportData(resType, value, payload); } return true; } @@ -417,10 +417,10 @@ bool FuzzConcurrentTaskControllerInterfaceReportSceneInfo(const uint8_t* data, s FuzzedDataProvider fdp(data, size); if (size > sizeof(uint32_t) + sizeof(uint32_t) + sizeof(uint32_t)) { uint32_t resType = fdp.ConsumeIntegral(); - Json::Value jsValue; - jsValue["1111"] = std::to_string(fdp.ConsumeIntegral()); - jsValue["2222"] = std::to_string(fdp.ConsumeIntegral()); - TaskControllerInterface::GetInstance().ReportSceneInfo(resType, jsValue); + std::unordered_map payload; + payload["1111"] = std::to_string(fdp.ConsumeIntegral()); + payload["2222"] = std::to_string(fdp.ConsumeIntegral()); + TaskControllerInterface::GetInstance().ReportSceneInfo(resType, payload); } return true; } @@ -445,11 +445,11 @@ bool FuzzConcurrentTaskControllerInterfaceQueryDeadline(const uint8_t* data, siz int deadlineType = fdp.ConsumeIntegral(); deadlineType = deadlineType % (MSG_GAME + 1); DeadlineReply queryRs; - Json::Value jsValue; - jsValue["2123"] = std::to_string(fdp.ConsumeIntegral()); - jsValue["2333"] = std::to_string(fdp.ConsumeIntegral()); + std::unordered_map payload; + payload["2123"] = std::to_string(fdp.ConsumeIntegral()); + payload["2333"] = std::to_string(fdp.ConsumeIntegral()); ConcurrentTaskService s = ConcurrentTaskService(); - TaskControllerInterface::GetInstance().QueryDeadline(deadlineType, queryRs, jsValue); + TaskControllerInterface::GetInstance().QueryDeadline(deadlineType, queryRs, payload); } return true; } @@ -471,7 +471,7 @@ bool FuzzConcurrentTaskControllerInterfaceRequestAuth(const uint8_t* data, size_ { FuzzedDataProvider fdp(data, size); if (size > sizeof(int) + sizeof(int)) { - Json::Value payload; + std::unordered_map payload; payload["2187"] = std::to_string(fdp.ConsumeIntegral()); payload["2376"] = std::to_string(fdp.ConsumeIntegral()); ConcurrentTaskService s = ConcurrentTaskService(); diff --git a/test/unittest/phone/concurrent_task_controller_interface_test.cpp b/test/unittest/phone/concurrent_task_controller_interface_test.cpp index cb61ce398950a8eac8268ba5ca1ffcd85c0b1c25..82ed853e4b4a9543e51e93020f50e04677d06604 100644 --- a/test/unittest/phone/concurrent_task_controller_interface_test.cpp +++ b/test/unittest/phone/concurrent_task_controller_interface_test.cpp @@ -56,7 +56,7 @@ void ConcurrentTaskControllerInterfaceTest::TearDown() {} */ HWTEST_F(ConcurrentTaskControllerInterfaceTest, RequestAuthTest, TestSize.Level1) { - const Json::Value payload; + const std::unordered_map payload; TaskControllerInterface repData; repData.RequestAuth(payload); EXPECT_TRUE(payload.empty()); @@ -71,7 +71,7 @@ HWTEST_F(ConcurrentTaskControllerInterfaceTest, ReportDataTest, TestSize.Level1) { uint32_t resType = 0; int64_t value = 0; - const Json::Value payload; + const std::unordered_map payload; TaskControllerInterface repData; repData.ReportData(resType, value, payload); EXPECT_TRUE(payload.empty()); @@ -85,7 +85,7 @@ HWTEST_F(ConcurrentTaskControllerInterfaceTest, ReportDataTest, TestSize.Level1) HWTEST_F(ConcurrentTaskControllerInterfaceTest, ReportSceneInfoTest, TestSize.Level1) { uint32_t resType = 0; - const Json::Value payload; + const std::unordered_map payload; TaskControllerInterface repData; repData.ReportSceneInfo(resType, payload); EXPECT_TRUE(payload.empty()); @@ -100,7 +100,7 @@ HWTEST_F(ConcurrentTaskControllerInterfaceTest, QueryDeadlineTest, TestSize.Leve { int queryItem = DDL_RATE; DeadlineReply ddlReply = {false}; - const Json::Value payload; + const std::unordered_map payload; TaskControllerInterface::GetInstance().QueryDeadline(queryItem, ddlReply, payload); EXPECT_TRUE(payload.empty()); } diff --git a/test/unittest/phone/concurrent_task_service_test.cpp b/test/unittest/phone/concurrent_task_service_test.cpp index 62b320a6b6468d0bf33f5f12c409ea839ad5d3c4..421467ffcfbc68ba0b8cda8d9b1a57cbe7b817f2 100644 --- a/test/unittest/phone/concurrent_task_service_test.cpp +++ b/test/unittest/phone/concurrent_task_service_test.cpp @@ -15,7 +15,7 @@ #include "gtest/gtest.h" #include "concurrent_task_service.h" -#include "json/json.h" + namespace OHOS { namespace FFRT_TEST { @@ -79,29 +79,6 @@ HWTEST_F(ConcurrentTaskServiceTest, QueryDeadlineTest, TestSize.Level1) EXPECT_FALSE(payload.empty()); } -/** - * @tc.name: MapToJsonTest - * @tc.desc: Test MapToJson function with a non-empty and empty map - * @tc.type: FUNC - */ -HWTEST_F(ConcurrentTaskServiceTest, MapToJsonTest, TestSize.Level1) -{ - ConcurrentTaskService service; - - std::unordered_map dataMap = {{"key1", "value1"}, {"key2", "value2"}, {"key3", "value3"}}; - Json::Value expectedJson; - expectedJson["key1"] = "value1"; - expectedJson["key2"] = "value2"; - expectedJson["key3"] = "value3"; - Json::Value resultJson = service.MapToJson(dataMap); - EXPECT_EQ(expectedJson, resultJson); - - std::unordered_map dataMap2; - Json::Value expectedJson2; - Json::Value resultJson2 = service.MapToJson(dataMap2); - EXPECT_EQ(expectedJson2, resultJson2); -} - /** * @tc.name: IpcToQueryRsTest * @tc.desc: Test whether the IpcToQueryRsTest interface are normal.