From 60bed9d368ab18d3ccc34498ba02cce566ed8f5c Mon Sep 17 00:00:00 2001 From: shanghuanni Date: Wed, 5 Jul 2023 11:37:21 +0800 Subject: [PATCH 1/7] =?UTF-8?q?DFX=E9=83=A8=E4=BB=B6=E5=90=8D=E6=95=B4?= =?UTF-8?q?=E6=94=B9=EF=BC=8Chilog=5Fnative/hiviewdfx=5Fhilog=5Fnative?= =?UTF-8?q?=E6=94=B9=E4=B8=BAhilog=EF=BC=8Chitrace=5Fnative=E6=94=B9?= =?UTF-8?q?=E4=B8=BAhitrace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shanghuanni --- bundle.json | 4 ++-- frameworks/concurrent_task_client/BUILD.gn | 2 +- services/BUILD.gn | 2 +- test/BUILD.gn | 14 +++++++------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bundle.json b/bundle.json index 5f91db1..62241f7 100644 --- a/bundle.json +++ b/bundle.json @@ -28,8 +28,8 @@ "c_utils", "eventhandler", "frame_aware_sched", - "hitrace_native", - "hiviewdfx_hilog_native", + "hilog", + "hitrace", "ipc", "safwk", "samgr" diff --git a/frameworks/concurrent_task_client/BUILD.gn b/frameworks/concurrent_task_client/BUILD.gn index ac17c97..aef8379 100644 --- a/frameworks/concurrent_task_client/BUILD.gn +++ b/frameworks/concurrent_task_client/BUILD.gn @@ -52,7 +52,7 @@ ohos_shared_library("concurrent_task_client") { external_deps = [ "c_utils:utils", "eventhandler:libeventhandler", - "hiviewdfx_hilog_native:libhilog", + "hilog:libhilog", "ipc:ipc_single", "samgr:samgr_proxy", ] diff --git a/services/BUILD.gn b/services/BUILD.gn index 0ea6add..441805a 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -51,7 +51,7 @@ ohos_shared_library("concurrentsvc") { "c_utils:utils", "eventhandler:libeventhandler", "frame_aware_sched:rtg_interface", - "hiviewdfx_hilog_native:libhilog", + "hilog:libhilog", "ipc:ipc_single", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/test/BUILD.gn b/test/BUILD.gn index 04085b1..31a1d26 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -84,7 +84,7 @@ ohos_unittest("concurrent_svc_intf_test") { "safwk:system_ability_fwk", "samgr:samgr_proxy", "ipc:ipc_single", - "hiviewdfx_hilog_native:libhilog", + "hilog:libhilog", ] if (is_standard_system) { @@ -116,7 +116,7 @@ ohos_unittest("concurrent_task_client_test") { external_deps = [ "ipc:ipc_single", - "hiviewdfx_hilog_native:libhilog", + "hilog:libhilog", ] subsystem_name = "resourceschedule" @@ -142,7 +142,7 @@ ohos_unittest("concurrent_task_controller_test") { external_deps = [ "c_utils:utils", - "hiviewdfx_hilog_native:libhilog", + "hilog:libhilog", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] @@ -172,7 +172,7 @@ ohos_unittest("concurrent_task_service_ability_test") { ] external_deps = [ "c_utils:utils", - "hiviewdfx_hilog_native:libhilog", + "hilog:libhilog", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] @@ -204,7 +204,7 @@ ohos_unittest("qos_interface_test") { "c_utils:utils", "safwk:system_ability_fwk", "samgr:samgr_proxy", - "hiviewdfx_hilog_native:libhilog", + "hilog:libhilog", ] if (is_standard_system) { @@ -234,7 +234,7 @@ ohos_unittest("qos_manager_test") { "c_utils:utils", "safwk:system_ability_fwk", "samgr:samgr_proxy", - "hiviewdfx_hilog_native:libhilog", + "hilog:libhilog", ] if (is_standard_system) { @@ -264,7 +264,7 @@ ohos_unittest("concurrent_task_service_test") { "c_utils:utils", "safwk:system_ability_fwk", "samgr:samgr_proxy", - "hiviewdfx_hilog_native:libhilog", + "hilog:libhilog", ] if (is_standard_system) { -- Gitee From 126db1c5ab0acdecb31df7adfd6369e8ecf26f45 Mon Sep 17 00:00:00 2001 From: shanghuanni Date: Wed, 5 Jul 2023 15:02:15 +0800 Subject: [PATCH 2/7] =?UTF-8?q?DFX=E9=83=A8=E4=BB=B6=E5=90=8D=E6=95=B4?= =?UTF-8?q?=E6=94=B9=EF=BC=8Chilog=5Fnative/hiviewdfx=5Fhilog=5Fnative?= =?UTF-8?q?=E6=94=B9=E4=B8=BAhilog=EF=BC=8Chitrace=5Fnative=E6=94=B9?= =?UTF-8?q?=E4=B8=BAhitrace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shanghuanni --- frameworks/concurrent_task_client/BUILD.gn | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/frameworks/concurrent_task_client/BUILD.gn b/frameworks/concurrent_task_client/BUILD.gn index aef8379..a335234 100644 --- a/frameworks/concurrent_task_client/BUILD.gn +++ b/frameworks/concurrent_task_client/BUILD.gn @@ -28,15 +28,13 @@ config("client_private_config") { } config("client_public_config") { - visibility = [":*"] + visibility = [ ":*" ] cflags = [ "-fstack-protector-strong" ] include_dirs = [ "include" ] } ohos_shared_library("concurrent_task_client") { - configs = [ - ":client_private_config", - ] + configs = [ ":client_private_config" ] public_configs = [ ":client_public_config" ] @@ -45,9 +43,7 @@ ohos_shared_library("concurrent_task_client") { "src/concurrent_task_service_proxy.cpp", ] - deps = [ - "//third_party/jsoncpp:jsoncpp", - ] + deps = [ "//third_party/jsoncpp:jsoncpp" ] external_deps = [ "c_utils:utils", -- Gitee From b4f61afb59647dcbe60c4fe9814293e4871aea69 Mon Sep 17 00:00:00 2001 From: shanghuanni Date: Wed, 5 Jul 2023 16:29:27 +0800 Subject: [PATCH 3/7] =?UTF-8?q?DFX=E9=83=A8=E4=BB=B6=E5=90=8D=E6=95=B4?= =?UTF-8?q?=E6=94=B9=EF=BC=8Chilog=5Fnative/hiviewdfx=5Fhilog=5Fnative?= =?UTF-8?q?=E6=94=B9=E4=B8=BAhilog=EF=BC=8Chitrace=5Fnative=E6=94=B9?= =?UTF-8?q?=E4=B8=BAhitrace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shanghuanni --- services/BUILD.gn | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/services/BUILD.gn b/services/BUILD.gn index 441805a..d4dab5b 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -29,23 +29,18 @@ config("concurrent_task_config") { } ohos_shared_library("concurrentsvc") { - - public_configs = [ - ":concurrent_task_config", - ] + public_configs = [ ":concurrent_task_config" ] sources = [ + "src/concurrent_task_controller.cpp", "src/concurrent_task_service.cpp", "src/concurrent_task_service_ability.cpp", "src/concurrent_task_service_stub.cpp", - "src/concurrent_task_controller.cpp", "src/qos_interface.cpp", "src/qos_manager.cpp", ] - deps = [ - "//third_party/jsoncpp:jsoncpp", - ] + deps = [ "//third_party/jsoncpp:jsoncpp" ] external_deps = [ "c_utils:utils", -- Gitee From fef1580ddb482842f2f69e30525d42b599b555f1 Mon Sep 17 00:00:00 2001 From: shanghuanni Date: Wed, 5 Jul 2023 18:01:02 +0800 Subject: [PATCH 4/7] =?UTF-8?q?DFX=E9=83=A8=E4=BB=B6=E5=90=8D=E6=95=B4?= =?UTF-8?q?=E6=94=B9=EF=BC=8Chilog=5Fnative/hiviewdfx=5Fhilog=5Fnative?= =?UTF-8?q?=E6=94=B9=E4=B8=BAhilog=EF=BC=8Chitrace=5Fnative=E6=94=B9?= =?UTF-8?q?=E4=B8=BAhitrace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shanghuanni --- services/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/BUILD.gn b/services/BUILD.gn index d4dab5b..ac88952 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") config("concurrent_task_config") { - visibility = [":*"] + visibility = [ ":*" ] cflags_cc = [ "-fexceptions" ] include_dirs = [ "include", -- Gitee From fae75ab8367822a4e8e2ad37edf67fd30df52f68 Mon Sep 17 00:00:00 2001 From: shanghuanni Date: Wed, 5 Jul 2023 18:22:30 +0800 Subject: [PATCH 5/7] =?UTF-8?q?DFX=E9=83=A8=E4=BB=B6=E5=90=8D=E6=95=B4?= =?UTF-8?q?=E6=94=B9=EF=BC=8Chilog=5Fnative/hiviewdfx=5Fhilog=5Fnative?= =?UTF-8?q?=E6=94=B9=E4=B8=BAhilog=EF=BC=8Chitrace=5Fnative=E6=94=B9?= =?UTF-8?q?=E4=B8=BAhitrace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shanghuanni --- test/BUILD.gn | 310 +++++++++++++++++++++++--------------------------- 1 file changed, 145 insertions(+), 165 deletions(-) diff --git a/test/BUILD.gn b/test/BUILD.gn index 31a1d26..ab39237 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -50,14 +50,14 @@ config("ffrt_test_config") { "QOS_CHECKPOINT", "QOS_SUBMIT", "QOS_DEMO", - "ATRACE_MODE=0", # 0 is off, 5 is bytrace, 6 is pmu + "ATRACE_MODE=0", # 0 is off, 5 is bytrace, 6 is pmu "ATRACE_LEVEL=0", "ATRACE_LOGI_ENABLE=0", "ATRACE_LOGD_ENABLE=0", "ATRACE_SCOPE_LOG_ENABLE=0", "ATRACE_DURATION_LOG_ENABLE=0", "FFRT_RELEASE", - "DISABLE_MONITOR" + "DISABLE_MONITOR", ] if (target_cpu == "arm64") { @@ -66,213 +66,193 @@ config("ffrt_test_config") { } ohos_unittest("concurrent_svc_intf_test") { - module_out_path = module_output_path - - configs = [ - ":test_config", - ] - - sources = [ - "unittest/phone/concurrent_svc_intf_test.cpp", - ] - deps = [ - "../frameworks/concurrent_task_client:concurrent_task_client", - ] - external_deps = [ - "c_utils:utils", - "eventhandler:libeventhandler", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", - "ipc:ipc_single", - "hilog:libhilog", - ] + module_out_path = module_output_path + + configs = [ ":test_config" ] + + sources = [ "unittest/phone/concurrent_svc_intf_test.cpp" ] + deps = [ "../frameworks/concurrent_task_client:concurrent_task_client" ] + external_deps = [ + "c_utils:utils", + "eventhandler:libeventhandler", + "hilog:libhilog", + "ipc:ipc_single", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", + ] - if (is_standard_system) { - public_deps = gtest_public_deps - } + if (is_standard_system) { + public_deps = gtest_public_deps + } - subsystem_name = "resourceschedule" - part_name = "resourceschedule_qos_manager" + subsystem_name = "resourceschedule" + part_name = "resourceschedule_qos_manager" } ohos_unittest("concurrent_task_client_test") { - module_out_path = module_output_path + module_out_path = module_output_path - configs = [ - ":ffrt_test_config", - ":test_config", - ] + configs = [ + ":ffrt_test_config", + ":test_config", + ] - sources = [ - "unittest/phone/concurrent_task_client_test.cpp", - ] - deps = [ - "../frameworks/concurrent_task_client:concurrent_task_client", - ] + sources = [ "unittest/phone/concurrent_task_client_test.cpp" ] + deps = [ "../frameworks/concurrent_task_client:concurrent_task_client" ] - if (is_standard_system) { - public_deps = gtest_public_deps - } + if (is_standard_system) { + public_deps = gtest_public_deps + } - external_deps = [ - "ipc:ipc_single", - "hilog:libhilog", - ] + external_deps = [ + "hilog:libhilog", + "ipc:ipc_single", + ] - subsystem_name = "resourceschedule" - part_name = "resourceschedule_qos_manager" + subsystem_name = "resourceschedule" + part_name = "resourceschedule_qos_manager" } ohos_unittest("concurrent_task_controller_test") { - module_out_path = module_output_path + module_out_path = module_output_path - configs = [ - ":ffrt_test_config", - ":test_config", - ] + configs = [ + ":ffrt_test_config", + ":test_config", + ] - sources = [ - "unittest/phone/concurrent_task_controller_test.cpp", - ] - deps = [ - "../services:concurrentsvc", - "../frameworks/concurrent_task_client:concurrent_task_client", - "//third_party/jsoncpp:jsoncpp", - ] + sources = [ "unittest/phone/concurrent_task_controller_test.cpp" ] + deps = [ + "../frameworks/concurrent_task_client:concurrent_task_client", + "../services:concurrentsvc", + "//third_party/jsoncpp:jsoncpp", + ] - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", - ] + external_deps = [ + "c_utils:utils", + "hilog:libhilog", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", + ] - if (is_standard_system) { - public_deps = gtest_public_deps - } + if (is_standard_system) { + public_deps = gtest_public_deps + } - subsystem_name = "resourceschedule" - part_name = "resourceschedule_qos_manager" + subsystem_name = "resourceschedule" + part_name = "resourceschedule_qos_manager" } ohos_unittest("concurrent_task_service_ability_test") { - module_out_path = module_output_path + module_out_path = module_output_path - configs = [ - ":ffrt_test_config", - ":test_config", - ] + configs = [ + ":ffrt_test_config", + ":test_config", + ] - sources = [ - "unittest/phone/concurrent_task_service_ability_test.cpp", - ] - deps = [ - "../services:concurrentsvc", - "../frameworks/concurrent_task_client:concurrent_task_client", - ] - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", - ] + sources = [ "unittest/phone/concurrent_task_service_ability_test.cpp" ] + deps = [ + "../frameworks/concurrent_task_client:concurrent_task_client", + "../services:concurrentsvc", + ] + external_deps = [ + "c_utils:utils", + "hilog:libhilog", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", + ] - if (is_standard_system) { - public_deps = gtest_public_deps - } + if (is_standard_system) { + public_deps = gtest_public_deps + } - subsystem_name = "resourceschedule" - part_name = "resourceschedule_qos_manager" + subsystem_name = "resourceschedule" + part_name = "resourceschedule_qos_manager" } ohos_unittest("qos_interface_test") { - module_out_path = module_output_path + module_out_path = module_output_path - configs = [ - ":ffrt_test_config", - ":test_config", - ] + configs = [ + ":ffrt_test_config", + ":test_config", + ] - sources = [ - "unittest/phone/qos_interface_test.cpp", - ] - deps = [ - "../services:concurrentsvc", - "../frameworks/concurrent_task_client:concurrent_task_client", - ] - external_deps = [ - "c_utils:utils", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", - "hilog:libhilog", - ] + sources = [ "unittest/phone/qos_interface_test.cpp" ] + deps = [ + "../frameworks/concurrent_task_client:concurrent_task_client", + "../services:concurrentsvc", + ] + external_deps = [ + "c_utils:utils", + "hilog:libhilog", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", + ] - if (is_standard_system) { - public_deps = gtest_public_deps - } + if (is_standard_system) { + public_deps = gtest_public_deps + } - subsystem_name = "resourceschedule" - part_name = "resourceschedule_qos_manager" + subsystem_name = "resourceschedule" + part_name = "resourceschedule_qos_manager" } ohos_unittest("qos_manager_test") { - module_out_path = module_output_path + module_out_path = module_output_path - configs = [ - ":ffrt_test_config", - ":test_config", - ] + configs = [ + ":ffrt_test_config", + ":test_config", + ] - sources = [ - "unittest/phone/qos_manager_test.cpp", - ] - deps = [ - "../services:concurrentsvc", - "../frameworks/concurrent_task_client:concurrent_task_client", - ] - external_deps = [ - "c_utils:utils", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", - "hilog:libhilog", - ] + sources = [ "unittest/phone/qos_manager_test.cpp" ] + deps = [ + "../frameworks/concurrent_task_client:concurrent_task_client", + "../services:concurrentsvc", + ] + external_deps = [ + "c_utils:utils", + "hilog:libhilog", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", + ] - if (is_standard_system) { - public_deps = gtest_public_deps - } + if (is_standard_system) { + public_deps = gtest_public_deps + } - subsystem_name = "resourceschedule" - part_name = "resourceschedule_qos_manager" + subsystem_name = "resourceschedule" + part_name = "resourceschedule_qos_manager" } ohos_unittest("concurrent_task_service_test") { - module_out_path = module_output_path + module_out_path = module_output_path - configs = [ - ":ffrt_test_config", - ":test_config", - ] + configs = [ + ":ffrt_test_config", + ":test_config", + ] - sources = [ - "unittest/phone/concurrent_task_service_test.cpp", - ] - deps = [ - "../services:concurrentsvc", - "../frameworks/concurrent_task_client:concurrent_task_client", - ] - external_deps = [ - "c_utils:utils", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", - "hilog:libhilog", - ] + sources = [ "unittest/phone/concurrent_task_service_test.cpp" ] + deps = [ + "../frameworks/concurrent_task_client:concurrent_task_client", + "../services:concurrentsvc", + ] + external_deps = [ + "c_utils:utils", + "hilog:libhilog", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", + ] - if (is_standard_system) { - public_deps = gtest_public_deps - } + if (is_standard_system) { + public_deps = gtest_public_deps + } - subsystem_name = "resourceschedule" - part_name = "resourceschedule_qos_manager" + subsystem_name = "resourceschedule" + part_name = "resourceschedule_qos_manager" } group("concurrent_unittest") { @@ -280,13 +260,13 @@ group("concurrent_unittest") { deps = [] if (!is_asan) { deps += [ - ":qos_interface_test", - ":qos_manager_test", ":concurrent_svc_intf_test", ":concurrent_task_client_test", ":concurrent_task_controller_test", ":concurrent_task_service_ability_test", ":concurrent_task_service_test", + ":qos_interface_test", + ":qos_manager_test", ] } } -- Gitee From 6c90c6fdb386a85ade98916e298ee2be72dbd9ce Mon Sep 17 00:00:00 2001 From: shanghuanni Date: Thu, 6 Jul 2023 10:11:01 +0800 Subject: [PATCH 6/7] =?UTF-8?q?DFX=E9=83=A8=E4=BB=B6=E5=90=8D=E6=95=B4?= =?UTF-8?q?=E6=94=B9=EF=BC=8Chilog=5Fnative/hiviewdfx=5Fhilog=5Fnative?= =?UTF-8?q?=E6=94=B9=E4=B8=BAhilog=EF=BC=8Chitrace=5Fnative=E6=94=B9?= =?UTF-8?q?=E4=B8=BAhitrace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shanghuanni --- test/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/BUILD.gn b/test/BUILD.gn index ab39237..91a072d 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -50,7 +50,7 @@ config("ffrt_test_config") { "QOS_CHECKPOINT", "QOS_SUBMIT", "QOS_DEMO", - "ATRACE_MODE=0", # 0 is off, 5 is bytrace, 6 is pmu + "ATRACE_MODE=0", # 0 is off, 5 is bytrace, 6 is pmu "ATRACE_LEVEL=0", "ATRACE_LOGI_ENABLE=0", "ATRACE_LOGD_ENABLE=0", -- Gitee From 30e7bf10425c698a62ed19593da30b306407990e Mon Sep 17 00:00:00 2001 From: shanghuanni Date: Thu, 6 Jul 2023 10:47:26 +0800 Subject: [PATCH 7/7] =?UTF-8?q?DFX=E9=83=A8=E4=BB=B6=E5=90=8D=E6=95=B4?= =?UTF-8?q?=E6=94=B9=EF=BC=8Chilog=5Fnative/hiviewdfx=5Fhilog=5Fnative?= =?UTF-8?q?=E6=94=B9=E4=B8=BAhilog=EF=BC=8Chitrace=5Fnative=E6=94=B9?= =?UTF-8?q?=E4=B8=BAhitrace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shanghuanni --- test/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/BUILD.gn b/test/BUILD.gn index 91a072d..ab39237 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -50,7 +50,7 @@ config("ffrt_test_config") { "QOS_CHECKPOINT", "QOS_SUBMIT", "QOS_DEMO", - "ATRACE_MODE=0", # 0 is off, 5 is bytrace, 6 is pmu + "ATRACE_MODE=0", # 0 is off, 5 is bytrace, 6 is pmu "ATRACE_LEVEL=0", "ATRACE_LOGI_ENABLE=0", "ATRACE_LOGD_ENABLE=0", -- Gitee