X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgettimeofday.c;h=ae2a6f148fbc438f171c560ea60bc6c17c84b7fe;hb=0ba19fcc5ff43167939e465af4b93f965fffcc8c;hp=99f49b04f992ca089dbf66c6561c934542eb3876;hpb=fc0de83a1e5cca98557f603670284f247b34f491;p=gnulib.git diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c index 99f49b04f..ae2a6f148 100644 --- a/lib/gettimeofday.c +++ b/lib/gettimeofday.c @@ -1,10 +1,6 @@ -/* Provide gettimeofday for systems that don't have it, or, - work around the bug in some systems whereby gettimeofday clobbers the - static buffer that localtime uses for it's return value. The gettimeofday - function from Mac OS X 10.0.4, i.e. Darwin 1.3.7 has this problem. - The tzset replacement is necessary for at least Solaris 2.5, 2.5.1, and 2.6. +/* Provide gettimeofday for systems that don't have it or for which it's broken. - Copyright (C) 2001, 2002, 2003, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2007, 2009-2011 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,35 +20,31 @@ #include -/* Disable the definitions of these functions (from config.h) - so we can use the library versions here. */ -#undef gettimeofday -#undef gmtime -#undef localtime -#undef tzset +/* Specification. */ +#include -#include +#include -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif +#if HAVE_SYS_TIMEB_H +# include #endif -#include +#if GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME -#if HAVE_SYS_TIMEB_H -#include -#endif +/* Work around the bug in some systems whereby gettimeofday clobbers + the static buffer that localtime uses for its return value. The + gettimeofday function from Mac OS X 10.0.4 (i.e., Darwin 1.3.7) has + this problem. The tzset replacement is necessary for at least + Solaris 2.5, 2.5.1, and 2.6. */ -#if GETTIMEOFDAY_CLOBBERS_LOCALTIME -static struct tm *localtime_buffer_addr; -#endif +static struct tm tm_zero_buffer; +static struct tm *localtime_buffer_addr = &tm_zero_buffer; + +# undef localtime +extern struct tm *localtime (time_t const *); + +# undef gmtime +extern struct tm *gmtime (time_t const *); /* This is a wrapper for localtime. It is used only on systems for which gettimeofday clobbers the static buffer used for localtime's result. @@ -60,105 +52,93 @@ static struct tm *localtime_buffer_addr; On the first call, record the address of the static buffer that localtime uses for its result. */ -#if GETTIMEOFDAY_CLOBBERS_LOCALTIME struct tm * -rpl_localtime (const time_t *timep) +rpl_localtime (time_t const *timep) { struct tm *tm = localtime (timep); - if (! localtime_buffer_addr) + if (localtime_buffer_addr == &tm_zero_buffer) localtime_buffer_addr = tm; return tm; } -#endif /* Same as above, since gmtime and localtime use the same buffer. */ -#if GETTIMEOFDAY_CLOBBERS_LOCALTIME struct tm * -rpl_gmtime (const time_t *timep) +rpl_gmtime (time_t const *timep) { struct tm *tm = gmtime (timep); - if (! localtime_buffer_addr) + if (localtime_buffer_addr == &tm_zero_buffer) localtime_buffer_addr = tm; return tm; } + +#endif /* GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME */ + +#if TZSET_CLOBBERS_LOCALTIME + +# undef tzset +extern void tzset (void); + +/* This is a wrapper for tzset, for systems on which tzset may clobber + the static buffer used for localtime's result. */ +void +rpl_tzset (void) +{ + /* Save and restore the contents of the buffer used for localtime's + result around the call to tzset. */ + struct tm save = *localtime_buffer_addr; + tzset (); + *localtime_buffer_addr = save; +} #endif -/* This is a wrapper for gettimeofday. - It is used only on systems that lack this function, or for whose - implementation of this function causes problems. */ +/* This is a wrapper for gettimeofday. It is used only on systems + that lack this function, or whose implementation of this function + causes problems. */ int -rpl_gettimeofday (struct timeval *restrict tv, void *restrict tz) +gettimeofday (struct timeval *restrict tv, void *restrict tz) { +#undef gettimeofday #if HAVE_GETTIMEOFDAY # if GETTIMEOFDAY_CLOBBERS_LOCALTIME + /* Save and restore the contents of the buffer used for localtime's + result around the call to gettimeofday. */ + struct tm save = *localtime_buffer_addr; +# endif - /* Save and restore the contents of the buffer used for localtime's result - around the call to gettimeofday. */ - struct tm save; - int result; - - if (! localtime_buffer_addr) - { - time_t t = 0; - localtime_buffer_addr = localtime (&t); - } + int result = gettimeofday (tv, (struct timezone *) tz); - save = *localtime_buffer_addr; - result = gettimeofday (tv, tz); +# if GETTIMEOFDAY_CLOBBERS_LOCALTIME *localtime_buffer_addr = save; +# endif return result; -# endif #else + # if HAVE__FTIME struct _timeb timebuf; - _ftime (&timebuf); tv->tv_sec = timebuf.time; tv->tv_usec = timebuf.millitm * 1000; - return 0; - # else - time_t t = time (NULL); - - if (t == (time_t) -1) - return -1; - tv->tv_sec = t; +# if !defined OK_TO_USE_1S_CLOCK +# error "Only 1-second nominal clock resolution found. Is that intended?" \ + "If so, compile with the -DOK_TO_USE_1S_CLOCK option." +# endif + tv->tv_sec = time (NULL); tv->tv_usec = 0; - return 0; - # endif -#endif -} - -/* This is a wrapper for tzset. It is used only on systems for which - tzset may clobber the static buffer used for localtime's result. - Save and restore the contents of the buffer used for localtime's - result around the call to tzset. */ -#if GETTIMEOFDAY_CLOBBERS_LOCALTIME -void -rpl_tzset (void) -{ - struct tm save; - if (! localtime_buffer_addr) - { - time_t t = 0; - localtime_buffer_addr = localtime (&t); - } + return 0; - save = *localtime_buffer_addr; - tzset (); - *localtime_buffer_addr = save; -} #endif +}