diff options
author | Robb Matzke <matzke@llnl.gov> | 1999-07-28 18:25:43 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1999-07-28 18:25:43 (GMT) |
commit | e4834c43ce6528308ebd5375bd4c7a0df88af427 (patch) | |
tree | 0039040d95cc92fdb197b2902436e32a020a7b6f /src/H5ACprivate.h | |
parent | 139688863f191366fe27fbab9654a52285e63c11 (diff) | |
download | hdf5-e4834c43ce6528308ebd5375bd4c7a0df88af427.zip hdf5-e4834c43ce6528308ebd5375bd4c7a0df88af427.tar.gz hdf5-e4834c43ce6528308ebd5375bd4c7a0df88af427.tar.bz2 |
[svn-r1548] Changes since 19990727
----------------------
./src/H5.c [1.3]
./src/H5AC.c [1.3]
./src/H5ACprivate.h [1.3]
./src/H5B.c [1.3]
./src/H5Bprivate.h [1.3]
./src/H5D.c [1.3]
./src/H5F.c [1.3]
./src/H5Farray.c [1.3]
./src/H5Fcore.c [1.3]
./src/H5Ffamily.c [1.3]
./src/H5Fistore.c [1.3]
./src/H5Flow.c [1.3]
./src/H5Fmpio.c [1.3]
./src/H5Fprivate.h [1.3]
./src/H5Fsec2.c [1.3]
./src/H5Fsplit.c [1.3]
./src/H5Fstdio.c [1.3]
./src/H5G.c [1.3]
./src/H5Gent.c [1.3]
./src/H5Gnode.c [1.3]
./src/H5Gprivate.h [1.3]
./src/H5Gstab.c [1.3]
./src/H5HG.c [1.3]
./src/H5HGprivate.h [1.3]
./src/H5HL.c [1.3]
./src/H5HLprivate.h [1.3]
./src/H5MF.c [1.3]
./src/H5MFprivate.h [1.3]
./src/H5O.c [1.3]
./src/H5Oattr.c [1.3]
./src/H5Ocont.c [1.3]
./src/H5Odtype.c [1.3]
./src/H5Oefl.c [1.3]
./src/H5Olayout.c [1.3]
./src/H5Oprivate.h [1.3]
./src/H5Oshared.c [1.3]
./src/H5Ostab.c [1.3]
./src/H5P.c [1.3]
./src/H5R.c [1.3]
./src/H5Smpio.c [1.3]
./src/H5T.c [1.3]
./src/H5Tvlen.c [1.3]
./src/H5private.h [1.3]
./test/dtypes.c [1.3]
./test/gheap.c [1.3]
./test/istore.c [1.3]
./test/lheap.c [1.3]
./test/ohdr.c [1.3]
./tools/h5debug.c [1.3]
File addresses (the `haddr_t' type) are passed by value
instead of by reference. The type is no longer a struct. This
is one of the preliminary changes needed for the Virtual File
Layer stuff.
./src/H5Fprivate.h [1.3]
./src/H5Flow.c [1.3]
Some address functions were rewritten as macros.
Diffstat (limited to 'src/H5ACprivate.h')
-rw-r--r-- | src/H5ACprivate.h | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h index 3a911a7..17d9e06 100644 --- a/src/H5ACprivate.h +++ b/src/H5ACprivate.h @@ -60,10 +60,10 @@ typedef enum H5AC_subid_t { typedef struct H5AC_class_t { H5AC_subid_t id; - void *(*load)(H5F_t *, const haddr_t *addr, - const void *udata1, void *udata2); - herr_t (*flush)(H5F_t *, hbool_t dest, - const haddr_t *addr, void *thing); + void *(*load)(H5F_t*, haddr_t addr, const void *udata1, + void *udata2); + herr_t (*flush)(H5F_t*, hbool_t dest, haddr_t addr, + void *thing); } H5AC_class_t; /* @@ -72,7 +72,7 @@ typedef struct H5AC_class_t { * own cache, an array of slots. */ #define H5AC_NSLOTS 10330 /*prime number tend to work best */ -#define H5AC_HASH(F,ADDR_P) H5F_addr_hash(ADDR_P,(F)->shared->cache->nslots) +#define H5AC_HASH(F,ADDR) H5F_addr_hash(ADDR,(F)->shared->cache->nslots) typedef struct H5AC_prot_t { const H5AC_class_t *type; /*type of protected thing */ @@ -107,29 +107,26 @@ typedef struct H5AC_t { * Library prototypes. */ __DLL__ herr_t H5AC_dest(H5F_t *f); -__DLL__ void *H5AC_find_f(H5F_t *f, const H5AC_class_t *type, - const haddr_t *addr, const void *udata1, - void *udata2); -__DLL__ void *H5AC_protect(H5F_t *f, const H5AC_class_t *type, - const haddr_t *addr, const void *udata1, - void *udata2); -__DLL__ herr_t H5AC_unprotect(H5F_t *f, const H5AC_class_t *type, - const haddr_t *addr, void *thing); -__DLL__ herr_t H5AC_flush(H5F_t *f, const H5AC_class_t *type, - const haddr_t *addr, hbool_t destroy); +__DLL__ void *H5AC_find_f(H5F_t *f, const H5AC_class_t *type, haddr_t addr, + const void *udata1, void *udata2); +__DLL__ void *H5AC_protect(H5F_t *f, const H5AC_class_t *type, haddr_t addr, + const void *udata1, void *udata2); +__DLL__ herr_t H5AC_unprotect(H5F_t *f, const H5AC_class_t *type, haddr_t addr, + void *thing); +__DLL__ herr_t H5AC_flush(H5F_t *f, const H5AC_class_t *type, haddr_t addr, + hbool_t destroy); __DLL__ herr_t H5AC_create(H5F_t *f, intn size_hint); __DLL__ herr_t H5AC_rename(H5F_t *f, const H5AC_class_t *type, - const haddr_t *old_addr, const haddr_t *new_addr); -__DLL__ herr_t H5AC_set(H5F_t *f, const H5AC_class_t *type, - const haddr_t *addr, void *thing); + haddr_t old_addr, haddr_t new_addr); +__DLL__ herr_t H5AC_set(H5F_t *f, const H5AC_class_t *type, haddr_t addr, + void *thing); __DLL__ herr_t H5AC_debug(H5F_t *f); -#define H5AC_find(F,TYPE,ADDR_P,UDATA1,UDATA2) \ - (((F)->shared->cache->slot[H5AC_HASH(F,ADDR_P)].type==(TYPE) && \ - H5F_addr_eq (&((F)->shared->cache->slot[H5AC_HASH(F,ADDR_P)].addr), \ - ADDR_P)) ? \ +#define H5AC_find(F,TYPE,ADDR,UDATA1,UDATA2) \ + (((F)->shared->cache->slot[H5AC_HASH(F,ADDR)].type==(TYPE) && \ + (F)->shared->cache->slot[H5AC_HASH(F,ADDR)].addr==ADDR) ? \ ((F)->shared->cache->diagnostics[(TYPE)->id].nhits++, \ - (F)->shared->cache->slot[H5AC_HASH(F,ADDR_P)].thing) : \ - H5AC_find_f (F, TYPE, ADDR_P, UDATA1, UDATA2)) + (F)->shared->cache->slot[H5AC_HASH(F,ADDR)].thing) : \ + H5AC_find_f(F, TYPE, ADDR, UDATA1, UDATA2)) #endif /* !_H5ACprivate_H */ |