From 9a4ce516d4e529abc07e07cea785bbea1daab729 Mon Sep 17 00:00:00 2001 From: zhang-xiaobo1997 Date: Thu, 10 Feb 2022 21:29:35 +0800 Subject: [PATCH 1/3] Modify for add hichecker Signed-off-by: zhang-xiaobo1997 --- frameworks/kits/js/common/image_source_napi.cpp | 11 +++++++++++ interfaces/innerkits/BUILD.gn | 1 + 2 files changed, 12 insertions(+) diff --git a/frameworks/kits/js/common/image_source_napi.cpp b/frameworks/kits/js/common/image_source_napi.cpp index 585ffbdbf..ef21fc62e 100644 --- a/frameworks/kits/js/common/image_source_napi.cpp +++ b/frameworks/kits/js/common/image_source_napi.cpp @@ -15,9 +15,11 @@ #include "image_source_napi.h" #include +#include #include "hilog/log.h" #include "image_napi_utils.h" #include "media_errors.h" +#include "hichecker.h" using OHOS::HiviewDFX::HiLog; namespace { @@ -608,6 +610,14 @@ static void CreatePixelMapComplete(napi_env env, napi_status status, void *data) ImageSourceCallbackRoutine(env, context, result); } +static void HicheckerReport() +{ + unit32_t pid = getpid(); + unit32_t tid = gettid(); + std::string cautionMsg = "Trigger: pid = " + std::to_string(pid) + ", tid = " + std::to_string(tid); + HiviewDFX::HiChecker::NotifySlowProcess(cautionMsg); +} + napi_value ImageSourceNapi::CreatePixelMap(napi_env env, napi_callback_info info) { napi_value result = nullptr; @@ -668,6 +678,7 @@ napi_value ImageSourceNapi::CreatePixelMap(napi_env env, napi_callback_info info napi_get_undefined(env, &result); } + HicheckerReport(); IMG_CREATE_CREATE_ASYNC_WORK(env, status, "CreatePixelMap", CreatePixelMapExecute, CreatePixelMapComplete, asyncContext, asyncContext->work); diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index a7c4ece4a..c17635b59 100644 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -100,6 +100,7 @@ ohos_shared_library("image") { "bytrace_standard:bytrace_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "hichecker_native:libhichecker", ] relative_install_dir = "module/multimedia" subsystem_name = "multimedia" -- Gitee From 9c45156bca4f32acfef01a7324d0a89a98feaf15 Mon Sep 17 00:00:00 2001 From: zhang-xiaobo1997 Date: Sun, 13 Feb 2022 16:25:07 +0800 Subject: [PATCH 2/3] Modify for Hichecker Signed-off-by: zhang-xiaobo1997 --- frameworks/kits/js/common/image_napi_utils.cpp | 9 +++++++++ frameworks/kits/js/common/image_packer_napi.cpp | 1 + frameworks/kits/js/common/image_source_napi.cpp | 12 +----------- frameworks/kits/js/common/include/image_napi_utils.h | 1 + interfaces/innerkits/BUILD.gn | 2 +- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/frameworks/kits/js/common/image_napi_utils.cpp b/frameworks/kits/js/common/image_napi_utils.cpp index 06df9ce72..3b96c0622 100644 --- a/frameworks/kits/js/common/image_napi_utils.cpp +++ b/frameworks/kits/js/common/image_napi_utils.cpp @@ -15,6 +15,8 @@ #include "image_napi_utils.h" #include +#include +#include "hichecker.h" namespace OHOS { namespace Media { @@ -110,5 +112,12 @@ napi_valuetype ImageNapiUtils::getType(napi_env env, napi_value root) return res; } +void ImageNapiUtils::HicheckerReport() +{ + unit32_t pid = getpid(); + unit32_t tid = gettid(); + std::string cautionMsg = "Trigger: pid = " + std::to_string(pid) + ", tid = " + std::to_string(tid); + HiviewDFX::HiChecker::NotifySlowProcess(cautionMsg); +} } // namespace Media } // namespace OHOS \ No newline at end of file diff --git a/frameworks/kits/js/common/image_packer_napi.cpp b/frameworks/kits/js/common/image_packer_napi.cpp index d957ed00a..255db37cb 100644 --- a/frameworks/kits/js/common/image_packer_napi.cpp +++ b/frameworks/kits/js/common/image_packer_napi.cpp @@ -406,6 +406,7 @@ napi_value ImagePackerNapi::Packing(napi_env env, napi_callback_info info) napi_get_undefined(env, &result); } + ImageNapiUtils::HicheckerReport(); IMG_CREATE_CREATE_ASYNC_WORK(env, status, "Packing", PackingExec, PackingComplete, asyncContext, asyncContext->work); diff --git a/frameworks/kits/js/common/image_source_napi.cpp b/frameworks/kits/js/common/image_source_napi.cpp index ef21fc62e..f7506a91f 100644 --- a/frameworks/kits/js/common/image_source_napi.cpp +++ b/frameworks/kits/js/common/image_source_napi.cpp @@ -15,11 +15,9 @@ #include "image_source_napi.h" #include -#include #include "hilog/log.h" #include "image_napi_utils.h" #include "media_errors.h" -#include "hichecker.h" using OHOS::HiviewDFX::HiLog; namespace { @@ -610,14 +608,6 @@ static void CreatePixelMapComplete(napi_env env, napi_status status, void *data) ImageSourceCallbackRoutine(env, context, result); } -static void HicheckerReport() -{ - unit32_t pid = getpid(); - unit32_t tid = gettid(); - std::string cautionMsg = "Trigger: pid = " + std::to_string(pid) + ", tid = " + std::to_string(tid); - HiviewDFX::HiChecker::NotifySlowProcess(cautionMsg); -} - napi_value ImageSourceNapi::CreatePixelMap(napi_env env, napi_callback_info info) { napi_value result = nullptr; @@ -678,7 +668,7 @@ napi_value ImageSourceNapi::CreatePixelMap(napi_env env, napi_callback_info info napi_get_undefined(env, &result); } - HicheckerReport(); + ImageNapiUtils::HicheckerReport(); IMG_CREATE_CREATE_ASYNC_WORK(env, status, "CreatePixelMap", CreatePixelMapExecute, CreatePixelMapComplete, asyncContext, asyncContext->work); diff --git a/frameworks/kits/js/common/include/image_napi_utils.h b/frameworks/kits/js/common/include/image_napi_utils.h index d8f456bfd..fc18180ee 100644 --- a/frameworks/kits/js/common/include/image_napi_utils.h +++ b/frameworks/kits/js/common/include/image_napi_utils.h @@ -114,6 +114,7 @@ public: static bool GetUtf8String(napi_env env, napi_value root, std::string &res); static napi_valuetype getType(napi_env env, napi_value root); static bool CreateArrayBuffer(napi_env env, void* src, size_t srcLen, napi_value *res); + static void HicheckerReport()； }; } // namespace Media } // namespace OHOS diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index c17635b59..76a585f0f 100644 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -98,9 +98,9 @@ ohos_shared_library("image") { external_deps = [ "bytrace_standard:bytrace_core", + "hichecker_native:libhichecker", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "hichecker_native:libhichecker", ] relative_install_dir = "module/multimedia" subsystem_name = "multimedia" -- Gitee From 4871d3339f306ab983dc8c9643da981558b62036 Mon Sep 17 00:00:00 2001 From: zhang-xiaobo1997 Date: Sun, 13 Feb 2022 16:53:01 +0800 Subject: [PATCH 3/3] Modify for Hichecker Signed-off-by: zhang-xiaobo1997 --- frameworks/kits/js/common/image_napi_utils.cpp | 4 ++-- frameworks/kits/js/common/include/image_napi_utils.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frameworks/kits/js/common/image_napi_utils.cpp b/frameworks/kits/js/common/image_napi_utils.cpp index 3b96c0622..cfdd982b5 100644 --- a/frameworks/kits/js/common/image_napi_utils.cpp +++ b/frameworks/kits/js/common/image_napi_utils.cpp @@ -114,8 +114,8 @@ napi_valuetype ImageNapiUtils::getType(napi_env env, napi_value root) void ImageNapiUtils::HicheckerReport() { - unit32_t pid = getpid(); - unit32_t tid = gettid(); + uint32_t pid = getpid(); + uint32_t tid = gettid(); std::string cautionMsg = "Trigger: pid = " + std::to_string(pid) + ", tid = " + std::to_string(tid); HiviewDFX::HiChecker::NotifySlowProcess(cautionMsg); } diff --git a/frameworks/kits/js/common/include/image_napi_utils.h b/frameworks/kits/js/common/include/image_napi_utils.h index fc18180ee..03e59c691 100644 --- a/frameworks/kits/js/common/include/image_napi_utils.h +++ b/frameworks/kits/js/common/include/image_napi_utils.h @@ -114,7 +114,7 @@ public: static bool GetUtf8String(napi_env env, napi_value root, std::string &res); static napi_valuetype getType(napi_env env, napi_value root); static bool CreateArrayBuffer(napi_env env, void* src, size_t srcLen, napi_value *res); - static void HicheckerReport()； + static void HicheckerReport(); }; } // namespace Media } // namespace OHOS -- Gitee