summaryrefslogtreecommitdiffstats
path: root/test/tohdr.c
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1998-01-07 17:14:26 (GMT)
committerRobb Matzke <matzke@llnl.gov>1998-01-07 17:14:26 (GMT)
commit159fa7a232e1961940b83f035f4c27338d26337e (patch)
treeb7344e9cfaadbbec3bc3a0576df8c264debb8239 /test/tohdr.c
parent1d17defdfc977c063c7ff20b5868bef9a76e5d9a (diff)
downloadhdf5-159fa7a232e1961940b83f035f4c27338d26337e.zip
hdf5-159fa7a232e1961940b83f035f4c27338d26337e.tar.gz
hdf5-159fa7a232e1961940b83f035f4c27338d26337e.tar.bz2
[svn-r151] Changes since 19980105
---------------------- ./config/freebsd2.2.1 ./config/linux Added -UH5O_DEBUG to the debug flags. Turn this on to get lots of lines on stderr to show what objects are opened and closed. ./src/H5C.o ./src/H5Cpublic.h ./test/dsets.c ./test/tfile.c Split H5Cget_prop() and H5Cset_prop() into functions for each property. ./src/H5D.c ./src/H5Dpublic.h ./src/H5Gstab.c ./src/H5O.c ./src/H5Ocont.c ./src/H5Ocstore.c ./src/H5Odtype.c ./src/H5Oefl.c ./src/H5Oistore.c ./src/H5Oname.c ./src/H5Onull.c ./src/H5Oprivate.h ./src/H5Osdspace.c ./src/H5Ostab.c ./src/H5P.c ./src/istore.c ./test/tohdr.c Object header functions now understand constant vs. non-constant messages. ./src/H5F.c ./src/H5Fprivate.h The file OID can be closed before other OID's. ./src/H5Flow.c H5F_addr_defined() is a macro in this file. ./src/H5G.c ./src/H5Gpublic.h ./test/tstab.c A current working group cannot be deleted. ./src/H5Gent.c ./src/H5Gpkg.h Removed unused functionality. ./src/H5public.h Includes <sys/types.h> for size_t.
Diffstat (limited to 'test/tohdr.c')
-rw-r--r--test/tohdr.c37
1 files changed, 13 insertions, 24 deletions
diff --git a/test/tohdr.c b/test/tohdr.c
index 9965092..dd65eff 100644
--- a/test/tohdr.c
+++ b/test/tohdr.c
@@ -74,11 +74,11 @@ test_ohdr (void)
MESSAGE (8, ("Creating new message...\n"));
stab.btree_addr.offset = 11111111;
stab.heap_addr.offset = 22222222;
- status = H5O_modify (f, &oh_ent, H5O_STAB, H5O_NEW_MESG, &stab);
+ status = H5O_modify (&oh_ent, H5O_STAB, H5O_NEW_MESG, 0, &stab);
VERIFY (status, 0, "H5O_modify");
H5AC_flush (f, NULL, 0, TRUE);
- ptr = H5O_read (f, &oh_ent, H5O_STAB, 0, &ro);
+ ptr = H5O_read (&oh_ent, H5O_STAB, 0, &ro);
CHECK_PTR (ptr, "H5O_read");
VERIFY (ptr, &ro, "H5O_read");
VERIFY (ro.btree_addr.offset, stab.btree_addr.offset, "H5O_read");
@@ -90,11 +90,11 @@ test_ohdr (void)
MESSAGE (8, ("Modifying message...\n"));
stab.btree_addr.offset = 33333333;
stab.heap_addr.offset = 44444444;
- status = H5O_modify (f, &oh_ent, H5O_STAB, 0, &stab);
+ status = H5O_modify (&oh_ent, H5O_STAB, 0, 0, &stab);
VERIFY (status, 0, "H5O_modify");
H5AC_flush (f, NULL, 0, TRUE);
- ptr = H5O_read (f, &oh_ent, H5O_STAB, 0, &ro);
+ ptr = H5O_read (&oh_ent, H5O_STAB, 0, &ro);
CHECK_PTR (ptr, "H5O_read");
VERIFY (ptr, &ro, "H5O_read");
VERIFY (ro.btree_addr.offset, stab.btree_addr.offset, "H5O_read");
@@ -107,17 +107,11 @@ test_ohdr (void)
MESSAGE (8, ("Creating a duplicate message...\n"));
stab.btree_addr.offset = 55555555;
stab.heap_addr.offset = 66666666;
- status = H5O_modify (f, &oh_ent, H5O_STAB, H5O_NEW_MESG, &stab);
+ status = H5O_modify (&oh_ent, H5O_STAB, H5O_NEW_MESG, 0, &stab);
VERIFY (status, 1, "H5O_modify");
- VERIFY (oh_ent.dirty, TRUE, "H5O_modify");
- VERIFY (oh_ent.type, H5G_CACHED_STAB, "H5O_modify");
- VERIFY (oh_ent.cache.stab.heap_addr.offset, stab.heap_addr.offset,
- "H5O_modify");
- VERIFY (oh_ent.cache.stab.btree_addr.offset, stab.btree_addr.offset,
- "H5O_modify");
H5AC_flush (f, NULL, 0, TRUE);
- ptr = H5O_read (f, &oh_ent, H5O_STAB, 1, &ro);
+ ptr = H5O_read (&oh_ent, H5O_STAB, 1, &ro);
CHECK_PTR (ptr, "H5O_read");
VERIFY (ptr, &ro, "H5O_read");
VERIFY (ro.btree_addr.offset, stab.btree_addr.offset, "H5O_read");
@@ -129,17 +123,11 @@ test_ohdr (void)
MESSAGE (8, ("Modifying the duplicate message...\n"));
stab.btree_addr.offset = 77777777;
stab.heap_addr.offset = 88888888;
- status = H5O_modify (f, &oh_ent, H5O_STAB, 1, &stab);
+ status = H5O_modify (&oh_ent, H5O_STAB, 1, 0, &stab);
VERIFY (status, 1, "H5O_modify");
- VERIFY (oh_ent.dirty, TRUE, "H5O_modify");
- VERIFY (oh_ent.type, H5G_CACHED_STAB, "H5O_modify");
- VERIFY (oh_ent.cache.stab.heap_addr.offset, stab.heap_addr.offset,
- "H5O_modify");
- VERIFY (oh_ent.cache.stab.btree_addr.offset, stab.btree_addr.offset,
- "H5O_modify");
H5AC_flush (f, NULL, 0, TRUE);
- ptr = H5O_read (f, &oh_ent, H5O_STAB, 1, &ro);
+ ptr = H5O_read (&oh_ent, H5O_STAB, 1, &ro);
CHECK_PTR (ptr, "H5O_read");
VERIFY (ptr, &ro, "H5O_read");
VERIFY (ro.btree_addr.offset, stab.btree_addr.offset, "H5O_read");
@@ -153,7 +141,7 @@ test_ohdr (void)
for (i=0; i<40; i++) {
stab.btree_addr.offset = (i+1)*1000 + 1;
stab.heap_addr.offset = (i+1)*1000 + 2;
- status = H5O_modify (f, &oh_ent, H5O_STAB, H5O_NEW_MESG, &stab);
+ status = H5O_modify (&oh_ent, H5O_STAB, H5O_NEW_MESG, 0, &stab);
VERIFY (status, 2+i, "H5O_modify");
}
H5AC_flush (f, NULL, 0, TRUE);
@@ -166,7 +154,7 @@ test_ohdr (void)
for (i=0; i<10; i++) {
stab.btree_addr.offset = (i+1)*1000 + 10;
stab.heap_addr.offset = (i+1)*1000 + 20;
- status = H5O_modify (f, &oh_ent, H5O_STAB, H5O_NEW_MESG, &stab);
+ status = H5O_modify (&oh_ent, H5O_STAB, H5O_NEW_MESG, 0, &stab);
VERIFY (status, 42+i, "H5O_modify");
H5AC_flush (f, NULL, 0, TRUE);
}
@@ -174,9 +162,10 @@ test_ohdr (void)
/*
* Delete all symbol table messages.
*/
- status = H5O_remove (f, &oh_ent, H5O_STAB, H5O_ALL);
+ status = H5O_remove (&oh_ent, H5O_STAB, H5O_ALL);
CHECK_I (status, "H5O_remove");
- /* close the file */
+ /* release resources */
+ H5O_close (&oh_ent);
H5Fclose (fid);
}