diff --git a/CommonLibs/Logger.h b/CommonLibs/Logger.h index b752e51a..6452e251 100644 --- a/CommonLibs/Logger.h +++ b/CommonLibs/Logger.h @@ -50,19 +50,19 @@ extern "C" { #endif #define LOG(level) \ - Log(DMAIN, LOGL_##level, __BASE_FILE__, __LINE__).get() << "[tid=" << pthread_self() << "] " + Log(DMAIN, LOGL_##level, __BASE_FILE__, __LINE__).get() #define LOGC(category, level) \ - Log(category, LOGL_##level, __BASE_FILE__, __LINE__).get() << "[tid=" << pthread_self() << "] " + Log(category, LOGL_##level, __BASE_FILE__, __LINE__).get() #define LOGLV(category, level) \ - Log(category, level, __BASE_FILE__, __LINE__).get() << "[tid=" << pthread_self() << "] " + Log(category, level, __BASE_FILE__, __LINE__).get() #define LOGSRC(category, level, file, line) \ - Log(category, level, file, line).get() << "[tid=" << pthread_self() << "] " + Log(category, level, file, line).get() #define LOGCHAN(chan, category, level) \ - Log(category, LOGL_##level, __BASE_FILE__, __LINE__).get() << "[tid=" << pthread_self() << "][chan=" << chan << "] " + Log(category, LOGL_##level, __BASE_FILE__, __LINE__).get() << "[chan=" << chan << "] " /** A C++ stream-based thread-safe logger. diff --git a/CommonLibs/debug.h b/CommonLibs/debug.h index ddb5c750..71f344ee 100644 --- a/CommonLibs/debug.h +++ b/CommonLibs/debug.h @@ -3,7 +3,6 @@ #include #include -#include extern const struct log_info log_info; @@ -19,10 +18,6 @@ enum { DCTR, }; -#define CLOGC(category, level, fmt, args...) do { \ - LOGP(category, level, "[tid=%ld] " fmt, (long int) osmo_gettid(), ##args); \ -} while(0) - #define CLOGCHAN(chan, category, level, fmt, args...) do { \ - LOGP(category, level, "[tid=%ld][chan=%zu] " fmt, (long int) osmo_gettid(), chan, ##args); \ + LOGP(category, level, "[chan=%zu] " fmt, chan, ##args); \ } while(0)