d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC: r261146

Browse Source 
Bad timespec_subtract() calculations produce negative tv_nsec on i386
which cause EINVAL returned from nanosleep() which cause loop in
cron_sleep() and making all cron jobs to start about 30 seconds earlier
(which cause f.e. logfiles rotation by newsyslog delayed by 1 hour).

Use simple and proved calculations from kernel's timespecsub() instead.
This commit is contained in:
ache 2014-01-28 13:29:54 +00:00
parent 782dc633da
commit 1626ab813a
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
usr.sbin/cron/cron/cron.c
View File

@ -376,30 +376,17 @@ cron_sync(int secres) {
}
}
static int
static void
timespec_subtract(struct timespec *result, struct timespec *x,
struct timespec *y)
{
time_t nsec;
/* Perform the carry for the later subtraction by updating y. */
if (x->tv_nsec < y->tv_nsec) {
nsec = (y->tv_nsec - x->tv_nsec) / 10000000 + 1;
y->tv_nsec -= 1000000000 * nsec;
y->tv_sec += nsec;
*result = *x;
result->tv_sec -= y->tv_sec;
result->tv_nsec -= y->tv_nsec;
if (result->tv_nsec < 0) {
result->tv_sec--;
result->tv_nsec += 1000000000;
}
if (x->tv_nsec - y->tv_nsec > 1000000000) {
nsec = (x->tv_nsec - y->tv_nsec) / 1000000000;
y->tv_nsec += 1000000000 * nsec;
y->tv_sec -= nsec;
}
/* tv_nsec is certainly positive. */
result->tv_sec = x->tv_sec - y->tv_sec;
result->tv_nsec = x->tv_nsec - y->tv_nsec;
/* Return True if result is negative. */
return (x->tv_sec < y->tv_sec);
}
static void