From 41c09dbbc85b78425cf157ffa9c2ad735a16bf9a Mon Sep 17 00:00:00 2001 From: HarshiniRavichandran Date: Fri, 22 Aug 2025 17:42:49 +0530 Subject: [PATCH 1/2] DELIA-68783 : Suppress the unwanted debug prints during bootup. Reason for change : Enabled loglevel as ERROR_LEVEL in utils.h to suppress the debug prints. Test Procedure : Compiled and verified Risks : Low Priority: P2 Signed-off-by: HarshiniRavichandran --- Miracast/common/MiracastLogger.cpp | 2 +- SystemAudioPlayer/impl/logger.cpp | 2 +- TextToSpeech/impl/logger.cpp | 2 +- helpers/UtilsLogging.h | 21 ++++++++++++++++++--- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Miracast/common/MiracastLogger.cpp b/Miracast/common/MiracastLogger.cpp index 70e51626b3..c95d66cbfc 100644 --- a/Miracast/common/MiracastLogger.cpp +++ b/Miracast/common/MiracastLogger.cpp @@ -43,7 +43,7 @@ namespace MIRACAST return prettyFunction.substr(begin, end); } - static int gDefaultLogLevel = INFO_LEVEL; + static int gDefaultLogLevel = ERROR_LEVEL; static FILE *logger_file_ptr = nullptr; static std::string service_name = "NOT-DEFINED"; static sem_t separate_logger_sync; diff --git a/SystemAudioPlayer/impl/logger.cpp b/SystemAudioPlayer/impl/logger.cpp index a26219a713..835c124cba 100644 --- a/SystemAudioPlayer/impl/logger.cpp +++ b/SystemAudioPlayer/impl/logger.cpp @@ -93,7 +93,7 @@ namespace SAP { #else - static int gDefaultLogLevel = INFO_LEVEL; + static int gDefaultLogLevel = ERROR_LEVEL; // static int gDefaultLogLevel = VERBOSE_LEVEL; void logger_init() diff --git a/TextToSpeech/impl/logger.cpp b/TextToSpeech/impl/logger.cpp index 6078f3b630..38b3aede9c 100644 --- a/TextToSpeech/impl/logger.cpp +++ b/TextToSpeech/impl/logger.cpp @@ -93,7 +93,7 @@ namespace TTS { #else - static int gDefaultLogLevel = INFO_LEVEL; + static int gDefaultLogLevel = ERROR_LEVEL; // static int gDefaultLogLevel = VERBOSE_LEVEL; void logger_init() diff --git a/helpers/UtilsLogging.h b/helpers/UtilsLogging.h index 5e1b09a656..969848485d 100644 --- a/helpers/UtilsLogging.h +++ b/helpers/UtilsLogging.h @@ -2,9 +2,24 @@ #include -#define LOGINFO(fmt, ...) do { fprintf(stderr, "[%d] INFO [%s:%d] %s: " fmt "\n", (int)syscall(SYS_gettid), WPEFramework::Core::FileNameOnly(__FILE__), __LINE__, __FUNCTION__, ##__VA_ARGS__); fflush(stderr); } while (0) -#define LOGWARN(fmt, ...) do { fprintf(stderr, "[%d] WARN [%s:%d] %s: " fmt "\n", (int)syscall(SYS_gettid), WPEFramework::Core::FileNameOnly(__FILE__), __LINE__, __FUNCTION__, ##__VA_ARGS__); fflush(stderr); } while (0) -#define LOGERR(fmt, ...) do { fprintf(stderr, "[%d] ERROR [%s:%d] %s: " fmt "\n", (int)syscall(SYS_gettid), WPEFramework::Core::FileNameOnly(__FILE__), __LINE__, __FUNCTION__, ##__VA_ARGS__); fflush(stderr); } while (0) +enum LogLevel {FATAL_LEVEL = 0, ERROR_LEVEL, WARNING_LEVEL, INFO_LEVEL, DEBUG_LEVEL}; + +static int gDefaultLogLevel = ERROR_LEVEL; + +namespace { + template + const T* UNUSED_GLOBAL_VARIABLE_HELPER(const T& dummy) { + return &dummy; + } + + static const auto UNUSED_GLOBAL_VARIABLE_gDefaultLogLevel = + UNUSED_GLOBAL_VARIABLE_HELPER(gDefaultLogLevel); +} + +#define LOGDBG(fmt, ...) do { if(gDefaultLogLevel >= DEBUG_LEVEL) { fprintf(stderr, "[%d] DEBUG [%s:%d] %s: " fmt "\n", (int)syscall(SYS_gettid), WPEFramework::Core::FileNameOnly(__FILE__), __LINE__, __FUNCTION__, ##__VA_ARGS__); fflush(stderr); }} while (0) +#define LOGINFO(fmt, ...) do { if(gDefaultLogLevel >= INFO_LEVEL) { fprintf(stderr, "[%d] INFO [%s:%d] %s: " fmt "\n", (int)syscall(SYS_gettid), WPEFramework::Core::FileNameOnly(__FILE__), __LINE__, __FUNCTION__, ##__VA_ARGS__); fflush(stderr); }} while (0) +#define LOGWARN(fmt, ...) do { if(gDefaultLogLevel >= WARNING_LEVEL) { fprintf(stderr, "[%d] WARN [%s:%d] %s: " fmt "\n", (int)syscall(SYS_gettid), WPEFramework::Core::FileNameOnly(__FILE__), __LINE__, __FUNCTION__, ##__VA_ARGS__); fflush(stderr); }} while (0) +#define LOGERR(fmt, ...) do { if(gDefaultLogLevel >= ERROR_LEVEL) { fprintf(stderr, "[%d] ERROR [%s:%d] %s: " fmt "\n", (int)syscall(SYS_gettid), WPEFramework::Core::FileNameOnly(__FILE__), __LINE__, __FUNCTION__, ##__VA_ARGS__); fflush(stderr); }} while (0) #define LOG_DEVICE_EXCEPTION0() LOGWARN("Exception caught: code=%d message=%s", err.getCode(), err.what()); #define LOG_DEVICE_EXCEPTION1(param1) LOGWARN("Exception caught" #param1 "=%s code=%d message=%s", param1.c_str(), err.getCode(), err.what()); From 5b65ed4e209b9370f057cb89aa2e86b77cd3d6e0 Mon Sep 17 00:00:00 2001 From: HarshiniRavichandran <166796069+HarshiniRavichandran@users.noreply.github.com> Date: Mon, 25 Aug 2025 12:51:36 +0530 Subject: [PATCH 2/2] DELIA-68783 : Update UtilsLogging.h --- helpers/UtilsLogging.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/helpers/UtilsLogging.h b/helpers/UtilsLogging.h index 969848485d..4682041e18 100644 --- a/helpers/UtilsLogging.h +++ b/helpers/UtilsLogging.h @@ -2,9 +2,9 @@ #include -enum LogLevel {FATAL_LEVEL = 0, ERROR_LEVEL, WARNING_LEVEL, INFO_LEVEL, DEBUG_LEVEL}; +enum LogLevels {FATAL_LOGLEVEL = 0, ERROR_LOGLEVEL, WARNING_LOGLEVEL, INFO_LOGLEVEL, DEBUG_LOGLEVEL}; -static int gDefaultLogLevel = ERROR_LEVEL; +static int DefaultLogLevel = ERROR_LOGLEVEL; namespace { template @@ -12,14 +12,14 @@ namespace { return &dummy; } - static const auto UNUSED_GLOBAL_VARIABLE_gDefaultLogLevel = - UNUSED_GLOBAL_VARIABLE_HELPER(gDefaultLogLevel); + static const auto UNUSED_GLOBAL_VARIABLE_DefaultLogLevel = + UNUSED_GLOBAL_VARIABLE_HELPER(DefaultLogLevel); } -#define LOGDBG(fmt, ...) do { if(gDefaultLogLevel >= DEBUG_LEVEL) { fprintf(stderr, "[%d] DEBUG [%s:%d] %s: " fmt "\n", (int)syscall(SYS_gettid), WPEFramework::Core::FileNameOnly(__FILE__), __LINE__, __FUNCTION__, ##__VA_ARGS__); fflush(stderr); }} while (0) -#define LOGINFO(fmt, ...) do { if(gDefaultLogLevel >= INFO_LEVEL) { fprintf(stderr, "[%d] INFO [%s:%d] %s: " fmt "\n", (int)syscall(SYS_gettid), WPEFramework::Core::FileNameOnly(__FILE__), __LINE__, __FUNCTION__, ##__VA_ARGS__); fflush(stderr); }} while (0) -#define LOGWARN(fmt, ...) do { if(gDefaultLogLevel >= WARNING_LEVEL) { fprintf(stderr, "[%d] WARN [%s:%d] %s: " fmt "\n", (int)syscall(SYS_gettid), WPEFramework::Core::FileNameOnly(__FILE__), __LINE__, __FUNCTION__, ##__VA_ARGS__); fflush(stderr); }} while (0) -#define LOGERR(fmt, ...) do { if(gDefaultLogLevel >= ERROR_LEVEL) { fprintf(stderr, "[%d] ERROR [%s:%d] %s: " fmt "\n", (int)syscall(SYS_gettid), WPEFramework::Core::FileNameOnly(__FILE__), __LINE__, __FUNCTION__, ##__VA_ARGS__); fflush(stderr); }} while (0) +#define LOGDBG(fmt, ...) do { if(DefaultLogLevel >= DEBUG_LOGLEVEL) { fprintf(stderr, "[%d] DEBUG [%s:%d] %s: " fmt "\n", (int)syscall(SYS_gettid), WPEFramework::Core::FileNameOnly(__FILE__), __LINE__, __FUNCTION__, ##__VA_ARGS__); fflush(stderr); }} while (0) +#define LOGINFO(fmt, ...) do { if(DefaultLogLevel >= INFO_LOGLEVEL) { fprintf(stderr, "[%d] INFO [%s:%d] %s: " fmt "\n", (int)syscall(SYS_gettid), WPEFramework::Core::FileNameOnly(__FILE__), __LINE__, __FUNCTION__, ##__VA_ARGS__); fflush(stderr); }} while (0) +#define LOGWARN(fmt, ...) do { if(DefaultLogLevel >= WARNING_LOGLEVEL) { fprintf(stderr, "[%d] WARN [%s:%d] %s: " fmt "\n", (int)syscall(SYS_gettid), WPEFramework::Core::FileNameOnly(__FILE__), __LINE__, __FUNCTION__, ##__VA_ARGS__); fflush(stderr); }} while (0) +#define LOGERR(fmt, ...) do { if(DefaultLogLevel >= ERROR_LOGLEVEL) { fprintf(stderr, "[%d] ERROR [%s:%d] %s: " fmt "\n", (int)syscall(SYS_gettid), WPEFramework::Core::FileNameOnly(__FILE__), __LINE__, __FUNCTION__, ##__VA_ARGS__); fflush(stderr); }} while (0) #define LOG_DEVICE_EXCEPTION0() LOGWARN("Exception caught: code=%d message=%s", err.getCode(), err.what()); #define LOG_DEVICE_EXCEPTION1(param1) LOGWARN("Exception caught" #param1 "=%s code=%d message=%s", param1.c_str(), err.getCode(), err.what());