<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/17647">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Meas Tools: Avoid OSMO_ASSERT due to uninitialised logging.<br><br>The measurement tools use libosmocore socket functions that will<br>use logging if the socket cannot be opened, but the tools did<br>not initialise logging, resulting in<br><br> Assert failed osmo_log_info logging.c:235<br> backtrace() returned 9 addresses<br> [.....]<br><br>Initialise logging so that we get a nicer and more informative<br>message, such as:<br><br> unable to bind socket:(null):8888: Address already in use<br> no suitable addr found for: (null):8888<br><br>Change-Id: Ib3b3558723682defcee22e7ea2d8bf5c2cff1278<br>---<br>M src/utils/meas_json.c<br>M src/utils/meas_vis.c<br>2 files changed, 29 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/utils/meas_json.c b/src/utils/meas_json.c</span><br><span>index a3526de..6aa531a 100644</span><br><span>--- a/src/utils/meas_json.c</span><br><span>+++ b/src/utils/meas_json.c</span><br><span>@@ -34,6 +34,7 @@</span><br><span> #include <osmocom/core/socket.h></span><br><span> #include <osmocom/core/msgb.h></span><br><span> #include <osmocom/core/select.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/application.h></span><br><span> </span><br><span> #include <osmocom/gsm/gsm_utils.h></span><br><span> </span><br><span>@@ -171,8 +172,21 @@</span><br><span>      return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* default categories */</span><br><span style="color: hsl(120, 100%, 40%);">+static struct log_info_cat default_categories[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static const struct log_info meas_json_log_info = {</span><br><span style="color: hsl(120, 100%, 40%);">+  .cat = default_categories,</span><br><span style="color: hsl(120, 100%, 40%);">+    .num_cat = ARRAY_SIZE(default_categories),</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int main(int argc, char **argv)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+    void *tall_ctx = talloc_named_const(NULL, 0, "meas_json");</span><br><span style="color: hsl(120, 100%, 40%);">+  osmo_init_logging2(tall_ctx, &meas_json_log_info);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     int rc;</span><br><span>      struct osmo_fd udp_ofd;</span><br><span> </span><br><span>diff --git a/src/utils/meas_vis.c b/src/utils/meas_vis.c</span><br><span>index cba08f5..aea12bf 100644</span><br><span>--- a/src/utils/meas_vis.c</span><br><span>+++ b/src/utils/meas_vis.c</span><br><span>@@ -13,6 +13,8 @@</span><br><span> #include <osmocom/core/msgb.h></span><br><span> #include <osmocom/core/select.h></span><br><span> #include <osmocom/core/talloc.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/logging.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/application.h></span><br><span> </span><br><span> #include <osmocom/gsm/gsm_utils.h></span><br><span> </span><br><span>@@ -258,11 +260,24 @@</span><br><span>   { 0, NULL }</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* default categories */</span><br><span style="color: hsl(120, 100%, 40%);">+static struct log_info_cat default_categories[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static const struct log_info meas_vis_log_info = {</span><br><span style="color: hsl(120, 100%, 40%);">+        .cat = default_categories,</span><br><span style="color: hsl(120, 100%, 40%);">+    .num_cat = ARRAY_SIZE(default_categories),</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int main(int argc, char **argv)</span><br><span> {</span><br><span>     int rc;</span><br><span>      char *header[1];</span><br><span>     char *title[1];</span><br><span style="color: hsl(120, 100%, 40%);">+       struct log_target *stderr_target;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   void *tall_ctx = talloc_named_const(NULL, 0, "meas_vis");</span><br><span style="color: hsl(120, 100%, 40%);">+   osmo_init_logging2(tall_ctx, &meas_vis_log_info);</span><br><span> </span><br><span>    msgb_talloc_ctx_init(NULL, 0);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/17647">change 17647</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-bsc/+/17647"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib3b3558723682defcee22e7ea2d8bf5c2cff1278 </div>
<div style="display:none"> Gerrit-Change-Number: 17647 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: keith <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: keith <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>