procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Actually start the alarms in atimer

Browse source 
* src/atimer.c (set_alarm): Actually start both timerfd and
alarms (attempted in 4107549a).
This commit is contained in:
Lars Ingebrigtsen 2021-11-07 04:55:02 +01:00
parent e20c27c770
commit 858868e36d
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/atimer.c
View file

@ -305,6 +305,7 @@ set_alarm (void)
#ifdef HAVE_ITIMERSPEC
if (0 <= timerfd || alarm_timer_ok)
{
bool exit = false;
struct itimerspec ispec;
ispec.it_value = atimers->expiration;
ispec.it_interval.tv_sec = ispec.it_interval.tv_nsec = 0;
@ -312,11 +313,14 @@ set_alarm (void)
if (timerfd_settime (timerfd, TFD_TIMER_ABSTIME, &ispec, 0) == 0)
{
add_timer_wait_descriptor (timerfd);
return;
exit = true;
}
# endif
if (alarm_timer_ok
&& timer_settime (alarm_timer, TIMER_ABSTIME, &ispec, 0) == 0)
exit = true;
if (exit)
return;
}
#endif
@ -333,9 +337,8 @@ set_alarm (void)
memset (&it, 0, sizeof it);
it.it_value = make_timeval (interval);
setitimer (ITIMER_REAL, &it, 0);
#else /* not HAVE_SETITIMER */
alarm (max (interval.tv_sec, 1));
#endif /* not HAVE_SETITIMER */
alarm (max (interval.tv_sec, 1));
}
}