fix: Modify format

Signed-off-by: 杨鹏昊 <yangpenghao1@h-partners.com>
This commit is contained in:
杨鹏昊
2024-04-23 02:45:45 +00:00
parent fa7bb406e7
commit 9839471fb3
3 changed files with 11 additions and 11 deletions
+7 -7
View File
@@ -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
+2 -2
View File
@@ -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;
@@ -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();