From 080b5449cb41b7d87305a4e16a8546eca8f3c363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E9=B9=8F=E6=98=8A?= Date: Mon, 22 Apr 2024 12:43:14 +0000 Subject: [PATCH 1/2] fix: Modify format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 杨鹏昊 --- frameworks/src/running_lock.c | 2 +- services/src/power/small/auto_suspend_loop.c | 4 +++- services/src/screensaver/small/screen_saver_handler.cpp | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/frameworks/src/running_lock.c b/frameworks/src/running_lock.c index 0220717..67030f9 100644 --- a/frameworks/src/running_lock.c +++ b/frameworks/src/running_lock.c @@ -87,7 +87,7 @@ static RunningLockEntry *CreateRunningLockEntry(const char *name, RunningLockTyp InitIdentity(entry); entry->lock.type = type; entry->lock.flag = flag; - if(strcpy_s(entry->lock.name, sizeof(entry->lock.name), name) != EOK) { + if (strcpy_s(entry->lock.name, sizeof(entry->lock.name), name) != EOK) { free(entry); return NULL; } diff --git a/services/src/power/small/auto_suspend_loop.c b/services/src/power/small/auto_suspend_loop.c index 78edc85..a9407c1 100644 --- a/services/src/power/small/auto_suspend_loop.c +++ b/services/src/power/small/auto_suspend_loop.c @@ -16,6 +16,8 @@ #include "hilog_wrapper.h" #include "power/suspend_ops.h" +static int32_t g_sleep = 10; + static BOOL AutoSuspendLoopFunc(AutoSuspendWait waitFunc) { POWER_HILOGD("Prepare suspend"); // here to prepare to enter suspend @@ -24,7 +26,7 @@ static BOOL AutoSuspendLoopFunc(AutoSuspendWait waitFunc) waitFunc(); POWER_HILOGD("Enter suspend"); - sleep(10); // using sleep to simulate suspend + sleep(g_sleep); // using sleep to simulate suspend POWER_HILOGD("Exit suspend"); return TRUE; diff --git a/services/src/screensaver/small/screen_saver_handler.cpp b/services/src/screensaver/small/screen_saver_handler.cpp index f5ae09d..03b4fbc 100644 --- a/services/src/screensaver/small/screen_saver_handler.cpp +++ b/services/src/screensaver/small/screen_saver_handler.cpp @@ -25,6 +25,8 @@ #include "hilog_wrapper.h" #include "running_lock_mgr.h" +static int32_t delay_listener = 20; + namespace OHOS { ScreenSaverHandler::~ScreenSaverHandler() { @@ -103,7 +105,7 @@ void ScreenSaverHandler::Init() timer_ = PowerMgrCreateTimer(intervalMsec_, intervalMsec_, PowerTimerCallback); } std::thread lateInit([this] { - sleep(20); // set delay to avoid registing input evnet listener failure + sleep(delay_listener); // set delay to avoid registing input evnet listener failure SetState(true); }); lateInit.detach(); -- Gitee From 1c8d60726cb202af9b59c45ef1bbd4063cd113f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E9=B9=8F=E6=98=8A?= Date: Tue, 23 Apr 2024 02:45:45 +0000 Subject: [PATCH 2/2] fix: Modify format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 杨鹏昊 --- frameworks/include/hilog_wrapper.h | 14 +++++++------- services/src/power/small/auto_suspend_loop.c | 4 ++-- .../src/screensaver/small/screen_saver_handler.cpp | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/frameworks/include/hilog_wrapper.h b/frameworks/include/hilog_wrapper.h index b36c3a2..ca2c6a0 100644 --- a/frameworks/include/hilog_wrapper.h +++ b/frameworks/include/hilog_wrapper.h @@ -28,8 +28,8 @@ extern "C" { #endif // __cplusplus -#define __FILENAME__ (__builtin_strrchr(__FILE__, '/') ? __builtin_strrchr(__FILE__, '/') + 1 : __FILE__) -#define __FORMATED__(fmt, ...) "[%s] %s# " fmt, __FILENAME__, __FUNCTION__, ##__VA_ARGS__ +#define FILE_NAME (__builtin_strrchr(__FILE__, '/') ? __builtin_strrchr(__FILE__, '/') + 1 : __FILE__) +#define FILE_FORMATED(fmt, ...) "[%s] %s# " fmt, FILE_NAME, __FUNCTION__, ##__VA_ARGS__ #ifdef POWER_HILOGD #undef POWER_HILOGD @@ -58,11 +58,11 @@ extern "C" { #define POWER_HILOGE(...) HILOG_ERROR(HILOG_MODULE_POWERMGR, __VA_ARGS__) #define POWER_HILOGF(...) HILOG_FATAL(HILOG_MODULE_POWERMGR, __VA_ARGS__) #else // !__LITEOS_M__ -#define POWER_HILOGD(...) HILOG_DEBUG(LOG_CORE, __FORMATED__(__VA_ARGS__)) -#define POWER_HILOGI(...) HILOG_INFO(LOG_CORE, __FORMATED__(__VA_ARGS__)) -#define POWER_HILOGW(...) HILOG_WARN(LOG_CORE, __FORMATED__(__VA_ARGS__)) -#define POWER_HILOGE(...) HILOG_ERROR(LOG_CORE, __FORMATED__(__VA_ARGS__)) -#define POWER_HILOGF(...) HILOG_FATAL(LOG_CORE, __FORMATED__(__VA_ARGS__)) +#define POWER_HILOGD(...) HILOG_DEBUG(LOG_CORE, FILE_FORMATED(__VA_ARGS__)) +#define POWER_HILOGI(...) HILOG_INFO(LOG_CORE, FILE_FORMATED(__VA_ARGS__)) +#define POWER_HILOGW(...) HILOG_WARN(LOG_CORE, FILE_FORMATED(__VA_ARGS__)) +#define POWER_HILOGE(...) HILOG_ERROR(LOG_CORE, FILE_FORMATED(__VA_ARGS__)) +#define POWER_HILOGF(...) HILOG_FATAL(LOG_CORE, FILE_FORMATED(__VA_ARGS__)) #endif // __LITEOS_M__ #ifdef __cplusplus diff --git a/services/src/power/small/auto_suspend_loop.c b/services/src/power/small/auto_suspend_loop.c index a9407c1..741a73c 100644 --- a/services/src/power/small/auto_suspend_loop.c +++ b/services/src/power/small/auto_suspend_loop.c @@ -16,7 +16,7 @@ #include "hilog_wrapper.h" #include "power/suspend_ops.h" -static int32_t g_sleep = 10; +static const int32_t SUSPEND_TIME = 10; static BOOL AutoSuspendLoopFunc(AutoSuspendWait waitFunc) { @@ -26,7 +26,7 @@ static BOOL AutoSuspendLoopFunc(AutoSuspendWait waitFunc) waitFunc(); POWER_HILOGD("Enter suspend"); - sleep(g_sleep); // using sleep to simulate suspend + sleep(SUSPEND_TIME); // using sleep to simulate suspend POWER_HILOGD("Exit suspend"); return TRUE; diff --git a/services/src/screensaver/small/screen_saver_handler.cpp b/services/src/screensaver/small/screen_saver_handler.cpp index 03b4fbc..ad3f4fc 100644 --- a/services/src/screensaver/small/screen_saver_handler.cpp +++ b/services/src/screensaver/small/screen_saver_handler.cpp @@ -25,7 +25,7 @@ #include "hilog_wrapper.h" #include "running_lock_mgr.h" -static int32_t delay_listener = 20; +static const int32_t DELAY_TIME = 20; namespace OHOS { ScreenSaverHandler::~ScreenSaverHandler() @@ -105,7 +105,7 @@ void ScreenSaverHandler::Init() timer_ = PowerMgrCreateTimer(intervalMsec_, intervalMsec_, PowerTimerCallback); } std::thread lateInit([this] { - sleep(delay_listener); // set delay to avoid registing input evnet listener failure + sleep(DELAY_TIME); // set delay to avoid registing input evnet listener failure SetState(true); }); lateInit.detach(); -- Gitee