<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-cbc/+/21996">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved; Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">move from gettid() to pthread_self()<br><br>Whatever you do sucks:<br>* gettid() doens't have a glibc wrapper function in Debian <= 9<br>* pthrad_self() returns an opaque pthread_t where we shouldn't really<br>  make the assumption it's an unsigned long<br><br>Change-Id: Ida200de75333e0d35997158000def3cac89759b1<br>---<br>M src/cbc_main.c<br>M src/rest_it_op.c<br>2 files changed, 3 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/cbc_main.c b/src/cbc_main.c</span><br><span>index 84d6e16..f664afb 100644</span><br><span>--- a/src/cbc_main.c</span><br><span>+++ b/src/cbc_main.c</span><br><span>@@ -20,14 +20,12 @@</span><br><span>  *</span><br><span>  */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define _GNU_SOURCE</span><br><span> #include <stdlib.h></span><br><span> #include <stdio.h></span><br><span> #include <string.h></span><br><span> #include <unistd.h></span><br><span> #include <getopt.h></span><br><span> #include <signal.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <sys/types.h></span><br><span> </span><br><span> #include <osmocom/core/stats.h></span><br><span> #include <osmocom/core/select.h></span><br><span>@@ -206,7 +204,7 @@</span><br><span> </span><br><span>    rest_api_init(tall_rest_ctx, 12345);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        LOGP(DREST, LOGL_INFO, "Main thread tid: %d\n", gettid());</span><br><span style="color: hsl(120, 100%, 40%);">+  LOGP(DREST, LOGL_INFO, "Main thread tid: %lu\n", pthread_self());</span><br><span>  g_cbc->it_q.rest2main = osmo_it_q_alloc(g_cbc, "rest2main", 10, rest2main_read_cb, NULL);</span><br><span>       OSMO_ASSERT(g_cbc->it_q.rest2main);</span><br><span>       osmo_fd_register(&g_cbc->it_q.rest2main->event_ofd);</span><br><span>diff --git a/src/rest_it_op.c b/src/rest_it_op.c</span><br><span>index d928c21..b01f8ba 100644</span><br><span>--- a/src/rest_it_op.c</span><br><span>+++ b/src/rest_it_op.c</span><br><span>@@ -20,10 +20,6 @@</span><br><span>  *</span><br><span>  */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define _GNU_SOURCE</span><br><span style="color: hsl(0, 100%, 40%);">-#include <unistd.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <sys/types.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #include <errno.h></span><br><span> #include <pthread.h></span><br><span> </span><br><span>@@ -55,7 +51,7 @@</span><br><span> {</span><br><span>     int rc = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DREST, LOGL_DEBUG, "rest_it_op enqueue from %u\n", gettid());</span><br><span style="color: hsl(120, 100%, 40%);">+  LOGP(DREST, LOGL_DEBUG, "rest_it_op enqueue from %lu\n", pthread_self());</span><br><span> </span><br><span>      rc = osmo_it_q_enqueue(g_cbc->it_q.rest2main, op, list);</span><br><span>  if (rc < 0)</span><br><span>@@ -91,7 +87,7 @@</span><br><span>   struct rest_it_op *op = item;</span><br><span>        struct cbc_message *cbc_msg;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        LOGP(DREST, LOGL_DEBUG, "%s(op=%p) from %u\n", __func__, op, gettid());</span><br><span style="color: hsl(120, 100%, 40%);">+     LOGP(DREST, LOGL_DEBUG, "%s(op=%p) from %lu\n", __func__, op, pthread_self());</span><br><span> </span><br><span>         /* FIXME: look up related message and dispatch to message FSM,</span><br><span>        * which will eventually call pthread_cond_signal(&op->cond) */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-cbc/+/21996">change 21996</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-cbc/+/21996"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-cbc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ida200de75333e0d35997158000def3cac89759b1 </div>
<div style="display:none"> Gerrit-Change-Number: 21996 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </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>