diff options
| author | James Laird <jlaird@hdfgroup.org> | 2004-07-23 17:24:59 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2004-07-23 17:24:59 (GMT) |
| commit | 8d843938ba8275f8a52f32a26b5f6829830e3a8a (patch) | |
| tree | 5db430aecc45fc1c7cd7783eab72ad0f1806c10d /src | |
| parent | 12ee450f700800de37600494353e39e8be59e928 (diff) | |
| download | hdf5-8d843938ba8275f8a52f32a26b5f6829830e3a8a.zip hdf5-8d843938ba8275f8a52f32a26b5f6829830e3a8a.tar.gz hdf5-8d843938ba8275f8a52f32a26b5f6829830e3a8a.tar.bz2 | |
[svn-r8937]
Purpose:
Bug fix
Description:
Modification time test (mtime) would die silently on some systems. This is
because the code is very system-dependant (it relies on getting the current
time and the timezone from the OS).
Solution:
mtime test now uses TEST_ERROR macro to print "FAILED" and to output where the
failure occurred. Configure script is a little smarter about whether
gettimeofday() function returns the timezone correctly.
Further bugs will need to be addressed on a system-by-system basis.
Platforms tested:
sleipnir, arabica, verbena, copper, windows (VC7)
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Omtime.c | 11 | ||||
| -rw-r--r-- | src/H5config.h.in | 3 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/H5Omtime.c b/src/H5Omtime.c index ac99bc1..2c53950 100644 --- a/src/H5Omtime.c +++ b/src/H5Omtime.c @@ -233,15 +233,17 @@ H5O_mtime_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const uint8_t *p, /* Irix5.3 */ { struct timezone tz; + if (HDBSDgettimeofday(NULL, &tz)<0) HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "unable to obtain local timezone information"); the_time -= tz.tz_minuteswest * 60 - (tm.tm_isdst ? 3600 : 0); } -#elif defined(H5_HAVE_GETTIMEOFDAY) && defined(H5_HAVE_STRUCT_TIMEZONE) +#elif defined(H5_HAVE_GETTIMEOFDAY) && defined(H5_HAVE_STRUCT_TIMEZONE) && defined(H5_GETTIMEOFDAY_GIVES_TZ) { struct timezone tz; + struct timeval tv; /* Used as a placebo; some systems don't like NULL */ - if (HDgettimeofday(NULL, &tz) < 0) + if (HDgettimeofday(&tv, &tz) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "unable to obtain local timezone information"); the_time -= tz.tz_minuteswest * 60 - (tm.tm_isdst ? 3600 : 0); @@ -250,12 +252,13 @@ H5O_mtime_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const uint8_t *p, { struct timeb timebuffer; long tz; - + ftime(&timebuffer); tz = timebuffer.timezone; /* daylight is not handled properly. Currently we just hard-code the problem. */ - the_time -= tz*60; +/* the_time -= tz * 60; */ + the_time -= tz * 60 - 3600; /* the_time -= tz * 60 - 3600 * _daylight;*/ } #else diff --git a/src/H5config.h.in b/src/H5config.h.in index e6c92d7..f91986b 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -356,6 +356,9 @@ /* Define if `__tm_gmtoff' is a member of `struct tm' */ #undef HAVE___TM_GMTOFF +/* Define if gettimeofday() populates the tz pointer passed in */ +#undef GETTIMEOFDAY_GIVES_TZ + /* Define if your system's `MPI_File_set_size' function works for files over 2GB. */ #undef MPI_FILE_SET_SIZE_BIG |