diff options
author | Robb Matzke <matzke@llnl.gov> | 1999-02-20 16:18:51 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1999-02-20 16:18:51 (GMT) |
commit | e2e5476fa5449ec941ff19f07bada9725431688f (patch) | |
tree | 33f6af7c15322663582c4a736dc0e9b087f38530 /src/H5Ipublic.h | |
parent | 35a62b068bc6b124004d331c3e949d571682417a (diff) | |
download | hdf5-e2e5476fa5449ec941ff19f07bada9725431688f.zip hdf5-e2e5476fa5449ec941ff19f07bada9725431688f.tar.gz hdf5-e2e5476fa5449ec941ff19f07bada9725431688f.tar.bz2 |
[svn-r1087] Changes since 19990218
----------------------
./src/H5F.c
./src/H5private.h
./src/H5Ipublic.h
./src/H5O.c
Fixed a rather nasty bug with file closing that caused the
file boot block to be updated incorrectly, effectively
truncating the file. The bug I fixed was triggered by:
1. Create a file, F
2. Open an object, X
3. Close file F
4. Reopen file F for read/write.
5. Create and close some objects
6. Close file F
7. Close library (exit).
Step 3 pended the close because object X is still open, but
the file ID was removed from the H5I_FILE ID group. Step 4
created a new file because it didn't see any matching file on
the H5I_FILE ID group. Step 5 extends the file. Step 6 writes
the new file boot block to disk. Step 7 closes object X and
completes the close from step 3, writing the old boot block
information to disk.
The new behavior is that step 3 moves the file from the
H5I_FILE group to the H5I_FILE_CLOSING group. Step 4 searches
both groups and finds the file. Step 5 extends the file using
the same H5F_file_t struct as step 3. Step 6 closes the H5F_t
struct opened in step 3 but not the H5F_file_t struct shared
by steps 1 and 3. Step 7 closes object X which closes the
H5F_file_t from step 1, flushing the boot block which was
shared by all steps.
./src/H5F.c
Added some bulletproofing to file reference counting and
removed comments which no longer apply. Added H5F_flush_all()
and H5F_close_all() which apply to all files.
./src/H5A.c
./src/H5D.c
./src/H5F.c
./src/H5G.c
./src/H5I.c
./src/H5Iprivate.h
./src/H5R.c
./src/H5RA.c
./src/H5S.c
./src/H5T.c
Added the new H5I_free_t data type to describe the function
type to be passed as the `free_func' argument to
H5I_init_group().
./src/H5I.c
Bulletproofed the object removal functions. Removed comments
which no longer apply. Changed global variable names so they
don't violate the naming scheme. Added H5I_debug() that prints
the contents of an ID group. Removed H5I_inc_ref() because it
isn't used. Reindented a couple of functions.
./src/H5.c
./src/H5G.c
./src/H5Ipublic.h
Changed H5I_MAXID to H5I_NGROUPS to better relect the fact
that it's the total number of valid ID groups.
./src/H5Shyper.c
Changed hyperslab offset arrays to signed quantities to get
rid of warnings on DEC cluster.
./src/H5Flow.c
./src/H5Fprivate.h
Changed the objno argument of H5F_addr_pack() to be unsigned
to get rid of warnings on DEC cluster.
Diffstat (limited to 'src/H5Ipublic.h')
-rw-r--r-- | src/H5Ipublic.h | 65 |
1 files changed, 34 insertions, 31 deletions
diff --git a/src/H5Ipublic.h b/src/H5Ipublic.h index 03b2717..2ae5640 100644 --- a/src/H5Ipublic.h +++ b/src/H5Ipublic.h @@ -1,13 +1,13 @@ /**************************************************************************** - * NCSA HDF * - * Software Development Group * - * National Center for Supercomputing Applications * - * University of Illinois at Urbana-Champaign * - * 605 E. Springfield, Champaign IL 61820 * - * * - * For conditions of distribution and use, see the accompanying * - * hdf/COPYING file. * - * * + * NCSA HDF * + * Software Development Group * + * National Center for Supercomputing Applications * + * University of Illinois at Urbana-Champaign * + * 605 E. Springfield, Champaign IL 61820 * + * * + * For conditions of distribution and use, see the accompanying * + * hdf/COPYING file. * + * * ****************************************************************************/ /* @@ -22,32 +22,35 @@ /* * Group values allowed. Start with `1' instead of `0' because it makes the - * tracing output look better when hid_t values are large numbers. + * tracing output look better when hid_t values are large numbers. Change the + * GROUP_BITS in H5I.c if the MAXID gets larger than 32 (an assertion will + * fail otherwise). */ typedef enum { - H5I_BADID = (-1),/*invalid Group */ - H5I_FILE = 1, /*group ID for File objects */ - H5I_TEMPLATE_0, /*group ID for Template objects */ - H5I_TEMPLATE_1, /*group ID for Template objects */ - H5I_TEMPLATE_2, /*group ID for Template objects */ - H5I_TEMPLATE_3, /*group ID for Template objects */ - H5I_TEMPLATE_4, /*group ID for Template objects */ - H5I_TEMPLATE_5, /*group ID for Template objects */ - H5I_TEMPLATE_6, /*group ID for Template objects */ - H5I_TEMPLATE_7, /*group ID for Template objects */ + H5I_BADID = (-1), /*invalid Group */ + H5I_FILE = 1, /*group ID for File objects */ + H5I_FILE_CLOSING, /*files pending close due to open objhdrs */ + H5I_TEMPLATE_0, /*group ID for Template objects */ + H5I_TEMPLATE_1, /*group ID for Template objects */ + H5I_TEMPLATE_2, /*group ID for Template objects */ + H5I_TEMPLATE_3, /*group ID for Template objects */ + H5I_TEMPLATE_4, /*group ID for Template objects */ + H5I_TEMPLATE_5, /*group ID for Template objects */ + H5I_TEMPLATE_6, /*group ID for Template objects */ + H5I_TEMPLATE_7, /*group ID for Template objects */ #ifndef NDEBUG - H5I_TEMPLATE_MAX, /*not really a group ID */ + H5I_TEMPLATE_MAX, /*not really a group ID */ #endif - H5I_GROUP, /*group ID for Group objects */ - H5I_DATATYPE, /*group ID for Datatype objects */ - H5I_DATASPACE, /*group ID for Dataspace objects */ - H5I_DATASET, /*group ID for Dataset objects */ - H5I_ATTR, /*group ID for Attribute objects */ - H5I_TEMPBUF, /*group ID for Temporary buffer objects */ - H5I_RAGGED, /*group ID for Ragged array objects */ - H5I_REFERENCE, /*group ID for Reference objects */ - H5I_MAXID /*highest group in group_t (Invalid as true group)*/ - /* Change the GROUP_BITS in H5I.c if the MAXID gets larger than 32 */ + H5I_GROUP, /*group ID for Group objects */ + H5I_DATATYPE, /*group ID for Datatype objects */ + H5I_DATASPACE, /*group ID for Dataspace objects */ + H5I_DATASET, /*group ID for Dataset objects */ + H5I_ATTR, /*group ID for Attribute objects */ + H5I_TEMPBUF, /*group ID for Temporary buffer objects */ + H5I_RAGGED, /*group ID for Ragged array objects */ + H5I_REFERENCE, /*group ID for Reference objects */ + + H5I_NGROUPS /*number of valid groups, MUST BE LAST! */ } H5I_type_t; /* Type of atoms to return to users */ |