<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10222">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">hlr.c: move deinitialization code from SIGINT handler<br><br>There were a few lines of dead code below the osmo_select_main()<br>loop, while the actual deinitialization code was a part of SIGINT<br>handler. Let's reanimate this dead zone by moving the code there<br>and introducing a global 'loop-breaker' variable.<br><br>Change-Id: I0e2d673b420193e2bdc1a92377aca542f3a19229<br>---<br>M src/hlr.c<br>1 file changed, 7 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/22/10222/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/hlr.c b/src/hlr.c</span><br><span>index 643dfff..7fdb27e 100644</span><br><span>--- a/src/hlr.c</span><br><span>+++ b/src/hlr.c</span><br><span>@@ -44,6 +44,7 @@</span><br><span> #include "hlr_vty.h"</span><br><span> </span><br><span> static struct hlr *g_hlr;</span><br><span style="color: hsl(120, 100%, 40%);">+static int quit = 0;</span><br><span> </span><br><span> /* Trigger 'Insert Subscriber Data' messages to all connected GSUP clients.</span><br><span>  *</span><br><span>@@ -523,11 +524,7 @@</span><br><span>         switch (signal) {</span><br><span>    case SIGINT:</span><br><span>                 LOGP(DMAIN, LOGL_NOTICE, "Terminating due to SIGINT\n");</span><br><span style="color: hsl(0, 100%, 40%);">-              osmo_gsup_server_destroy(g_hlr->gs);</span><br><span style="color: hsl(0, 100%, 40%);">-         db_close(g_hlr->dbc);</span><br><span style="color: hsl(0, 100%, 40%);">-                log_fini();</span><br><span style="color: hsl(0, 100%, 40%);">-             talloc_report_full(hlr_ctx, stderr);</span><br><span style="color: hsl(0, 100%, 40%);">-            exit(0);</span><br><span style="color: hsl(120, 100%, 40%);">+              quit++;</span><br><span>              break;</span><br><span>       case SIGUSR1:</span><br><span>                LOGP(DMAIN, LOGL_DEBUG, "Talloc Report due to SIGUSR1\n");</span><br><span>@@ -621,13 +618,14 @@</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>                osmo_select_main(0);</span><br><span style="color: hsl(0, 100%, 40%);">-    }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_server_destroy(g_hlr->gs);</span><br><span>      db_close(g_hlr->dbc);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>     log_fini();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- exit(0);</span><br><span style="color: hsl(120, 100%, 40%);">+      talloc_report_full(hlr_ctx, stderr);</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/10222">change 10222</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/10222"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-hlr </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I0e2d673b420193e2bdc1a92377aca542f3a19229 </div>
<div style="display:none"> Gerrit-Change-Number: 10222 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>