<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24675">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">use osmo_select_shutdown to get rid of SIGTERM sleep<br><br>Change-Id: I9a4a629805c49240b8be412e9def298cdf5bc996<br>---<br>M src/osmo-bsc/osmo_bsc_main.c<br>1 file changed, 5 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/75/24675/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>index 14475ff..2a6c501 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_main.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>@@ -697,10 +697,12 @@</span><br><span>     switch (signum) {</span><br><span>    case SIGINT:</span><br><span>         case SIGTERM:</span><br><span style="color: hsl(120, 100%, 40%);">+         /* If SIGTERM was already sent before, just terminate immediately. */</span><br><span style="color: hsl(120, 100%, 40%);">+         if (osmo_select_shutdown_requested())</span><br><span style="color: hsl(120, 100%, 40%);">+                 exit(-1);</span><br><span>            bsc_shutdown_net(bsc_gsmnet);</span><br><span>                osmo_signal_dispatch(SS_L_GLOBAL, S_L_GLOBAL_SHUTDOWN, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-           sleep(3);</span><br><span style="color: hsl(0, 100%, 40%);">-               exit(0);</span><br><span style="color: hsl(120, 100%, 40%);">+              osmo_select_shutdown_request();</span><br><span>              break;</span><br><span>       case SIGABRT:</span><br><span>                /* in case of abort, we want to obtain a talloc report and</span><br><span>@@ -1033,7 +1035,7 @@</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 (!osmo_select_shutdown_done()) {</span><br><span>               osmo_select_main_ctx(0);</span><br><span>     }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24675">change 24675</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/+/24675"/><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: I9a4a629805c49240b8be412e9def298cdf5bc996 </div>
<div style="display:none"> Gerrit-Change-Number: 24675 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>