[svn-r13028] Description:

    Add first pass of "dense" attribute storage to objects.  Lots of parts of
this are stubbed out, but all the tests are passing and I'll work on the corner
cases soon.

    Eliminated several unused parameters from object header message callback
routines.

    Other, miscellaneous code cleanups, etc. (and probably some things I've
forgotten about... :-)

Tested on:
    FreeBSD/32 4.11 (sleipnir)
    Linux/32 2.4 (heping)
    AIX/32 5.? (copper)

1 files changed, 80 insertions, 4 deletions

diff --git a/src/H5Apkg.h b/src/H5Apkg.h
index e01d788..a8a7dd7 100644
--- a/src/H5Apkg.h
+++ b/src/H5Apkg.h
@@ -38,13 +38,29 @@
 #include "H5Aprivate.h"
 
 /* Other private headers needed by this file */
+#include "H5B2private.h"	/* v2 B-trees				*/
 #include "H5FLprivate.h"	/* Free Lists				*/
+#include "H5HFprivate.h"	/* Fractal heaps			*/
 #include "H5Oprivate.h"		/* Object headers		  	*/
 #include "H5Sprivate.h"		/* Dataspace				*/
 #include "H5Tprivate.h"		/* Datatype functions			*/
 
+
+/**************************/
+/* Package Private Macros */
+/**************************/
+
+/* Standard length of fractal heap ID for attribute */
+#define H5A_DENSE_FHEAP_ID_LEN  7
+
+
+/****************************/
+/* Package Private Typedefs */
+/****************************/
+
+/* Define the main attribute structure */
 struct H5A_t {
-    hbool_t    initialized;/* Indicate whether the attribute has been modified */
+    hbool_t     initialized;/* Indicate whether the attribute has been modified */
     hbool_t     obj_opened; /* Object header entry opened? */
     H5O_loc_t   oloc;       /* Object location for object attribute is on */
     H5G_name_t  path;       /* Group hierarchy path */
@@ -56,19 +72,79 @@ struct H5A_t {
     void        *data;      /* Attribute data (on a temporary basis) */
     size_t      data_size;  /* Size of data on disk */
     H5T_cset_t  encoding;   /* Character encoding of attribute */
-    H5O_shared_t sh_loc;    /*location of shared message         */
+    H5O_shared_t sh_loc;    /* Location of shared message */
 };
 
+/* Typedefs for "dense" attribute storage */
+/* (fractal heap & v2 B-tree info) */
+
+/* Typedef for native 'name' field index records in the v2 B-tree */
+/* (Keep 'id' field first so generic record handling in callbacks works) */
+typedef struct H5A_dense_bt2_name_rec_t {
+    uint8_t id[H5A_DENSE_FHEAP_ID_LEN]; /* Heap ID for link */
+    uint8_t flags;                      /* Message flags for attribute */
+    uint32_t hash;                      /* Hash of 'name' field value */
+} H5A_dense_bt2_name_rec_t;
+
+/*
+ * Common data exchange structure for dense attribute storage.  This structure
+ * is passed through the v2 B-tree layer to the methods for the objects
+ * to which the v2 B-tree points.
+ */
+typedef struct H5A_bt2_ud_common_t {
+    /* downward */
+    H5F_t       *f;                     /* Pointer to file that fractal heap is in */
+    hid_t       dxpl_id;                /* DXPL for operation                */
+    H5HF_t      *fheap;                 /* Fractal heap handle               */
+    const char  *name;                  /* Name of attribute to compare      */
+    uint32_t    name_hash;              /* Hash of name of attribute to compare */
+    uint8_t     flags;                  /* Flags for attribute storage location */
+    int64_t     corder;                 /* Creation order value of attribute to compare */
+    H5B2_found_t found_op;              /* Callback when correct attribute is found */
+    void        *found_op_data;         /* Callback data when correct attribute is found */
+} H5A_bt2_ud_common_t;
+
+/*
+ * Data exchange structure for dense attribute storage.  This structure is
+ * passed through the v2 B-tree layer when inserting attributes.
+ */
+typedef struct H5A_bt2_ud_ins_t {
+    /* downward */
+    H5A_bt2_ud_common_t common;         /* Common info for B-tree user data (must be first) */
+    uint8_t id[H5A_DENSE_FHEAP_ID_LEN]; /* Heap ID of attribute to insert    */
+} H5A_bt2_ud_ins_t;
+
+
+/*****************************/
+/* Package Private Variables */
+/*****************************/
+
 /* Declare extern the free list for H5A_t's */
 H5FL_EXTERN(H5A_t);
 
 /* Declare extern a free list to manage blocks of type conversion data */
 H5FL_BLK_EXTERN(attr_buf);
 
+/* The v2 B-tree class for indexing 'name' field on attributes */
+H5_DLLVAR const H5B2_class_t H5A_BT2_NAME[1];
+
+
+/******************************/
+/* Package Private Prototypes */
+/******************************/
+
 /* Function prototypes for H5A package scope */
 H5_DLL herr_t H5A_init(void);
-H5_DLL H5A_t *H5A_copy(H5A_t *new_attr, const H5A_t *old_attr, unsigned update_flags);
+H5_DLL H5A_t *H5A_copy(H5A_t *new_attr, const H5A_t *old_attr);
 H5_DLL herr_t H5A_free(H5A_t *attr);
 H5_DLL herr_t H5A_close(H5A_t *attr);
 
-#endif
+/* Attribute "dense" storage routines */
+H5_DLL herr_t H5A_dense_write(H5F_t *f, hid_t dxpl_id, const H5O_t *oh,
+    const H5A_t *attr);
+H5_DLL herr_t H5A_dense_iterate(H5F_t *f, hid_t dxpl_id, hid_t loc_id,
+    haddr_t attr_fheap_addr, haddr_t name_bt2_addr, unsigned skip,
+    unsigned *last_attr, H5A_operator_t op, void *op_data);
+
+#endif /* _H5Apkg_H */
+