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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">logging: gsmtap: Store TID instead of PID in pkt hdr<br><br>This allows differentiating threads withing an application, while still<br>keeping same numbering for single-threaded application (since first<br>thread ID is always the same as the process group ID).<br><br>Related: OS#5027<br>Change-Id: I33da02524fc064e133b2b762af7060139c4cfd81<br>---<br>M src/logging_gsmtap.c<br>1 file changed, 5 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/logging_gsmtap.c b/src/logging_gsmtap.c</span><br><span>index 0524602..e190f88 100644</span><br><span>--- a/src/logging_gsmtap.c</span><br><span>+++ b/src/logging_gsmtap.c</span><br><span>@@ -51,10 +51,11 @@</span><br><span> #include <osmocom/core/logging.h></span><br><span> #include <osmocom/core/timer.h></span><br><span> #include <osmocom/core/byteswap.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/thread.h></span><br><span> </span><br><span> #define GSMTAP_LOG_MAX_SIZE 4096</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static uint32_t logging_gsmtap_pid;</span><br><span style="color: hsl(120, 100%, 40%);">+static __thread uint32_t logging_gsmtap_tid;</span><br><span> </span><br><span> static void _gsmtap_raw_output(struct log_target *target, int subsys,</span><br><span>                          unsigned int level, const char *file,</span><br><span>@@ -85,7 +86,9 @@</span><br><span>     /* Logging header */</span><br><span>         golh = (struct gsmtap_osmocore_log_hdr *) msgb_put(msg, sizeof(*golh));</span><br><span>      OSMO_STRLCPY_ARRAY(golh->proc_name, target->tgt_gsmtap.ident);</span><br><span style="color: hsl(0, 100%, 40%);">-    golh->pid = logging_gsmtap_pid;</span><br><span style="color: hsl(120, 100%, 40%);">+    if (logging_gsmtap_tid == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+          osmo_store32be((uint32_t)osmo_gettid(), &logging_gsmtap_tid);</span><br><span style="color: hsl(120, 100%, 40%);">+     golh->pid = logging_gsmtap_tid;</span><br><span>   if (subsys_name)</span><br><span>             OSMO_STRLCPY_ARRAY(golh->subsys, subsys_name + 1);</span><br><span>        else</span><br><span>@@ -156,9 +159,6 @@</span><br><span>   target->type = LOG_TGT_TYPE_GSMTAP;</span><br><span>       target->raw_output = _gsmtap_raw_output;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!logging_gsmtap_pid)</span><br><span style="color: hsl(0, 100%, 40%);">-                osmo_store32be((uint32_t)getpid(), &logging_gsmtap_pid);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>         return target;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22952">change 22952</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/libosmocore/+/22952"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I33da02524fc064e133b2b762af7060139c4cfd81 </div>
<div style="display:none"> Gerrit-Change-Number: 22952 </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: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>