<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/24753">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-msc main: use osmo_select_shutdown()<br><br>Change-Id: I75f4637c051ed44628e65dab1bdbbf28dcc9626f<br>---<br>M src/osmo-msc/msc_main.c<br>1 file changed, 15 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/53/24753/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c</span><br><span>index fcca101..a0f584d 100644</span><br><span>--- a/src/osmo-msc/msc_main.c</span><br><span>+++ b/src/osmo-msc/msc_main.c</span><br><span>@@ -776,14 +776,24 @@</span><br><span>                }</span><br><span>    }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   while (!quit) {</span><br><span style="color: hsl(120, 100%, 40%);">+       do {</span><br><span>                 log_reset_context();</span><br><span>                 osmo_select_main_ctx(0);</span><br><span style="color: hsl(0, 100%, 40%);">-        }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   msc_network_shutdown(msc_network);</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(3);</span><br><span style="color: hsl(120, 100%, 40%);">+             /* If the user hits Ctrl-C the third time, just terminate immediately. */</span><br><span style="color: hsl(120, 100%, 40%);">+             if (quit >= 3)</span><br><span style="color: hsl(120, 100%, 40%);">+                     break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+              /* Has SIGTERM been received (and not yet been handled)? */</span><br><span style="color: hsl(120, 100%, 40%);">+           if (quit && !osmo_select_shutdown_requested()) {</span><br><span style="color: hsl(120, 100%, 40%);">+                      msc_network_shutdown(msc_network);</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+                       /* Request write-only mode in osmo_select_main_ctx() */</span><br><span style="color: hsl(120, 100%, 40%);">+                       osmo_select_shutdown_request();</span><br><span style="color: hsl(120, 100%, 40%);">+                       /* continue the main select loop until all write queues are serviced. */</span><br><span style="color: hsl(120, 100%, 40%);">+              }</span><br><span style="color: hsl(120, 100%, 40%);">+     } while (!osmo_select_shutdown_done());</span><br><span> </span><br><span>  log_fini();</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/24753">change 24753</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-msc/+/24753"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I75f4637c051ed44628e65dab1bdbbf28dcc9626f </div>
<div style="display:none"> Gerrit-Change-Number: 24753 </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>