<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/23160">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Drop logging pthread ID<br><br>new libosmocore osmo-trx already depends on does support printing thread<br>ID as prefix to all messages (confgiurable through VTY), so there's no<br>use in printing it in osmo-trx unconditionally.<br><br>Moreover, The type used to represent a thread ID is implementation<br>specific, and may be an opaqe structure, making it unsuitable to be<br>printed by standard means, so in any case we should be better printing<br>system's TID instead.<br><br>Related: OS#5032<br>Change-Id: Ie98a21246230c946afc47f4f5b9c6618eefde494<br>---<br>M CommonLibs/Logger.h<br>M CommonLibs/debug.h<br>2 files changed, 6 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/60/23160/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/CommonLibs/Logger.h b/CommonLibs/Logger.h</span><br><span>index b752e51..6452e25 100644</span><br><span>--- a/CommonLibs/Logger.h</span><br><span>+++ b/CommonLibs/Logger.h</span><br><span>@@ -50,19 +50,19 @@</span><br><span> #endif</span><br><span> </span><br><span> #define LOG(level) \</span><br><span style="color: hsl(0, 100%, 40%);">-    Log(DMAIN, LOGL_##level, __BASE_FILE__, __LINE__).get() <<  "[tid=" << pthread_self() << "] "</span><br><span style="color: hsl(120, 100%, 40%);">+   Log(DMAIN, LOGL_##level, __BASE_FILE__, __LINE__).get()</span><br><span> </span><br><span> #define LOGC(category, level) \</span><br><span style="color: hsl(0, 100%, 40%);">-  Log(category, LOGL_##level, __BASE_FILE__, __LINE__).get() <<  "[tid=" << pthread_self() << "] "</span><br><span style="color: hsl(120, 100%, 40%);">+        Log(category, LOGL_##level, __BASE_FILE__, __LINE__).get()</span><br><span> </span><br><span> #define LOGLV(category, level) \</span><br><span style="color: hsl(0, 100%, 40%);">-      Log(category, level, __BASE_FILE__, __LINE__).get() <<  "[tid=" << pthread_self() << "] "</span><br><span style="color: hsl(120, 100%, 40%);">+       Log(category, level, __BASE_FILE__, __LINE__).get()</span><br><span> </span><br><span> #define LOGSRC(category, level, file, line) \</span><br><span style="color: hsl(0, 100%, 40%);">-        Log(category, level, file, line).get() <<  "[tid=" << pthread_self() << "] "</span><br><span style="color: hsl(120, 100%, 40%);">+    Log(category, level, file, line).get()</span><br><span> </span><br><span> #define LOGCHAN(chan, category, level) \</span><br><span style="color: hsl(0, 100%, 40%);">-  Log(category, LOGL_##level, __BASE_FILE__, __LINE__).get() <<  "[tid=" << pthread_self() << "][chan=" << chan << "] "</span><br><span style="color: hsl(120, 100%, 40%);">+     Log(category, LOGL_##level, __BASE_FILE__, __LINE__).get() <<  "[chan=" << chan << "] "</span><br><span> </span><br><span> /**</span><br><span>     A C++ stream-based thread-safe logger.</span><br><span>diff --git a/CommonLibs/debug.h b/CommonLibs/debug.h</span><br><span>index ddb5c75..71f344e 100644</span><br><span>--- a/CommonLibs/debug.h</span><br><span>+++ b/CommonLibs/debug.h</span><br><span>@@ -3,7 +3,6 @@</span><br><span> #include <stdbool.h></span><br><span> </span><br><span> #include <osmocom/core/logging.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/thread.h></span><br><span> </span><br><span> extern const struct log_info log_info;</span><br><span> </span><br><span>@@ -19,10 +18,6 @@</span><br><span>      DCTR,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define CLOGC(category, level, fmt, args...) do { \</span><br><span style="color: hsl(0, 100%, 40%);">-      LOGP(category, level, "[tid=%ld] " fmt, (long int) osmo_gettid(), ##args);  \</span><br><span style="color: hsl(0, 100%, 40%);">-} while(0)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #define CLOGCHAN(chan, category, level, fmt, args...) do { \</span><br><span style="color: hsl(0, 100%, 40%);">-       LOGP(category, level, "[tid=%ld][chan=%zu] " fmt, (long int) osmo_gettid(), chan, ##args);  \</span><br><span style="color: hsl(120, 100%, 40%);">+       LOGP(category, level, "[chan=%zu] " fmt, chan, ##args);  \</span><br><span> } while(0)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/23160">change 23160</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-trx/+/23160"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ie98a21246230c946afc47f4f5b9c6618eefde494 </div>
<div style="display:none"> Gerrit-Change-Number: 23160 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>