diff options
author | Robb Matzke <matzke@llnl.gov> | 1997-10-20 23:14:35 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1997-10-20 23:14:35 (GMT) |
commit | 56ad55117a89a423a9341d2f0c3912d4ad57ec6f (patch) | |
tree | dff0bada659180ac324d81a4d97f7bfb884f0ed6 /src/H5Bprivate.h | |
parent | dc4961d072249ddf39a7db7a945ea627c276d025 (diff) | |
download | hdf5-56ad55117a89a423a9341d2f0c3912d4ad57ec6f.zip hdf5-56ad55117a89a423a9341d2f0c3912d4ad57ec6f.tar.gz hdf5-56ad55117a89a423a9341d2f0c3912d4ad57ec6f.tar.bz2 |
[svn-r129] Changes since 19970916
----------------------
./config/depend.in
Fixed backslashes in sed script because the H5Gnode.c
dependency info was disappearing. You'll have to rerun
config.status to rebuild the Makefiles unless you use gnu
make.
./config/conclude.in
Also removes emacs backup files, TAGS, and svf backup files.
./config/linux
Grouped gcc flags and added provisions for debugging vs. production.
./html/H5.format.html
Updated messages 0x0008, 0x0009, and 0x000A.
./html/storage.html
Documentation describing storage schemes.
./src/Makefile.in
./test/Makefile.in
New source files.
./src/H5A.c
./src/H5Apublic.h
./src/H5C.c
Changed VOIDP to void* in a couple places.
./src/H5AC.c
./src/H5ACprivate.h
./src/H5B.c
./src/H5Bprivate.h
./src/H5G.c
./src/H5Gnode.c
./src/H5Gprivate.h
./src/H5H.c
./src/H5O.c
Removed `const' from some variables because H5G_node_found() wanted
to modify it's udata argument. Removing const there caused it
to cascade to these other locations.
./src/H5AC.c
./src/H5ACprivate.h
./src/H5B.c
./src/H5Gnode.c
./src/H5Gstab.c
./src/H5H.c
./src/H5O.c
Added an extra argument to H5AC_find_f() and H5AC_protect(). This
arg gets passed to the load() method. Also added an extra
argument to the H5AC_find() macro.
./src/H5B.c
./src/H5Bprivate.h
./src/H5Gnode.c
Extra argument passed to the sizeof_rkey() method.
./src/H5Fprivate.c
./src/H5Fistore.c (new)
Added indexed I/O operations.
./src/H5G.c
./src/H5Gnode.c
./src/H5Gprivate.h
Beginning to add H5G_open/close and related bug fixes.
./src/H5Oprivate.h
./src/H5Oistore.c (new)
Added the H5O_ISTORE messsage (0x0008) for indexed storage of
objects.
./src/H5private.h
Added extra braces around both sides of the FUNC_ENTER() and
FUNC_LEAVE() macros so FUNC_ENTER() can appear before
declarations or after executable statements the second case is
used by H5G_namei() to initialize output arguments to sane
values before FUNC_ENTER() might return failure.
int f ()
{
int decl1;
printf ("This happens before FUNC_ENTER()\n");
FUNC_ENTER (...);
int another_declaration;
./src/H5B.c
./src/H5Bprivate.h
./src/H5Gnode.c
Extra arguments for key encoding and decoding.
./src/H5E.c
./src/H5Epublic.h
./src/H5Fistore.c
./src/H5Oistore.c
./src/H5Oprivate.h
Indexed, chunked, sparse storage (not ready for general consumption
yet).
./src/H5V.c (new)
./src/H5Vprivate.h (new)
./test/hyperslab.c (new)
Vector, array, and hyperslab functions.
./src/H5B.c
./src/H5Bprivate.h
./src/H5Fistore.c
./src/H5Gnode.c
./src/H5V.c
./src/H5Vprivate.h
./test/hyperslab.c
Added functionality for indexed storage.
./src/H5F.c
Fixed problems with seek optimizing. Recommend we disable it
until we can implement it in the file/address class since all
of HDF5 must be aware of it.
./src/H5O.c
Fixed comeent speling erorr :-)
./MANIFEST
Added new files.
./config/conclude.in
Added the word `Testing' to the test cases. So if a test
program is called hyperslab then the make output will contain
the line `Testing hyperslab'.
./config/linux
The default file I/O library is Posix section 2 on my linux
machine so I can do some I/O performance testing.
./src/H5C.c
./src/H5Cprivate.h
./src/H5Cpublic.h
Added ability to set size of indexed-storage B-tree.
./src/H5D.c
./src/H5E.c
./src/H5Epublic.h
./src/H5F.c
./src/H5Fprivate.h
./src/H5G.c
./src/H5Gnode.c
./src/H5Gpkg.h
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5Gshad.c
./src/H5Gstab.c
./test/stab.c
Changed `directory' to `group' in numerous places.
./src/H5private.h
The FILELIB constant can be set on the compile command-line.
./src/istore.c NEW
Tests for indexed storage.
Diffstat (limited to 'src/H5Bprivate.h')
-rw-r--r-- | src/H5Bprivate.h | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/src/H5Bprivate.h b/src/H5Bprivate.h index 7814eeb..05e2e56 100644 --- a/src/H5Bprivate.h +++ b/src/H5Bprivate.h @@ -33,11 +33,17 @@ #define H5B_K(F,TYPE) /*K value given file and Btree subclass */ \ ((F)->shared->file_create_parms.btree_k[(TYPE)->id]) -#define H5B_ANCHOR_LT 0 /* left node is anchored, right is new */ -#define H5B_ANCHOR_RT 1 /* right node is anchored, left is new */ +typedef enum H5B_ins_t { + H5B_INS_ERROR =-1, /*error return value */ + H5B_INS_NOOP =0, /*insert made no changes */ + H5B_INS_LEFT =1, /*insert new node to left of cur node */ + H5B_INS_RIGHT =2, /*insert new node to right of cur node */ + H5B_INS_CHANGE =3 /*change child address for cur node */ +} H5B_ins_t; typedef enum H5B_subid_t { - H5B_SNODE_ID =0 /*B-tree is for symbol table nodes */ + H5B_SNODE_ID =0, /*B-tree is for symbol table nodes */ + H5B_ISTORE_ID =1 /*B-tree is for indexed object storage */ } H5B_subid_t; @@ -48,18 +54,21 @@ typedef enum H5B_subid_t { * has an array of K values indexed by the `id' class field below. The * array is initialized with the HDF5_BTREE_K_DEFAULT macro. */ +struct H5B_t; /*forward decl*/ typedef struct H5B_class_t { H5B_subid_t id; /*id as found in file */ size_t sizeof_nkey; /*size of native (memory) key */ - size_t (*get_sizeof_rkey)(H5F_t*); - haddr_t (*new)(H5F_t*,void*,void*,void*); - intn (*cmp)(H5F_t*,void*,void*,void*); + size_t (*get_sizeof_rkey)(H5F_t*,const void*);/*raw key size */ + haddr_t (*new)(H5F_t*,void*,void*,void*); /*create new leaf */ + intn (*cmp)(H5F_t*,void*,void*,void*); /*compare keys */ herr_t (*found)(H5F_t*,haddr_t,const void*,void*,const void*); - haddr_t (*insert)(H5F_t*,haddr_t,int*,void*,hbool_t*,void*,void*, - void*,hbool_t*); - herr_t (*list)(H5F_t*,haddr_t,void*); - herr_t (*decode)(H5F_t*,uint8*,void*); - herr_t (*encode)(H5F_t*,uint8*,void*); + haddr_t (*insert)(H5F_t*,haddr_t,H5B_ins_t*,void*,hbool_t*,void*,void*, + void*,hbool_t*); /*insert new data */ + hbool_t follow_min; /*min insert uses min leaf, not new() */ + hbool_t follow_max; /*max insert uses max leaf, not new() */ + herr_t (*list)(H5F_t*,haddr_t,void*); /*traverse leaf nodes */ + herr_t (*decode)(H5F_t*,struct H5B_t*,uint8*,void*); + herr_t (*encode)(H5F_t*,struct H5B_t*,uint8*,void*); } H5B_class_t; /* @@ -91,8 +100,8 @@ typedef struct H5B_t { * Library prototypes. */ herr_t H5B_debug (H5F_t *f, haddr_t addr, FILE *stream, intn indent, - intn fwidth, H5B_class_t *type); -haddr_t H5B_new (H5F_t *f, const H5B_class_t *type); + intn fwidth, H5B_class_t *type, void *udata); +haddr_t H5B_new (H5F_t *f, const H5B_class_t *type, void *udata); herr_t H5B_find (H5F_t *f, H5B_class_t *type, haddr_t addr, void *udata); haddr_t H5B_insert (H5F_t *f, H5B_class_t *type, haddr_t addr, void *udata); herr_t H5B_list (H5F_t *f, H5B_class_t *type, haddr_t addr, void *udata); |