<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/22950">View Change</a></p><div style="white-space:pre-wrap">Approvals:
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Replace my_gettid with libosmocore osmo_gettid API<br><br>The API was moved to libosmocore, let's use it instead of defining our<br>own here with all the complexity in build system involved.<br><br>Depends: libosmocore.git Change-Id Id7534beeb22fcd50813dab76dd68818e2ff87ec2<br>Related: OS#5027<br>Change-Id: I19e32fbc47bd88a668e0c912e89b001b0f8831dd<br>---<br>M CommonLibs/Threads.cpp<br>M CommonLibs/debug.c<br>M CommonLibs/debug.h<br>M TODO-RELEASE<br>M configure.ac<br>5 files changed, 7 insertions(+), 39 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/CommonLibs/Threads.cpp b/CommonLibs/Threads.cpp</span><br><span>index d8dab57..b3ff52f 100644</span><br><span>--- a/CommonLibs/Threads.cpp</span><br><span>+++ b/CommonLibs/Threads.cpp</span><br><span>@@ -32,6 +32,8 @@</span><br><span> #include "Timeval.h"</span><br><span> #include "Logger.h"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/thread.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> using namespace std;</span><br><span> </span><br><span> #ifndef HAVE_ATOMIC_OPS</span><br><span>@@ -108,7 +110,7 @@</span><br><span> void set_selfthread_name(const char *name)</span><br><span> {</span><br><span> pthread_t selfid = pthread_self();</span><br><span style="color: hsl(0, 100%, 40%);">- pid_t tid = my_gettid();</span><br><span style="color: hsl(120, 100%, 40%);">+ pid_t tid = osmo_gettid();</span><br><span> if (pthread_setname_np(selfid, name) == 0) {</span><br><span> LOG(INFO) << "Thread "<< selfid << " (task " << tid << ") set name: " << name;</span><br><span> } else {</span><br><span>diff --git a/CommonLibs/debug.c b/CommonLibs/debug.c</span><br><span>index 7ee8184..08954f5 100644</span><br><span>--- a/CommonLibs/debug.c</span><br><span>+++ b/CommonLibs/debug.c</span><br><span>@@ -21,18 +21,6 @@</span><br><span> * See the COPYING file in the main directory for details.</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "config.h"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* If HAVE_GETTID, then "_GNU_SOURCE" may need to be defined to use gettid() */</span><br><span style="color: hsl(0, 100%, 40%);">-#if HAVE_GETTID</span><br><span style="color: hsl(0, 100%, 40%);">-#define _GNU_SOURCE</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <sys/types.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <unistd.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <sys/syscall.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include "config.h"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #include <osmocom/core/logging.h></span><br><span> #include <osmocom/core/utils.h></span><br><span> #include "debug.h"</span><br><span>@@ -93,15 +81,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%);">-pid_t my_gettid(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-#if HAVE_GETTID</span><br><span style="color: hsl(0, 100%, 40%);">- return gettid();</span><br><span style="color: hsl(0, 100%, 40%);">-#elif defined(LINUX) && defined(__NR_gettid)</span><br><span style="color: hsl(0, 100%, 40%);">- return (pid_t) syscall(__NR_gettid);</span><br><span style="color: hsl(0, 100%, 40%);">-#else</span><br><span style="color: hsl(0, 100%, 40%);">- #pragma message ("use pid as tid")</span><br><span style="color: hsl(0, 100%, 40%);">- return getpid();</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</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 dd78168..ddb5c75 100644</span><br><span>--- a/CommonLibs/debug.h</span><br><span>+++ b/CommonLibs/debug.h</span><br><span>@@ -1,9 +1,9 @@</span><br><span> #pragma once</span><br><span> </span><br><span> #include <stdbool.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <sys/types.h></span><br><span> </span><br><span> #include <osmocom/core/logging.h></span><br><span style="color: hsl(120, 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,12 +19,10 @@</span><br><span> DCTR,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-pid_t my_gettid(void);</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%);">- LOGP(category, level, "[tid=%ld] " fmt, (long int) my_gettid(), ##args); \</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(category, level, "[tid=%ld] " fmt, (long int) osmo_gettid(), ##args); \</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%);">- LOGP(category, level, "[tid=%ld][chan=%zu] " fmt, (long int) my_gettid(), chan, ##args); \</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(category, level, "[tid=%ld][chan=%zu] " fmt, (long int) osmo_gettid(), chan, ##args); \</span><br><span> } while(0)</span><br><span>diff --git a/TODO-RELEASE b/TODO-RELEASE</span><br><span>index 84ecf22..c916fb1 100644</span><br><span>--- a/TODO-RELEASE</span><br><span>+++ b/TODO-RELEASE</span><br><span>@@ -1,3 +1,4 @@</span><br><span> * update libosmocore dependency to > 1.3.x for osmo_sched_vty_init(), osmo_sched_vty_apply_localthread()</span><br><span> * update osmo-gsm-manuals dependency to > 0.3.0 for vty_cpu_sched.adoc include.</span><br><span> * update libosmocore dependency to > 1.4.x for osmo_fd_{read,write}_{enable,disable}()</span><br><span style="color: hsl(120, 100%, 40%);">+* update libosmocore dependency to > 1.4.2 for osmo_gettid()</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 7f6aef7..8067fa7 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -82,15 +82,6 @@</span><br><span> AC_HEADER_TIME</span><br><span> AC_C_BIGENDIAN</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# Check if gettid is available (despite not being documented in glibc doc, it requires __USE_GNU on some systems)</span><br><span style="color: hsl(0, 100%, 40%);">-# C compiler is used since __USE_GNU seems to be always defined for g++.</span><br><span style="color: hsl(0, 100%, 40%);">-save_CPPFLAGS=$CPPFLAGS</span><br><span style="color: hsl(0, 100%, 40%);">-AC_LANG_PUSH(C)</span><br><span style="color: hsl(0, 100%, 40%);">-CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"</span><br><span style="color: hsl(0, 100%, 40%);">-AC_CHECK_FUNCS([gettid])</span><br><span style="color: hsl(0, 100%, 40%);">-AC_LANG_POP(C)</span><br><span style="color: hsl(0, 100%, 40%);">-CPPFLAGS=$save_CPPFLAGS</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0)</span><br><span> PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0)</span><br><span> PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.3.0)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/22950">change 22950</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/+/22950"/><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: I19e32fbc47bd88a668e0c912e89b001b0f8831dd </div>
<div style="display:none"> Gerrit-Change-Number: 22950 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>