From e5aa2284ae09b5296c880f25cb2a3c43324e9edd Mon Sep 17 00:00:00 2001 From: heck Date: Sun, 23 May 2021 19:35:28 +0200 Subject: [PATCH] pEpLog - Add PID --- src/pEpLog.cc | 2 +- src/pEpLog.hh | 12 +++++++----- test/framework/utils.hh | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/pEpLog.cc b/src/pEpLog.cc index 42d229e..0e212e0 100644 --- a/src/pEpLog.cc +++ b/src/pEpLog.cc @@ -98,7 +98,7 @@ namespace pEp { void pEpLogger::log(const string& msg) const { std::stringstream msg_; - msg_ << std::this_thread::get_id(); + msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; msg_ << " - "; msg_ << this->get_classname() << "[" << this->get_instancename() << "]"; msg_ << " - " << msg; diff --git a/src/pEpLog.hh b/src/pEpLog.hh index edbd210..05bf522 100644 --- a/src/pEpLog.hh +++ b/src/pEpLog.hh @@ -6,6 +6,8 @@ #include #include +#include + // pEpLog // ====== // a "to be kept ultra small and simple" logging unit. @@ -36,7 +38,7 @@ do { \ if (pEp::Adapter::pEpLog::get_enabled()) { \ std::stringstream msg_; \ - msg_ << std::this_thread::get_id(); \ + msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \ msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \ msg_ << " - " << msg; \ pEp::Adapter::pEpLog::log(msg_.str()); \ @@ -54,7 +56,7 @@ do { \ if (pEp::Adapter::pEpLog::get_enabled()) { \ std::stringstream msg_; \ - msg_ << std::this_thread::get_id(); \ + msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \ msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \ msg_ << " - " << pEp::Adapter::pEpLog::decorateH1(msg); \ pEp::Adapter::pEpLog::log(msg_.str()); \ @@ -72,7 +74,7 @@ do { \ if (pEp::Adapter::pEpLog::get_enabled()) { \ std::stringstream msg_; \ - msg_ << std::this_thread::get_id(); \ + msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \ msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \ msg_ << " - " << pEp::Adapter::pEpLog::decorateH2(msg); \ pEp::Adapter::pEpLog::log(msg_.str()); \ @@ -162,7 +164,7 @@ namespace pEp { #define pEpLogClass(msg) \ do { \ std::stringstream msg_; \ - msg_ << std::this_thread::get_id(); \ + msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \ msg_ << " - " << this->m4gic_logger_n4me.get_classname(); \ msg_ << "[" << this->m4gic_logger_n4me.get_instancename() << "]"; \ msg_ << "::" << __FUNCTION__; \ @@ -182,7 +184,7 @@ namespace pEp { #else #define pEpLogClassRaw(msg) \ do { \ - this->m4gic_logger_n4me.logRaw(msg); \ + this->m4gic_logger_n4me.logRaw(msg); \ } while (0) #endif // NDEBUG diff --git a/test/framework/utils.hh b/test/framework/utils.hh index ea0084f..a978860 100644 --- a/test/framework/utils.hh +++ b/test/framework/utils.hh @@ -9,6 +9,7 @@ #include #include #include +#include // ------------------------------------------------------------------------------------------------ @@ -36,7 +37,7 @@ #define TESTLOG(msg) \ do { \ std::stringstream msg_; \ - msg_ << std::this_thread::get_id(); \ + msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \ msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \ msg_ << " - " << msg; \ pEp::Adapter::pEpLog::log(msg_.str()); \ @@ -48,7 +49,7 @@ #define TESTLOGH1(msg) \ do { \ std::stringstream msg_; \ - msg_ << std::this_thread::get_id(); \ + msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \ msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \ msg_ << " - " << pEp::Adapter::pEpLog::decorateH1(msg); \ pEp::Adapter::pEpLog::log(msg_.str()); \ @@ -60,7 +61,7 @@ #define TESTLOGH2(msg) \ do { \ std::stringstream msg_; \ - msg_ << std::this_thread::get_id(); \ + msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \ msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \ msg_ << " - " << pEp::Adapter::pEpLog::decorateH2(msg); \ pEp::Adapter::pEpLog::log(msg_.str()); \