faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't abort on EINTR select errors

Browse source
This commit is contained in:
Miroslav Lichvar 2013-06-14 12:37:24 +02:00
parent 2f3ef235a1
commit f7802f0111
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sched.c
View file

@ -561,7 +561,7 @@ void
SCH_MainLoop(void) SCH_MainLoop(void)
{ {
fd_set rd; fd_set rd;
int status; int status, errsv;
struct timeval tv, *ptv; struct timeval tv, *ptv;
struct timeval now, cooked; struct timeval now, cooked;
double err; double err;
@ -592,6 +592,7 @@ SCH_MainLoop(void)
assert(ptv || n_read_fds); assert(ptv || n_read_fds);
status = select(one_highest_fd, &rd, NULL, NULL, ptv); status = select(one_highest_fd, &rd, NULL, NULL, ptv);
errsv = errno;
LCL_ReadRawTime(&now); LCL_ReadRawTime(&now);
LCL_CookTime(&now, &cooked, &err); LCL_CookTime(&now, &cooked, &err);
@ -606,7 +607,9 @@ SCH_MainLoop(void)
last_select_ts_err = err; last_select_ts_err = err;
if (status < 0) { if (status < 0) {
assert(need_to_exit); if (!need_to_exit && errsv != EINTR) {
LOG_FATAL(LOGF_Scheduler, "select() failed : %s", strerror(errsv));
}
} else if (status > 0) { } else if (status > 0) {
/* A file descriptor is ready to read */ /* A file descriptor is ready to read */