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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">select_main: don't poll forever during shutdown<br><br>Do not poll without timeout during shutdown if no timers are pending.<br><br>Change-Id: I81c64a7ae440304522c2179c212023a566ddced8<br>---<br>M src/select.c<br>1 file changed, 8 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/select.c b/src/select.c</span><br><span>index b48d13e..ddff132 100644</span><br><span>--- a/src/select.c</span><br><span>+++ b/src/select.c</span><br><span>@@ -372,14 +372,20 @@</span><br><span> {</span><br><span>        unsigned int n_poll;</span><br><span>         int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+       int timeout = 0;</span><br><span> </span><br><span>         /* prepare read and write fdsets */</span><br><span>  n_poll = poll_fill_fds();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   if (!polling)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!polling) {</span><br><span>              osmo_timers_prepare();</span><br><span style="color: hsl(120, 100%, 40%);">+                timeout = osmo_timers_nearest_ms();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = poll(g_poll.poll, n_poll, polling ? 0 : osmo_timers_nearest_ms());</span><br><span style="color: hsl(120, 100%, 40%);">+               if (_osmo_select_shutdown_requested && timeout == -1)</span><br><span style="color: hsl(120, 100%, 40%);">+                 timeout = 0;</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%);">+   rc = poll(g_poll.poll, n_poll, timeout);</span><br><span>     if (rc < 0)</span><br><span>               return 0;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/26663">change 26663</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/libosmocore/+/26663"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I81c64a7ae440304522c2179c212023a566ddced8 </div>
<div style="display:none"> Gerrit-Change-Number: 26663 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>