[svn-r136] ./MANIFEST

./src/Makefile.in
	Added H5Ffamily.c and H5Fsplit.c

./src/H5B.c
./src/H5Bprivate.h
./src/H5Gnode.c
	Added `const' to sublass arguments.

./src/H5F.c
./src/H5Flow.c
./src/H5Fsec2.c
	Make sure file buffers get flushed during a call to
	H5Fflush().  Check for overflow in address encoding and decoding.

./src/H5Ffam.c
./src/H5Fprivate.c
./test/istore.c
	Implementation of file families so 32-bit machines can access
	64-bit files.

./src/H5Oprivate.h
	Removed H5O_NO_ADDR constant.

./config/freebsd2.2.1
./config/linux
	Added -DH5G_DEBUG and -DH5F_DEBUG to the list of debugging flags.

./html/H5.format.html
	Changed some <offset>-sized things to <length>-sized things.

./src/H5AC.c
./src/H5ACprivate.h
./src/H5B.c
./src/H5Bprivate.h
./src/H5C.c
./src/H5D.c
./src/H5F.c
./src/H5Fcore.c
./src/H5Fistore.c
./src/H5Flow.c
./src/H5Fprivate.h
./src/H5Fsec2.c
./src/H5Fstdio.c
./src/H5G.c
./src/H5Gent.c
./src/H5Gnode.c
./src/H5Gpkg.h
./src/H5Gprivate.h
./src/H5Gshad.c
./src/H5Gstab.c
./src/H5H.c
./src/H5Hprivate.h
./src/H5MF.c
./src/H5MFprivate.h
./src/H5O.c
./src/H5Ocont.c
./src/H5Oistore.c
./src/H5Oprivate.h
./src/H5Ostab.c
./src/H5Ostdst.c
./src/H5pivate.h
./src/debug.c
./test/istore.c
./test/theap.c
./test/tohdr.c
./test/tstab.c
	Lots of changes caused by generalizing addresses.  The haddr_t
	is now a struct, so you can no longer perform arithmetic on
	it. But since it's small, simple, and often used, storage is
	allocated like with an integer.  But we always pass them
	around by reference.  That is, when using an address in
	another struct, allocate space:

		struct my_struct {
		   char *name;
		   haddr_t address;
                } x;

	But when passing it to a function, pass by reference:

		H5F_addr_print (stderr, &(x.address));

	Addresses should be initialized with

		H5F_addr_undef (&(x.address));

	Functions for operating on addresses are in H5Flow.c and begin
	with H5F_addr_...  Functions never return haddr_t or haddr_t*;
	they always pass them through arguments instead. A function
	that returns an address through an argument does so with its
	last argument and it is marked with `/*out*/'.  Calls to such
	functions also mark output-only arguments with `/*out*/'

./src/H5Fsplit.c       (new)
	A two-member family where all meta data goes in the first
	member and all raw data goes in the second member.

./src/H5B.c
./src/H5D.c
./src/H5F.c
./src/H5Ffamily.c
./src/H5Fistore.c
./src/H5Flow.c
./src/H5Fprivate.h
./src/H5Fsec2.c
./src/H5Fstdio.c
./src/H5Gnode.c
./src/H5H.c
./src/H5MF.c
./src/H5MFprivate.h
./src/H5O.c
	Differentiate between meta data storage and raw data
	storage. Provide a mechanism so that the file driver can
	extend the file to allocate more memory.

./src/H5E.c
./src/H5Epublic.c
	Added the error H5E_TRUNCATED to be reported when the file is
	shorter than the length recorded in the boot block.

./src/H5F.c
	Added H5F_locate_signature() so we only do it in one place
	now.

./INSTALL
./INSTALL_MAINT
	Just a couple clarifications.

./html/ExternalFiles.html
./html/storage.html
	Documents how external files work.

./test/hyperslab.c
./test/istore.c
	Fixed printf's on 64-bit machines.

./test/istore.c
	Added ifdef's to test the split file driver.

1 files changed, 27 insertions, 15 deletions

diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h
index 884bc3c6..28710d9 100644
--- a/src/H5ACprivate.h
+++ b/src/H5ACprivate.h
@@ -24,6 +24,16 @@
 #include <H5Fprivate.h>
 
 /*
+ * Feature: Define H5AC_DEBUG on the compiler command line if you want to
+ *	    debug H5AC_protect() and H5AC_unprotect() by insuring that
+ *	    nothing  accesses protected objects.  NDEBUG must not be defined
+ *	    in order for this to have any effect.
+ */
+#ifdef NDEBUG
+#  undef H5AC_DEBUG
+#endif
+
+/*
  * Class methods pertaining to caching.  Each type of cached object will
  * have a constant variable with permanent life-span that describes how
  * to cache the object.  That variable will be of type H5AC_class_t and
@@ -48,9 +58,10 @@ typedef enum H5AC_subid_t {
 
 typedef struct H5AC_class_t {
    H5AC_subid_t	id;
-   void		*(*load)(H5F_t*, haddr_t addr, const void *udata1,
+   void		*(*load)(H5F_t*, const haddr_t *addr, const void *udata1,
 			 void *udata2);
-   herr_t	(*flush)(H5F_t*, hbool_t dest, haddr_t addr, void *thing);
+   herr_t	(*flush)(H5F_t*, hbool_t dest, const haddr_t *addr,
+			 void *thing);
 } H5AC_class_t;
 
 /*
@@ -59,7 +70,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) ((unsigned)(ADDR) % (F)->shared->cache->nslots)
+#define H5AC_HASH(F,ADDR_P) H5F_addr_hash(ADDR_P,(F)->shared->cache->nslots)
 
 typedef struct H5AC_prot_t {
    const H5AC_class_t *type;	/*type of protected thing		*/
@@ -92,27 +103,28 @@ typedef struct H5AC_t {
  * Library prototypes.
  */
 herr_t H5AC_dest (H5F_t *f);
-void *H5AC_find_f (H5F_t *f, const H5AC_class_t *type, haddr_t addr,
+void *H5AC_find_f (H5F_t *f, const H5AC_class_t *type, const haddr_t *addr,
 		   const void *udata1, void *udata2);
-void * H5AC_protect (H5F_t *f, const H5AC_class_t *type, haddr_t addr,
+void * H5AC_protect (H5F_t *f, const H5AC_class_t *type, const haddr_t *addr,
 		     const void *udata1, void *udata2);
-herr_t H5AC_unprotect (H5F_t *f, const H5AC_class_t *type, haddr_t addr,
+herr_t H5AC_unprotect (H5F_t *f, const H5AC_class_t *type, const haddr_t *addr,
 		       void *thing);
-herr_t H5AC_flush (H5F_t *f, const H5AC_class_t *type, haddr_t addr,
+herr_t H5AC_flush (H5F_t *f, const H5AC_class_t *type, const haddr_t *addr,
 		   hbool_t destroy);
 herr_t H5AC_new (H5F_t *f, intn size_hint);
-herr_t H5AC_rename (H5F_t *f, const H5AC_class_t *type, haddr_t old,
-		    haddr_t new);
-herr_t H5AC_set (H5F_t *f, const H5AC_class_t *type, haddr_t addr,
+herr_t H5AC_rename (H5F_t *f, const H5AC_class_t *type,
+		    const haddr_t *old_addr, const haddr_t *new_addr);
+herr_t H5AC_set (H5F_t *f, const H5AC_class_t *type, const haddr_t *addr,
 		 void *thing);
 herr_t H5AC_debug (H5F_t *f);
 
-#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)) ?	      \
+#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)) ?						      \
     ((F)->shared->cache->diagnostics[(TYPE)->id].nhits++,		      \
-     (F)->shared->cache->slot[H5AC_HASH(F,ADDR)].thing) :		      \
-    H5AC_find_f (F, TYPE, ADDR, UDATA1, UDATA2))
+     (F)->shared->cache->slot[H5AC_HASH(F,ADDR_P)].thing) :		      \
+    H5AC_find_f (F, TYPE, ADDR_P, UDATA1, UDATA2))
       
 
 #endif /* !_H5ACprivate_H */