From 900b11f007beb9b8ff5f96bec730a6946b03c57d Mon Sep 17 00:00:00 2001 From: Michal Bistyga Date: Wed, 4 Oct 2017 13:01:35 +0200 Subject: [PATCH] [Common] Upgrading ScopeLogger This is cherry-pick from tizen_3.0 branch [Verification] Code compiles Change-Id: Id8824d5a91df54c9cb97f02b501e0da8f49852a2 Signed-off-by: Michal Bistyga --- src/common/logger.h | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/common/logger.h b/src/common/logger.h index 1054c4d..66036ac 100644 --- a/src/common/logger.h +++ b/src/common/logger.h @@ -236,8 +236,19 @@ class ScopeLogger { LoggerD("%s: %s(%d) > Enter %s", file_.c_str(), method_.c_str(), l, extra_.c_str()); } + template + ScopeLogger(const std::string& f, const std::string& m, int l, const std::string& ex = "", + Args... args) + : file_(f), method_(m), extra_(ex) { +#ifdef TIZEN_DEBUG_ENABLE + __dlog_print(LOG_ID_MAIN, DLOG_DEBUG, LOGGER_TAG, + ("%s: %s(%d) > %s: %s(%d) > Enter " + extra_).c_str(), __MODULE__, __func__, + __LINE__, file_.c_str(), method_.c_str(), l, args...); +#endif + } + ~ScopeLogger() { - LoggerD("%s: %s > Exit %s", file_.c_str(), method_.c_str(), extra_.c_str()); + LoggerD("%s: %s > Exit", file_.c_str(), method_.c_str()); } private: @@ -248,9 +259,9 @@ class ScopeLogger { } // common -#define ScopeLogger(EX) \ - const common::ScopeLogger __sl__ { \ - __MODULE__, __func__, __LINE__, EX \ +#define ScopeLogger(EX, args...) \ + const common::ScopeLogger __sl__ { \ + __MODULE__, __func__, __LINE__, EX, ##args \ } #endif // COMMON_LOGGER_H_ -- 2.7.4