osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 0
Code Issues Releases Wiki Activity

select_main: don't poll forever during shutdown 

Do not poll without timeout during shutdown if no timers are pending.

Change-Id: I81c64a7ae440304522c2179c212023a566ddced8
This commit is contained in:
Oliver Smith 2021-12-21 19:17:51 +01:00 committed by neels
parent 29814a5374
commit d841bec8d2
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/select.c
View File

@ -372,14 +372,20 @@ static int _osmo_select_main(int polling)
{
unsigned int n_poll;
int rc;
int timeout = 0;
/* prepare read and write fdsets */
n_poll = poll_fill_fds();
if (!polling)
if (!polling) {
osmo_timers_prepare();
timeout = osmo_timers_nearest_ms();
rc = poll(g_poll.poll, n_poll, polling ? 0 : osmo_timers_nearest_ms());
if (_osmo_select_shutdown_requested && timeout == -1)
timeout = 0;
}
rc = poll(g_poll.poll, n_poll, timeout);
if (rc < 0)
return 0;