<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/15561">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use new libosmocore logging lock API<br><br>Since libosmocore Id7711893b34263baacac6caf4d489467053131bb, a new API<br>log_enable_multithread() is available which takes care of protecting<br>logging infrastructure from us (and actually does it correctly since we<br>cannot protect internal libosmocore structures from osmo-trx).<br><br>Let's drop all mutex related code from osmo-trx logging infra and simply<br>rely on libosmocore's.<br><br>Related: OS#4088<br>Change-Id: I519d0f30bce871005ca26b90177ea4aa4839360a<br>---<br>M CommonLibs/Logger.cpp<br>M CommonLibs/debug.c<br>M CommonLibs/debug.h<br>M Transceiver52M/osmo-trx.cpp<br>4 files changed, 5 insertions(+), 63 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/CommonLibs/Logger.cpp b/CommonLibs/Logger.cpp</span><br><span>index 5db7f87..89e13e5 100644</span><br><span>--- a/CommonLibs/Logger.cpp</span><br><span>+++ b/CommonLibs/Logger.cpp</span><br><span>@@ -48,9 +48,11 @@</span><br><span> int neednl = (mlen==0 || mStream.str()[mlen-1] != '\n');</span><br><span> const char *fmt = neednl ? "%s\n" : "%s";</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- log_mutex_lock_canceldisable(&old_state);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* print related function called inside a C++ destructor, use pthread_setcancelstate() APIs.</span><br><span style="color: hsl(120, 100%, 40%);">+ See osmo-trx commit 86be40b4eb762d5c12e8e3f7388ca9f254e77b36 for more information */</span><br><span style="color: hsl(120, 100%, 40%);">+ pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_state);</span><br><span> LOGPSRC(mCategory, mPriority, filename, line, fmt, mStream.str().c_str());</span><br><span style="color: hsl(0, 100%, 40%);">- log_mutex_unlock_canceldisable(old_state);</span><br><span style="color: hsl(120, 100%, 40%);">+ pthread_setcancelstate(old_state, NULL);</span><br><span> }</span><br><span> </span><br><span> ostringstream& Log::get()</span><br><span>diff --git a/CommonLibs/debug.c b/CommonLibs/debug.c</span><br><span>index 48d4981..09dab2b 100644</span><br><span>--- a/CommonLibs/debug.c</span><br><span>+++ b/CommonLibs/debug.c</span><br><span>@@ -59,49 +59,3 @@</span><br><span> .cat = default_categories,</span><br><span> .num_cat = ARRAY_SIZE(default_categories),</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-pthread_mutex_t log_mutex;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-bool log_mutex_init() {</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(0, 100%, 40%);">- pthread_mutexattr_t attr;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if ((rc = pthread_mutexattr_init(&attr))) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "pthread_mutexattr_init() failed: %d\n", rc);</span><br><span style="color: hsl(0, 100%, 40%);">- return false;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if ((rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE))) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "pthread_mutexattr_settype() failed: %d\n", rc);</span><br><span style="color: hsl(0, 100%, 40%);">- return false;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if ((rc = pthread_mutex_init(&log_mutex, &attr))) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "pthread_mutex_init() failed: %d\n", rc);</span><br><span style="color: hsl(0, 100%, 40%);">- return false;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if ((rc = pthread_mutexattr_destroy(&attr))) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "pthread_mutexattr_destroy() failed: %d\n", rc);</span><br><span style="color: hsl(0, 100%, 40%);">- return false;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- return true;</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: do we need to call pthread_mutex_destroy() during process exit? */</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* If called inside a C++ destructor, use log_mutex_(un)lock_canceldisable() APIs instead.</span><br><span style="color: hsl(0, 100%, 40%);">- See osmo-trx commit 86be40b4eb762d5c12e8e3f7388ca9f254e77b36 for more information */</span><br><span style="color: hsl(0, 100%, 40%);">-void log_mutex_lock() {</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(!pthread_mutex_lock(&log_mutex));</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void log_mutex_unlock() {</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(!pthread_mutex_unlock(&log_mutex));</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void log_mutex_lock_canceldisable(int *st) {</span><br><span style="color: hsl(0, 100%, 40%);">- pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, st);</span><br><span style="color: hsl(0, 100%, 40%);">- log_mutex_lock();</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void log_mutex_unlock_canceldisable(int st) {</span><br><span style="color: hsl(0, 100%, 40%);">- log_mutex_unlock();</span><br><span style="color: hsl(0, 100%, 40%);">- pthread_setcancelstate(st, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span>diff --git a/CommonLibs/debug.h b/CommonLibs/debug.h</span><br><span>index 760ab32..ad12bb8 100644</span><br><span>--- a/CommonLibs/debug.h</span><br><span>+++ b/CommonLibs/debug.h</span><br><span>@@ -15,21 +15,10 @@</span><br><span> DLMS,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-bool log_mutex_init();</span><br><span style="color: hsl(0, 100%, 40%);">-void log_mutex_lock();</span><br><span style="color: hsl(0, 100%, 40%);">-void log_mutex_unlock();</span><br><span style="color: hsl(0, 100%, 40%);">-void log_mutex_lock_canceldisable(int *st);</span><br><span style="color: hsl(0, 100%, 40%);">-void log_mutex_unlock_canceldisable(int st);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #define CLOGC(category, level, fmt, args...) do { \</span><br><span style="color: hsl(0, 100%, 40%);">- log_mutex_lock(); \</span><br><span> LOGP(category, level, "[tid=%lu] " fmt, pthread_self(), ##args); \</span><br><span style="color: hsl(0, 100%, 40%);">- log_mutex_unlock(); \</span><br><span> } while(0)</span><br><span> </span><br><span> #define CLOGCHAN(chan, category, level, fmt, args...) do { \</span><br><span style="color: hsl(0, 100%, 40%);">- log_mutex_lock(); \</span><br><span> LOGP(category, level, "[tid=%lu][chan=%lu] " fmt, pthread_self(), chan, ##args); \</span><br><span style="color: hsl(0, 100%, 40%);">- log_mutex_unlock(); \</span><br><span> } while(0)</span><br><span>diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp</span><br><span>index 9fe6585..6b83988 100644</span><br><span>--- a/Transceiver52M/osmo-trx.cpp</span><br><span>+++ b/Transceiver52M/osmo-trx.cpp</span><br><span>@@ -576,14 +576,11 @@</span><br><span> printf("Built without atomic operation support. Using Mutex, it may affect performance!\n");</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!log_mutex_init()) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Failed to initialize log mutex!\n");</span><br><span style="color: hsl(0, 100%, 40%);">- exit(2);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> convolve_init();</span><br><span> convert_init();</span><br><span> </span><br><span> osmo_init_logging2(tall_trx_ctx, &log_info);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_enable_multithread();</span><br><span> osmo_stats_init(tall_trx_ctx);</span><br><span> vty_init(&g_vty_info);</span><br><span> ctrl_vty_init(tall_trx_ctx);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/15561">change 15561</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/+/15561"/><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: I519d0f30bce871005ca26b90177ea4aa4839360a </div>
<div style="display:none"> Gerrit-Change-Number: 15561 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>