diff options
author | Robb Matzke <matzke@llnl.gov> | 1998-03-30 19:24:08 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1998-03-30 19:24:08 (GMT) |
commit | 78c1574378256975b39d4b65a011307a631dc667 (patch) | |
tree | 84e0dc9edf12a69a405c0d9da02803f2cc291382 /src/H5Fprivate.h | |
parent | 2d9f2282e6e639dc5a7881c5c55c3f56d43526b1 (diff) | |
download | hdf5-78c1574378256975b39d4b65a011307a631dc667.zip hdf5-78c1574378256975b39d4b65a011307a631dc667.tar.gz hdf5-78c1574378256975b39d4b65a011307a631dc667.tar.bz2 |
[svn-r333] Changes since 19980324
----------------------
./MANIFEST
./src/H5HG.c [new]
./src/H5HGprivate.h [new]
./src/H5HGpublic.h [new]
./src/Makefile.in
Added global heaps, H5HG. This compiles but is untested.
./src/H5D.c
./src/H5G.c
./src/H5Gnode.c
./src/H5Gstab.c
./src/H5HL.c [renamed from H5H.c]
./src/H5HLprivate.h [renamed from H5Hprivate.h]
./src/H5HLpublic.h [renamed from H5Hpublic.h]
./src/H5Oefl.c
./src/Makefile.in
./src/hdf5.h
./test/theap.c
Renamed local heaps from H5H to H5HL.
./src/H5AC.c
./src/H5ACprivate.h
./src/debug.c
Added debugging support for global heap collections.
./html/H5.format.html
Ripped out the old small object heap documentation and added
documentation for the new global heap.
./html/H5.api.html
./src/H5P.c
./src/H5Ppublic.h
./src/H5F.c
./src/H5Fprivate.h
./src/H5private.h
The H5Pget_version() function no longer returns a small object
heap version number. Instead, each collection of the global
heap has its own version number instead of a single number in
the file boot block.
./bin/release
Omit files marked for removal by CVS even though the removal
hasn't been committed yet.
./test/iopipe.c
Removed warnings about casting unsigned int to double on Irix64.
./MANIFEST
Removed ./test/testpar/phdf5sup.c
Diffstat (limited to 'src/H5Fprivate.h')
-rw-r--r-- | src/H5Fprivate.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h index 9b7192a..c4e1fc0 100644 --- a/src/H5Fprivate.h +++ b/src/H5Fprivate.h @@ -229,7 +229,6 @@ typedef struct H5F_create_t { size_t sizeof_addr; /* Number of bytes in an address */ size_t sizeof_size; /* Number of bytes for obj sizes */ intn bootblock_ver; /* Version # of the bootblock */ - intn smallobject_ver;/* Version # of the small-object heap */ intn freespace_ver; /* Version # of the free-space information*/ intn objectdir_ver; /* Version # of the object directory format*/ intn sharedheader_ver;/* Version # of the shared header format */ @@ -398,13 +397,14 @@ typedef struct H5F_file_t { uint32 consist_flags; /* File Consistency Flags */ haddr_t boot_addr; /* Absolute address of boot block */ haddr_t base_addr; /* Absolute base address for rel.addrs. */ - haddr_t smallobj_addr; /* Relative address of small-obj heap */ haddr_t freespace_addr; /* Relative address of free-space info */ haddr_t hdf5_eof; /* Relative addr of end of all hdf5 data*/ struct H5AC_t *cache; /* The object cache */ H5F_create_t create_parms; /* File-creation property list */ H5F_access_t access_parms; /* File-access property list */ struct H5G_t *root_grp; /* Open root group */ + intn ncwfs; /* Num entries on cwfs list */ + struct H5HG_heap_t **cwfs; /* Global heap cache */ } H5F_file_t; /* |