diff options
author | Robb Matzke <matzke@llnl.gov> | 1998-08-31 13:46:47 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1998-08-31 13:46:47 (GMT) |
commit | 1e38c1378582208f6f109042c37c8fff858f985d (patch) | |
tree | cbed547d5490029b2f49f31a61187d33edaa8933 /test/mtime.c | |
parent | e4053f38c2b2732ffa48b7401581db2516b47951 (diff) | |
download | hdf5-1e38c1378582208f6f109042c37c8fff858f985d.zip hdf5-1e38c1378582208f6f109042c37c8fff858f985d.tar.gz hdf5-1e38c1378582208f6f109042c37c8fff858f985d.tar.bz2 |
[svn-r633] Changes since 19980828
----------------------
./RELEASE
Updated with important changes I made since the second beta.
./src/H5A.c
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5R.c
./src/H5Rprivate.h
./src/H5T.c
./src/H5Tprivate.h
Any API function that used to take an `hid_t loc_id' followed
by a `const char *name' can now take any type of object for
the loc_id as long as the object is somehow associated with a
file. Internally, H5G_loc() was modified to return an
H5G_entry_t* instead of an H5G_t* so it's more general.
Among other things, this allows one to retrieve information
about an object like a named type or dataset without knowing
the name of the type or dataset:
int
get_nlinks (hid_t obj)
{
H5G_stat_t sb;
if (H5Gstat(obj, ".", TRUE, &sb)<0) return -1;
return sb.nlink;
}
./test/gheap.c
./test/istore.c
These files needed a couple of changes because they call some
of the internal functions whose H5G_t arguments changed to
H5G_entry_t.
./src/H5A.c
Got rid of all the switch statements for getting symbol table
entries for varous objects and replaced them with a call to
H5G_loc() allowing attributes to automatically apply to any
type of object that belongs to a file.
./test/Makefile.in
Moved the ragged array tests from the normal list of tests to
the `make timings' target.
./test/ragged.c
Added rewrite tests -- rewrite the rows of a dataset changing
the number of rows and the length of each row.
./test/mtime.c
Added a test that checks that H5Gstat() can be called with a
dataset as the first argument.
./src/H5S.c
Added #ifdef HAVE_PARALLEL around code to check for the
HDF5_MPI_OPT_TYPES environment variable because the global
variable that gets set is #ifdef'd.
./bin/release
bzip2 uses .bz2 as the file extension.
Diffstat (limited to 'test/mtime.c')
-rw-r--r-- | test/mtime.c | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/test/mtime.c b/test/mtime.c index 6f5327a..91d7400 100644 --- a/test/mtime.c +++ b/test/mtime.c @@ -101,7 +101,7 @@ main(void) hsize_t size[1] = {2}; time_t now; struct tm *tm; - H5G_stat_t sb; + H5G_stat_t sb1, sb2; char buf1[32], buf2[32]; H5Eset_auto(display_error_cb, NULL); @@ -118,21 +118,37 @@ main(void) if (H5Sclose(space)<0) return 1; if (H5Fclose(file)<0) return 1; - /* Open the file and get the modification time */ + /* + * Open the file and get the modification time. We'll test the new + * H5Gstat() arguments too: being able to stat something without knowing + * its name. + */ if ((file = H5Fopen(FILE_NAME_1, H5F_ACC_RDONLY, H5P_DEFAULT))<0) return 1; - if (H5Gstat(file, "dset", TRUE, &sb)<0) return 1; + if (H5Gstat(file, "dset", TRUE, &sb1)<0) return 1; + if ((dset=H5Dopen(file, "dset"))<0) return 1; + if (H5Gstat(dset, ".", TRUE, &sb2)<0) return 1; + if (H5Dclose(dset)<0) return 1; if (H5Fclose(file)<0) return 1; + /* Compare times from the two ways of calling H5Gstat() */ + if (sb1.objno[0]!=sb2.objno[0] || sb1.objno[1]!=sb2.objno[1] || + sb1.mtime!=sb2.mtime) { + puts("*FAILED*"); + puts(" Calling H5Gstat() with the dataset ID returned different"); + puts(" values than calling it with a file and dataset name."); + return 1; + } + /* Compare times -- they must be within 60 seconds of one another */ - if (0==sb.mtime) { + if (0==sb1.mtime) { puts("--SKIP--"); puts(" The modification time could not be decoded on this OS."); puts(" Modification times will be mantained in the file bug cannot"); puts(" be queried on this system. See H5O_mtime_decode()."); return 1; - } else if (fabs(HDdifftime(now, sb.mtime))>60.0) { + } else if (fabs(HDdifftime(now, sb1.mtime))>60.0) { puts("*FAILED*"); - tm = localtime(&(sb.mtime)); + tm = localtime(&(sb1.mtime)); strftime(buf1, sizeof buf1, "%Y-%m-%d %H:%M:%S", tm); tm = localtime(&now); strftime(buf2, sizeof buf2, "%Y-%m-%d %H:%M:%S", tm); |