mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 22:45:39 +00:00
Code Issues Releases Wiki Activity

fix tv_usec in isc_time_nowplusinterval() also.

Browse Source
This commit is contained in:
Mark Andrews
2001-02-24 10:22:20 +00:00
parent 0fd53e151b
commit 70ec7dd741
1 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
lib/isc/unix/time.c
View File

@@ -15,12 +15,13 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: time.c,v 1.32 2001/02/24 02:53:38 marka Exp $ */ /* $Id: time.c,v 1.33 2001/02/24 10:22:20 marka Exp $ */
#include <config.h> #include <config.h>
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>
#include <syslog.h>
#include <time.h> #include <time.h>
#include <sys/time.h> /* Required for struct timeval on some platforms. */ #include <sys/time.h> /* Required for struct timeval on some platforms. */
@@ -52,6 +53,32 @@
static isc_interval_t zero_interval = { 0, 0 }; static isc_interval_t zero_interval = { 0, 0 };
isc_interval_t *isc_interval_zero = &zero_interval; isc_interval_t *isc_interval_zero = &zero_interval;
#if ISC_FIX_TV_USEC
static inline void
fix_tv_usec(struct timeval *tv) {
isc_boolean_t fixed = ISC_FALSE;
if (tv->tv_usec < 0) {
fixed = ISC_TRUE;
do {
tv->tv_sec -= 1;
tv->tv_usec += US_PER_S;
} while (tv->tv_usec < 0);
} else if (tv->tv_usec >= US_PER_S) {
fixed = ISC_TRUE;
do {
tv->tv_sec += 1;
tv->tv_usec -= US_PER_S;
} while (tv->tv_usec >=US_PER_S);
}
/*
* Call syslog directly as was are called from the logging functions.
*/
if (fixed)
syslog(LOG_ERR, "gettimeofday returned bad tv_usec: corrected");
}
#endif
void void
isc_interval_set(isc_interval_t *i, isc_interval_set(isc_interval_t *i,
unsigned int seconds, unsigned int nanoseconds) unsigned int seconds, unsigned int nanoseconds)
@@ -139,9 +166,6 @@ isc_time_isepoch(isc_time_t *t) {
isc_result_t isc_result_t
isc_time_now(isc_time_t *t) { isc_time_now(isc_time_t *t) {
struct timeval tv; struct timeval tv;
#if ISC_FIX_TV_USEC
isc_boolean_t fixed = ISC_FALSE;
#endif
/* /*
* Set *t to the current absolute time. * Set *t to the current absolute time.
@@ -162,24 +186,9 @@ isc_time_now(isc_time_t *t) {
* certain things to be true ... * certain things to be true ...
*/ */
#if ISC_FIX_TV_USEC #if ISC_FIX_TV_USEC
if (tv.tv_usec < 0) { fix_tv_usec(&tv);
fixed = ISC_TRUE; if (tv.tv_sec < 0)
do {
tv.tv_sec -= 1;
tv.tv_usec += US_PER_S;
} while (tv.tv_usec < 0);
} else if (tv.tv_usec >= US_PER_S) {
fixed = ISC_TRUE;
do {
tv.tv_sec += 1;
tv.tv_usec -= US_PER_S;
} while (tv.tv_usec >=US_PER_S);
} else if (tv.tv_sec < 0)
return (ISC_R_UNEXPECTED); return (ISC_R_UNEXPECTED);
if (fixed)
isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL,
ISC_LOGMODULE_TIME, ISC_LOG_INFO,
"gettimeofday returned bad tv_usec: corrected");
#else #else
if (tv.tv_sec < 0 || tv.tv_usec < 0 || tv.tv_usec >= US_PER_S) if (tv.tv_sec < 0 || tv.tv_usec < 0 || tv.tv_usec >= US_PER_S)
return (ISC_R_UNEXPECTED); return (ISC_R_UNEXPECTED);
@@ -222,8 +231,14 @@ isc_time_nowplusinterval(isc_time_t *t, isc_interval_t *i) {
* happening are pretty much zero, but since the libisc library ensures * happening are pretty much zero, but since the libisc library ensures
* certain things to be true ... * certain things to be true ...
*/ */
#if ISC_FIX_TV_USEC
fix_tv_usec(&tv);
if (tv.tv_sec < 0)
return (ISC_R_UNEXPECTED);
#else
if (tv.tv_sec < 0 || tv.tv_usec < 0 || tv.tv_usec >= US_PER_S) if (tv.tv_sec < 0 || tv.tv_usec < 0 || tv.tv_usec >= US_PER_S)
return (ISC_R_UNEXPECTED); return (ISC_R_UNEXPECTED);
#endif
/* /*
* Ensure the resulting seconds value fits in the size of an * Ensure the resulting seconds value fits in the size of an