From: Michal Bistyga Date: Wed, 4 Oct 2017 11:01:35 +0000 (+0200) Subject: [Common] Upgrading ScopeLogger X-Git-Tag: submit/tizen_4.0/20171011.122933~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=900b11f007beb9b8ff5f96bec730a6946b03c57d;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git [Common] Upgrading ScopeLogger This is cherry-pick from tizen_3.0 branch [Verification] Code compiles Change-Id: Id8824d5a91df54c9cb97f02b501e0da8f49852a2 Signed-off-by: Michal Bistyga --- diff --git a/src/common/logger.h b/src/common/logger.h index 1054c4db..66036ace 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_