[svn-r12592] Description:

    Several changes, all mooshed together:
        - Add support for "tiny" objects - which can be stored in the heap
            ID itself, instead of in the heap data blocks.
        - Flesh out support for compressed direct blocks, but comment it
            out until John's got some metadata cache changes in place to
            support it.
        - Add support for applying I/O pipeline filters to 'huge' objects
        - Refactor 'huge' object code to store information for 'huge' objects
            directly in the heap ID, when there are I/O pipeline filters
            applied to the heap (and the heap ID is large enough to hold the
            information)
        - Update h5debug tool to correctly handle 'huge' & 'tiny' objects.
        - Misc. other code cleanups, etc.

Tested on:
    FreeBSD/32 4.11 (sleipnir)
    Linux/64 2.4 (mir)
    Solaris/64 2.9 (shanti)

1 files changed, 22 insertions, 11 deletions

diff --git a/src/H5HFprivate.h b/src/H5HFprivate.h
index 1c9a3ba..20415c1 100644
--- a/src/H5HFprivate.h
+++ b/src/H5HFprivate.h
@@ -31,11 +31,17 @@
 
 /* Private headers needed by this file */
 #include "H5Fprivate.h"		/* File access				*/
+#include "H5Oprivate.h"		/* Object headers		  	*/
 
 /**************************/
 /* Library Private Macros */
 /**************************/
 
+/* Limit heap ID length to 4096 + 1, due to # of bits required to store
+ *      length of 'tiny' objects (12 bits)
+ */
+#define H5HF_MAX_ID_LEN         (4096 + 1)
+
 
 /****************************/
 /* Library Private Typedefs */
@@ -60,22 +66,27 @@ typedef struct H5HF_create_t {
                                 /* (i.e.  min. size of object to store standalone) */
     uint16_t id_len;            /* Length of IDs to use for heap objects */
                                 /* (0 - make ID just large enough to hold length & offset of object in the heap) */
-                                /* (1 - make ID just large enough to allow 'huge' objects to hold the file address & length of the 'huge' object) */
+                                /* (1 - make ID just large enough to allow 'huge' objects to be accessed directly) */
                                 /* (n - make ID 'n' bytes in size) */
+    H5O_pline_t pline;          /* I/O filter pipeline to apply to direct blocks & 'huge' objects */
 } H5HF_create_t;
 
 /* Fractal heap metadata statistics info */
 typedef struct H5HF_stat_t {
-    /* "Managed" object info */
-    hsize_t man_size;           /* Size of managed space in heap              */
-    hsize_t man_alloc_size;     /* Size of managed space allocated in heap    */
-    hsize_t man_iter_off;       /* Offset of "new block" iterator in managed heap space */
-    hsize_t man_free_space;     /* Free space within managed heap blocks      */
-    hsize_t man_nobjs;          /* Number of "managed" objects in heap        */
-
-    /* "Huge" object info */
-    hsize_t huge_size;          /* Size of "huge" objects in heap             */
-    hsize_t huge_nobjs;         /* Number of "huge" objects in heap           */
+    /* 'Managed' object info */
+    hsize_t man_size;           /* Size of 'managed' space in heap            */
+    hsize_t man_alloc_size;     /* Size of 'managed' space allocated in heap  */
+    hsize_t man_iter_off;       /* Offset of "new block" iterator in 'managed' heap space */
+    hsize_t man_free_space;     /* Free space within 'managed' heap blocks    */
+    hsize_t man_nobjs;          /* Number of 'managed' objects in heap        */
+
+    /* 'Huge' object info */
+    hsize_t huge_size;          /* Size of 'huge' objects in heap             */
+    hsize_t huge_nobjs;         /* Number of 'huge' objects in heap           */
+
+    /* 'Tiny' object info */
+    hsize_t tiny_size;          /* Size of 'tiny' objects in heap             */
+    hsize_t tiny_nobjs;         /* Number of 'tiny' objects in heap           */
 } H5HF_stat_t;
 
 /* Fractal heap info (forward decl - defined in H5HFpkg.h) */