pEp.foundation
/
libpEpAdapter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

pEpLog - Add PID

LIB-11
heck 4 years ago
parent
2d7ec43fbc
commit
e5aa2284ae
3 changed files with 12 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/pEpLog.cc
  2. 12
      src/pEpLog.hh
  3. 7
      test/framework/utils.hh

2
src/pEpLog.cc
View File

@ -98,7 +98,7 @@ namespace pEp {
void pEpLogger::log(const string& msg) const void pEpLogger::log(const string& msg) const
{ {
std::stringstream msg_; std::stringstream msg_;
msg_ << std::this_thread::get_id(); msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]";
msg_ << " - "; msg_ << " - ";
msg_ << this->get_classname() << "[" << this->get_instancename() << "]"; msg_ << this->get_classname() << "[" << this->get_instancename() << "]";
msg_ << " - " << msg; msg_ << " - " << msg;

12
src/pEpLog.hh
View File

@ -6,6 +6,8 @@
#include <sstream> #include <sstream>
#include <thread> #include <thread>
#include <unistd.h>
// pEpLog // pEpLog
// ====== // ======
// a "to be kept ultra small and simple" logging unit. // a "to be kept ultra small and simple" logging unit.
@ -36,7 +38,7 @@
do { \ do { \
if (pEp::Adapter::pEpLog::get_enabled()) { \ if (pEp::Adapter::pEpLog::get_enabled()) { \
std::stringstream msg_; \ std::stringstream msg_; \
msg_ << std::this_thread::get_id(); \ msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \
msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \ msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \
msg_ << " - " << msg; \ msg_ << " - " << msg; \
pEp::Adapter::pEpLog::log(msg_.str()); \ pEp::Adapter::pEpLog::log(msg_.str()); \
@ -54,7 +56,7 @@
do { \ do { \
if (pEp::Adapter::pEpLog::get_enabled()) { \ if (pEp::Adapter::pEpLog::get_enabled()) { \
std::stringstream msg_; \ std::stringstream msg_; \
msg_ << std::this_thread::get_id(); \ msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \
msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \ msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \
msg_ << " - " << pEp::Adapter::pEpLog::decorateH1(msg); \ msg_ << " - " << pEp::Adapter::pEpLog::decorateH1(msg); \
pEp::Adapter::pEpLog::log(msg_.str()); \ pEp::Adapter::pEpLog::log(msg_.str()); \
@ -72,7 +74,7 @@
do { \ do { \
if (pEp::Adapter::pEpLog::get_enabled()) { \ if (pEp::Adapter::pEpLog::get_enabled()) { \
std::stringstream msg_; \ std::stringstream msg_; \
msg_ << std::this_thread::get_id(); \ msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \
msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \ msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \
msg_ << " - " << pEp::Adapter::pEpLog::decorateH2(msg); \ msg_ << " - " << pEp::Adapter::pEpLog::decorateH2(msg); \
pEp::Adapter::pEpLog::log(msg_.str()); \ pEp::Adapter::pEpLog::log(msg_.str()); \
@ -162,7 +164,7 @@ namespace pEp {
#define pEpLogClass(msg) \ #define pEpLogClass(msg) \
do { \ do { \
std::stringstream msg_; \ 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_classname(); \
msg_ << "[" << this->m4gic_logger_n4me.get_instancename() << "]"; \ msg_ << "[" << this->m4gic_logger_n4me.get_instancename() << "]"; \
msg_ << "::" << __FUNCTION__; \ msg_ << "::" << __FUNCTION__; \
@ -182,7 +184,7 @@ namespace pEp {
#else #else
#define pEpLogClassRaw(msg) \ #define pEpLogClassRaw(msg) \
do { \ do { \
this->m4gic_logger_n4me.logRaw(msg); \ this->m4gic_logger_n4me.logRaw(msg); \
} while (0) } while (0)
#endif // NDEBUG #endif // NDEBUG

7
test/framework/utils.hh
View File

@ -9,6 +9,7 @@
#include <exception> #include <exception>
#include <chrono> #include <chrono>
#include <thread> #include <thread>
#include <unistd.h>
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
@ -36,7 +37,7 @@
#define TESTLOG(msg) \ #define TESTLOG(msg) \
do { \ do { \
std::stringstream msg_; \ std::stringstream msg_; \
msg_ << std::this_thread::get_id(); \ msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \
msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \ msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \
msg_ << " - " << msg; \ msg_ << " - " << msg; \
pEp::Adapter::pEpLog::log(msg_.str()); \ pEp::Adapter::pEpLog::log(msg_.str()); \
@ -48,7 +49,7 @@
#define TESTLOGH1(msg) \ #define TESTLOGH1(msg) \
do { \ do { \
std::stringstream msg_; \ std::stringstream msg_; \
msg_ << std::this_thread::get_id(); \ msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \
msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \ msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \
msg_ << " - " << pEp::Adapter::pEpLog::decorateH1(msg); \ msg_ << " - " << pEp::Adapter::pEpLog::decorateH1(msg); \
pEp::Adapter::pEpLog::log(msg_.str()); \ pEp::Adapter::pEpLog::log(msg_.str()); \
@ -60,7 +61,7 @@
#define TESTLOGH2(msg) \ #define TESTLOGH2(msg) \
do { \ do { \
std::stringstream msg_; \ std::stringstream msg_; \
msg_ << std::this_thread::get_id(); \ msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \
msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \ msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \
msg_ << " - " << pEp::Adapter::pEpLog::decorateH2(msg); \ msg_ << " - " << pEp::Adapter::pEpLog::decorateH2(msg); \
pEp::Adapter::pEpLog::log(msg_.str()); \ pEp::Adapter::pEpLog::log(msg_.str()); \

Write Preview
Loading…
Cancel
Save