<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13971">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-stp: refactor handling of both SIGINT and SIGTERM<br><br>On reception of one of the mentioned signals, we should gracefully<br>shutdown established SIGTRAN links by sending S_L_GLOBAL_SHUTDOWN.<br>As a bonus, let's report heap state of the root talloc-context.<br><br>Change-Id: I5d8618857c5119d4acca5d65cf1276ab02889c84<br>---<br>M stp/stp_main.c<br>1 file changed, 18 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/71/13971/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/stp/stp_main.c b/stp/stp_main.c</span><br><span>index 6a47403..3127321 100644</span><br><span>--- a/stp/stp_main.c</span><br><span>+++ b/stp/stp_main.c</span><br><span>@@ -48,6 +48,7 @@</span><br><span> #include <osmocom/sigtran/protocol/m3ua.h></span><br><span> </span><br><span> static void *tall_stp_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+static int quit = 0;</span><br><span> </span><br><span> /* we only use logging sub-systems of the various libraries so far */</span><br><span> static const struct log_info_cat log_info_cat[] = {</span><br><span>@@ -136,11 +137,8 @@</span><br><span>     switch (signal) {</span><br><span>    case SIGINT:</span><br><span>         case SIGTERM:</span><br><span style="color: hsl(0, 100%, 40%);">-           /* FIXME: handle the signal somewhere else and gracefully shut down</span><br><span style="color: hsl(0, 100%, 40%);">-              * SIGTRAN links</span><br><span style="color: hsl(0, 100%, 40%);">-                osmo_signal_dispatch(SS_L_GLOBAL, S_L_GLOBAL_SHUTDOWN, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-           sleep(1); */</span><br><span style="color: hsl(0, 100%, 40%);">-            exit(0);</span><br><span style="color: hsl(120, 100%, 40%);">+              fprintf(stderr, "Terminating due to signal %d\n", signal);</span><br><span style="color: hsl(120, 100%, 40%);">+          quit++;</span><br><span>              break;</span><br><span>       case SIGABRT:</span><br><span>                osmo_generate_backtrace();</span><br><span>@@ -214,9 +212,23 @@</span><br><span>            }</span><br><span>    }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   while (1) {</span><br><span style="color: hsl(120, 100%, 40%);">+   while (!quit) {</span><br><span>              rc = osmo_select_main(0);</span><br><span>            if (rc < 0)</span><br><span>                       exit(3);</span><br><span>     }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   /* Gracefully shut down SIGTRAN links */</span><br><span style="color: hsl(120, 100%, 40%);">+      osmo_signal_dispatch(SS_L_GLOBAL, S_L_GLOBAL_SHUTDOWN, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ sleep(1); /* FIXME: do we really need to sleep() here? */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   /* Deinitialize logging */</span><br><span style="color: hsl(120, 100%, 40%);">+    log_fini();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Report state of the root talloc-context, then free,</span><br><span style="color: hsl(120, 100%, 40%);">+         * so both ASAN and Valgrind are happy... */</span><br><span style="color: hsl(120, 100%, 40%);">+  talloc_report_full(tall_stp_ctx, stderr);</span><br><span style="color: hsl(120, 100%, 40%);">+     talloc_free(tall_stp_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13971">change 13971</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/13971"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I5d8618857c5119d4acca5d65cf1276ab02889c84 </div>
<div style="display:none"> Gerrit-Change-Number: 13971 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>