From 930dabc98efaa971c4db13a3618fef9818d7940f Mon Sep 17 00:00:00 2001 From: Mupceet Date: Thu, 19 May 2022 17:01:48 +0800 Subject: [PATCH] fix bug for bootchart Signed-off-by: Mupceet --- interfaces/innerkits/modulemgr/modulemgr.c | 6 +++--- services/init/standard/init.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/interfaces/innerkits/modulemgr/modulemgr.c b/interfaces/innerkits/modulemgr/modulemgr.c index ad86a3b9..87bdfe1a 100755 --- a/interfaces/innerkits/modulemgr/modulemgr.c +++ b/interfaces/innerkits/modulemgr/modulemgr.c @@ -22,7 +22,7 @@ #include #include -#include "init_log.h" +#include "beget_ext.h" #include "list.h" #include "securec.h" #include "modulemgr.h" @@ -122,12 +122,12 @@ static void *moduleInstall(MODULE_ITEM *module, int argc, const char *argv[]) } else { snprintf_s(path, sizeof(path), sizeof(path) - 1, "/system/" MODULE_LIB_NAME "/%s/%s" MODULE_SUFFIX_D, module->moduleMgr->name, module->name); } - INIT_LOGV("moduleInstall path %s", path); + BEGET_LOGV("moduleInstall path %s", path); currentInstallArgs = &(module->moduleMgr->installArgs); handle = dlopen(path, RTLD_LAZY | RTLD_GLOBAL); currentInstallArgs = NULL; if (handle == NULL) { - INIT_LOGE("moduleInstall path %s fail %d", path, errno); + BEGET_LOGE("moduleInstall path %s fail %d", path, errno); } return handle; } diff --git a/services/init/standard/init.c b/services/init/standard/init.c index 589d17e3..86129089 100755 --- a/services/init/standard/init.c +++ b/services/init/standard/init.c @@ -253,6 +253,8 @@ static void BootStateChange(const char *content) } if (strcmp("post-init", content) == 0) { StartAllServices(START_MODE_NARMAL); + // Destroy all hooks + HookMgrDestroy(NULL); return; } } -- GitLab