From 7109fd1ec05a2c794e9d49a2a80928ad03712b8f Mon Sep 17 00:00:00 2001 From: xiekaiming Date: Mon, 22 Jan 2024 14:53:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xiekaiming --- interfaces/kits/js/src/config_policy_napi.cpp | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/interfaces/kits/js/src/config_policy_napi.cpp b/interfaces/kits/js/src/config_policy_napi.cpp index 1e1c9aa..c35262e 100644 --- a/interfaces/kits/js/src/config_policy_napi.cpp +++ b/interfaces/kits/js/src/config_policy_napi.cpp @@ -87,11 +87,13 @@ void ConfigPolicyNapi::CreateFollowXModeObject(napi_env env, napi_value value) napi_value ConfigPolicyNapi::NAPIGetOneCfgFile(napi_env env, napi_callback_info info) { + HiLog::Debug(LABEL, "NAPIGetOneCfgFile start."); return GetOneCfgFileOrAllCfgFiles(env, info, "NAPIGetOneCfgFile", NativeGetOneCfgFile); } napi_value ConfigPolicyNapi::NAPIGetOneCfgFileSync(napi_env env, napi_callback_info info) { + HiLog::Debug(LABEL, "NAPIGetOneCfgFileSync start."); return GetOneCfgFileOrAllCfgFilesSync(env, info, NativeGetOneCfgFileSync); } @@ -186,16 +188,19 @@ napi_value ConfigPolicyNapi::GetOneCfgFileOrAllCfgFiles(napi_env env, napi_callb napi_value ConfigPolicyNapi::NAPIGetCfgFiles(napi_env env, napi_callback_info info) { + HiLog::Debug(LABEL, "NAPIGetCfgFiles start."); return GetOneCfgFileOrAllCfgFiles(env, info, "NAPIGetCfgFiles", NativeGetCfgFiles); } napi_value ConfigPolicyNapi::NAPIGetCfgFilesSync(napi_env env, napi_callback_info info) { + HiLog::Debug(LABEL, "NAPIGetCfgFilesSync start."); return GetOneCfgFileOrAllCfgFilesSync(env, info, NativeGetCfgFilesSync); } napi_value ConfigPolicyNapi::NAPIGetCfgDirList(napi_env env, napi_callback_info info) { + HiLog::Debug(LABEL, "NAPIGetCfgDirList start."); size_t argc = ARGS_SIZE_ONE; napi_value argv[ARGS_SIZE_ONE] = {nullptr}; napi_value thisVar = nullptr; @@ -216,6 +221,7 @@ napi_value ConfigPolicyNapi::NAPIGetCfgDirList(napi_env env, napi_callback_info napi_value ConfigPolicyNapi::NAPIGetCfgDirListSync(napi_env env, napi_callback_info info) { + HiLog::Debug(LABEL, "NAPIGetCfgDirListSync start."); auto asyncContext = std::make_shared(); return NativeGetCfgDirListSync(env, asyncContext); } @@ -248,6 +254,7 @@ std::string ConfigPolicyNapi::GetStringFromNAPI(napi_env env, napi_value value) napi_value ConfigPolicyNapi::HandleAsyncWork(napi_env env, ConfigAsyncContext *context, std::string workName, napi_async_execute_callback execute, napi_async_complete_callback complete) { + HiLog::Debug(LABEL, "HandleAsyncWork start."); if (context == nullptr) { HiLog::Error(LABEL, "context is nullptr"); return nullptr; @@ -265,6 +272,7 @@ napi_value ConfigPolicyNapi::HandleAsyncWork(napi_env env, ConfigAsyncContext *c napi_create_async_work(env, resource, resourceName, execute, complete, static_cast(context), &context->work_); napi_queue_async_work_with_qos(env, context->work_, napi_qos_default); + HiLog::Debug(LABEL, "HandleAsyncWork end."); return result; } @@ -277,6 +285,7 @@ bool ConfigPolicyNapi::MatchValueType(napi_env env, napi_value value, napi_value void ConfigPolicyNapi::NativeGetOneCfgFile(napi_env env, void *data) { + HiLog::Debug(LABEL, "NativeGetOneCfgFile start."); if (data == nullptr) { HiLog::Error(LABEL, "data is nullptr"); return; @@ -289,6 +298,7 @@ void ConfigPolicyNapi::NativeGetOneCfgFile(napi_env env, void *data) HiLog::Info(LABEL, "GetOneCfgFileEx result is nullptr."); } else { asyncCallbackInfo->pathValue_ = std::string(filePath); + HiLog::Debug(LABEL, "GetOneCfgFileEx native success."); } ReportConfigPolicyEvent(ReportType::CONFIG_POLICY_EVENT, "getOneCfgFile", ""); asyncCallbackInfo->createValueFunc_ = [](napi_env env, ConfigAsyncContext &context) -> napi_value { @@ -300,6 +310,7 @@ void ConfigPolicyNapi::NativeGetOneCfgFile(napi_env env, void *data) napi_value ConfigPolicyNapi::NativeGetOneCfgFileSync(napi_env env, std::shared_ptr context) { + HiLog::Debug(LABEL, "NativeGetOneCfgFileSync start."); char outBuf[MAX_PATH_LEN] = {0}; char *filePath = GetOneCfgFileEx(context->relPath_.c_str(), outBuf, MAX_PATH_LEN, context->followMode_, context->extra_.c_str()); @@ -307,6 +318,7 @@ napi_value ConfigPolicyNapi::NativeGetOneCfgFileSync(napi_env env, std::shared_p HiLog::Info(LABEL, "GetOneCfgFileEx result is nullptr."); } else { context->pathValue_ = std::string(filePath); + HiLog::Debug(LABEL, "GetOneCfgFileEx native success."); } ReportConfigPolicyEvent(ReportType::CONFIG_POLICY_EVENT, "getOneCfgFileSync", ""); napi_value result = nullptr; @@ -316,6 +328,7 @@ napi_value ConfigPolicyNapi::NativeGetOneCfgFileSync(napi_env env, std::shared_p void ConfigPolicyNapi::NativeGetCfgFiles(napi_env env, void *data) { + HiLog::Debug(LABEL, "NativeGetCfgFiles start."); if (data == nullptr) { HiLog::Error(LABEL, "data is nullptr"); return; @@ -324,6 +337,7 @@ void ConfigPolicyNapi::NativeGetCfgFiles(napi_env env, void *data) ConfigAsyncContext *asyncCallbackInfo = static_cast(data); CfgFiles *cfgFiles = GetCfgFilesEx(asyncCallbackInfo->relPath_.c_str(), asyncCallbackInfo->followMode_, asyncCallbackInfo->extra_.c_str()); + HiLog::Debug(LABEL, "GetCfgFilesEx native success."); if (cfgFiles != nullptr) { for (size_t i = 0; i < MAX_CFG_POLICY_DIRS_CNT; i++) { if (cfgFiles->paths[i] != nullptr) { @@ -338,8 +352,10 @@ void ConfigPolicyNapi::NativeGetCfgFiles(napi_env env, void *data) napi_value ConfigPolicyNapi::NativeGetCfgFilesSync(napi_env env, std::shared_ptr context) { + HiLog::Debug(LABEL, "NativeGetCfgFiles start."); CfgFiles *cfgFiles = GetCfgFilesEx(context->relPath_.c_str(), context->followMode_, context->extra_.c_str()); + HiLog::Debug(LABEL, "GetCfgFilesEx native success."); if (cfgFiles != nullptr) { for (size_t i = 0; i < MAX_CFG_POLICY_DIRS_CNT; i++) { if (cfgFiles->paths[i] != nullptr) { @@ -354,6 +370,7 @@ napi_value ConfigPolicyNapi::NativeGetCfgFilesSync(napi_env env, std::shared_ptr void ConfigPolicyNapi::NativeGetCfgDirList(napi_env env, void *data) { + HiLog::Debug(LABEL, "NativeGetCfgDirList start."); if (data == nullptr) { HiLog::Error(LABEL, "data is nullptr."); return; @@ -373,6 +390,7 @@ void ConfigPolicyNapi::NativeGetCfgDirList(napi_env env, void *data) napi_value ConfigPolicyNapi::NativeGetCfgDirListSync(napi_env env, std::shared_ptr context) { + HiLog::Debug(LABEL, "NativeGetCfgDirListSync start."); CfgDir *cfgDir = GetCfgDirList(); if (cfgDir != nullptr) { for (size_t i = 0; i < MAX_CFG_POLICY_DIRS_CNT; i++) { @@ -414,6 +432,7 @@ void ConfigPolicyNapi::CreateArraysValueFunc(ConfigAsyncContext &asyncCallbackIn void ConfigPolicyNapi::NativeCallbackComplete(napi_env env, napi_status status, void *data) { + HiLog::Debug(LABEL, "NativeCallbackComplete start."); if (data == nullptr) { HiLog::Error(LABEL, "data is nullptr"); return; @@ -440,6 +459,7 @@ void ConfigPolicyNapi::NativeCallbackComplete(napi_env env, napi_status status, } napi_delete_async_work(env, asyncContext->work_); delete asyncContext; + HiLog::Debug(LABEL, "NativeCallbackComplete end."); } napi_value ConfigPolicyNapi::ParseRelPath(napi_env env, std::string ¶m, napi_value args) -- Gitee From da9b41a64244f7f07cb0653ea65be34e818e54a4 Mon Sep 17 00:00:00 2001 From: xiekaiming Date: Mon, 22 Jan 2024 17:26:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xiekaiming --- interfaces/kits/js/src/config_policy_napi.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/interfaces/kits/js/src/config_policy_napi.cpp b/interfaces/kits/js/src/config_policy_napi.cpp index c35262e..d7df3ca 100644 --- a/interfaces/kits/js/src/config_policy_napi.cpp +++ b/interfaces/kits/js/src/config_policy_napi.cpp @@ -200,7 +200,6 @@ napi_value ConfigPolicyNapi::NAPIGetCfgFilesSync(napi_env env, napi_callback_inf napi_value ConfigPolicyNapi::NAPIGetCfgDirList(napi_env env, napi_callback_info info) { - HiLog::Debug(LABEL, "NAPIGetCfgDirList start."); size_t argc = ARGS_SIZE_ONE; napi_value argv[ARGS_SIZE_ONE] = {nullptr}; napi_value thisVar = nullptr; @@ -221,7 +220,6 @@ napi_value ConfigPolicyNapi::NAPIGetCfgDirList(napi_env env, napi_callback_info napi_value ConfigPolicyNapi::NAPIGetCfgDirListSync(napi_env env, napi_callback_info info) { - HiLog::Debug(LABEL, "NAPIGetCfgDirListSync start."); auto asyncContext = std::make_shared(); return NativeGetCfgDirListSync(env, asyncContext); } @@ -298,7 +296,6 @@ void ConfigPolicyNapi::NativeGetOneCfgFile(napi_env env, void *data) HiLog::Info(LABEL, "GetOneCfgFileEx result is nullptr."); } else { asyncCallbackInfo->pathValue_ = std::string(filePath); - HiLog::Debug(LABEL, "GetOneCfgFileEx native success."); } ReportConfigPolicyEvent(ReportType::CONFIG_POLICY_EVENT, "getOneCfgFile", ""); asyncCallbackInfo->createValueFunc_ = [](napi_env env, ConfigAsyncContext &context) -> napi_value { @@ -318,7 +315,6 @@ napi_value ConfigPolicyNapi::NativeGetOneCfgFileSync(napi_env env, std::shared_p HiLog::Info(LABEL, "GetOneCfgFileEx result is nullptr."); } else { context->pathValue_ = std::string(filePath); - HiLog::Debug(LABEL, "GetOneCfgFileEx native success."); } ReportConfigPolicyEvent(ReportType::CONFIG_POLICY_EVENT, "getOneCfgFileSync", ""); napi_value result = nullptr; @@ -337,7 +333,6 @@ void ConfigPolicyNapi::NativeGetCfgFiles(napi_env env, void *data) ConfigAsyncContext *asyncCallbackInfo = static_cast(data); CfgFiles *cfgFiles = GetCfgFilesEx(asyncCallbackInfo->relPath_.c_str(), asyncCallbackInfo->followMode_, asyncCallbackInfo->extra_.c_str()); - HiLog::Debug(LABEL, "GetCfgFilesEx native success."); if (cfgFiles != nullptr) { for (size_t i = 0; i < MAX_CFG_POLICY_DIRS_CNT; i++) { if (cfgFiles->paths[i] != nullptr) { @@ -355,7 +350,6 @@ napi_value ConfigPolicyNapi::NativeGetCfgFilesSync(napi_env env, std::shared_ptr HiLog::Debug(LABEL, "NativeGetCfgFiles start."); CfgFiles *cfgFiles = GetCfgFilesEx(context->relPath_.c_str(), context->followMode_, context->extra_.c_str()); - HiLog::Debug(LABEL, "GetCfgFilesEx native success."); if (cfgFiles != nullptr) { for (size_t i = 0; i < MAX_CFG_POLICY_DIRS_CNT; i++) { if (cfgFiles->paths[i] != nullptr) { -- Gitee