[svn-r100] Interim checkin for purify. Also contains H5G shadow stuff, changes

to int64 encode/decode to fix purify on 32-bit systems, changes to
H5O_modify, changes to H5D.c to use H5F_open/close(), etc.
Documentation will be mailed shortly...

1 files changed, 44 insertions, 106 deletions

diff --git a/src/H5Gprivate.h b/src/H5Gprivate.h
index e6f5df4..dd26902 100644
--- a/src/H5Gprivate.h
+++ b/src/H5Gprivate.h
@@ -8,7 +8,7 @@
  * 			Jul 11 1997
  * 			Robb Matzke <matzke@llnl.gov>
  *
- * Purpose:		Private stuff for the H5G package (symbol tables).
+ * Purpose:		Library-visible declarations.
  *
  * Modifications:	
  *
@@ -25,18 +25,17 @@
 
 #define H5G_NODE_MAGIC	"SNOD"	/*symbol table node magic number	*/
 #define H5G_NODE_SIZEOF_MAGIC 4 /*sizeof symbol node magic number	*/
-#define H5G_NODE_VERS	1	/*symbol table node version number	*/
-#define H5G_SIZE_HINT	1024	/*default root dir size hint		*/
-#define H5G_NODE_K(F) ((F)->file_create_parms.sym_leaf_k)
-#define H5G_NODE_SIZEOF_HDR(F) (H5G_NODE_SIZEOF_MAGIC + 4)
+#define H5G_new_entry() H5MM_xcalloc (1, sizeof(H5G_entry_t))
+
+/*
+ * The disk size for a symbol table entry...
+ */
 #define H5G_SIZEOF_ENTRY(F)						      \
    (H5F_SIZEOF_OFFSET(F) +	/*offset of name into heap     		*/    \
     H5F_SIZEOF_OFFSET(F) +	/*address of object header		*/    \
     4 +				/*entry type				*/    \
     24)				/*scratch pad space			*/
     
-#define H5G_DEFAULT_ROOT_SIZE  32
-
 /*
  * Various types of object header information can be cached in a symbol
  * table entry (it's normal home is the object header to which the entry
@@ -44,134 +43,73 @@
  * symbol table entry.
  */
 typedef enum H5G_type_t {
-   H5G_NOTHING_CACHED		=0,	/*nothing is cached		*/
+   H5G_NOTHING_CACHED		=0,	/*nothing is cached, must be 0	*/
    H5G_CACHED_SDATA		=1,	/*simple dataset, `sdata'	*/
    H5G_CACHED_STAB		=2 	/*symbol table, `stab'		*/
 } H5G_type_t;
 
 /*
+ * A symbol table entry caches these parameters from object header
+ * messages...
+ */
+typedef union H5G_cache_t {
+   struct {
+      struct	{
+	 uint8 length;
+	 uint8 arch;
+	 uint16 type;
+      } nt ;			/*number type				*/
+      uint32 ndim;		/*number of dimensions			*/
+      uint32 dim[4];		/*dimension sizes			*/
+   } sdata;
+
+   struct {
+      haddr_t btree_addr;	/*file address of symbol table B-tree	*/
+      haddr_t heap_addr;	/*file address of stab name heap	*/
+   } stab;
+} H5G_cache_t;
+
+/*
+ * An H5G_shadow_t is the struct used to describe object headers that
+ * are currently open for modification.  It's contents is not
+ * important outside H5G.
+ */
+typedef struct H5G_shadow_t H5G_shadow_t;
+
+/*
  * A symbol table entry.  The two important fields are `name_off' and
  * `header'.  The remaining fields are used for caching information that
  * also appears in the object header to which this symbol table entry
  * points.
  */
 typedef struct H5G_entry_t {
+   hbool_t	dirty;		/*entry out-of-date?			*/
    off_t	name_off;	/*offset of name within name heap	*/
    haddr_t	header;		/*file address of object header		*/
    H5G_type_t	type;		/*type of information cached		*/
-
-   union {
-      struct {
-	 struct	{
-	    uint8 length;
-	    uint8 arch;
-	    uint16 type;
-	 } nt ;			/*number type				*/
-	 uint32 ndim;		/*number of dimensions			*/
-	 uint32 dim[4];		/*dimension sizes			*/
-      } sdata;
-
-      struct {
-	 haddr_t btree_addr;	/*file address of symbol table B-tree	*/
-	 haddr_t heap_addr;	/*file address of stab name heap	*/
-      } stab;
-   } cache;			/*cached data from object header	*/
+   H5G_cache_t	cache;		/*cached data from object header	*/
+   H5G_shadow_t *shadow;	/*optional ptr to the shadow		*/
 } H5G_entry_t;
 
 /*
- * A symbol table node is a collection of symbol table entries.  It can
- * be thought of as the lowest level of the B-link tree that points to
- * a collection of symbol table entries that belong to a specific symbol
- * table or directory.
- */
-typedef struct H5G_node_t {
-   int		dirty;		/*has cache been modified?		*/
-   int		nsyms;		/*number of symbols			*/
-   H5G_entry_t	*entry;		/*symbol table entries			*/
-} H5G_node_t;
-
-/*
- * Each key field of the B-link tree that points to symbol table
- * nodes consists of this structure...
- */
-typedef struct H5G_node_key_t {
-   off_t	offset;		/*offset into heap for name		*/
-} H5G_node_key_t;
-
-typedef enum H5G_oper_t {
-   H5G_OPER_FIND	=0,	/*find a symbol				*/
-   H5G_OPER_MODIFY	=1	/*modify a symbol			*/
-} H5G_oper_t;
-
-/*
- * Data exchange structure for symbol table nodes.  This structure is
- * passed through the B-link tree layer to the methods for the objects
- * to which the B-link tree points.
- */
-typedef struct H5G_node_ud1_t {
-
-   /* downward */
-   H5G_oper_t	operation;	/*what operation to perform		*/
-   const char	*name;		/*points to temporary memory		*/
-   haddr_t	heap_addr;	/*symbol table heap address		*/
-
-   /* upward for H5G_OPER_FIND, downward for H5G_OPER_MODIFY */
-   H5G_entry_t	entry;		/*symbol table entry			*/
-
-} H5G_node_ud1_t;
-
-typedef struct H5G_node_list_t {
-
-   /* downward */
-   H5G_entry_t	*entry;		/*array of entries, alloc'd by caller	*/
-   char		**name;		/*array of string ptrs, allocd by caller*/
-   intn		maxentries;	/*size of the ADDR and NAME arrays	*/
-   haddr_t	heap_addr;	/*heap address				*/
-
-   /* upward */
-   intn		nsyms;		/*num. symbols processed		*/
-   
-} H5G_node_list_t;
-
-extern const H5B_class_t H5B_SNODE[1];
-
-/*
  * Library prototypes...
  */
-
-/* functions that understand directories */
 herr_t H5G_new (hdf5_file_t *f, H5G_entry_t *cwd, H5G_entry_t *dir_ent,
 		const char *name, size_t size_hint, H5G_entry_t *ent);
+H5G_entry_t *H5G_open (hdf5_file_t *f, H5G_entry_t *cwd, const char *name);
+herr_t H5G_close (hdf5_file_t *f, H5G_entry_t *ent);
 herr_t H5G_find (hdf5_file_t *f, H5G_entry_t *cwd, H5G_entry_t *dir_ent,
 		 const char *name, H5G_entry_t *ent);
 herr_t H5G_insert (hdf5_file_t *f, H5G_entry_t *cwd, H5G_entry_t *dir_ent,
 		   const char *name, H5G_entry_t *ent);
-herr_t H5G_modify (hdf5_file_t *f, H5G_entry_t *cwd, H5G_entry_t *dir_ent,
-		   const char *name, H5G_entry_t *ent);
 herr_t H5G_set_root (hdf5_file_t *f, const char *name, H5G_entry_t *ent);
-
-/* functions that understand symbol tables */
-haddr_t H5G_stab_new (hdf5_file_t *f, H5G_entry_t *self, size_t init);
-haddr_t H5G_stab_find (hdf5_file_t *f, H5G_entry_t *self, const char *name,
-		       H5G_entry_t *ent);
-herr_t H5G_stab_modify (hdf5_file_t *f, H5G_entry_t *self, const char *name,
-			H5G_entry_t *ent);
-herr_t H5G_stab_insert (hdf5_file_t *f, H5G_entry_t *self, const char *name,
-			H5G_entry_t *ent);
-intn H5G_stab_list (hdf5_file_t *f, H5G_entry_t *self, intn maxentries,
-		    char *names[], H5G_entry_t entries[]);
-
-/* functions that understand symbol table nodes */
-herr_t H5G_node_debug (hdf5_file_t *f, haddr_t addr, FILE *stream, intn indent,
-		       intn fwidth, haddr_t heap);
-
-/* functions that understand symbol table entries */
-herr_t H5G_decode (hdf5_file_t *f, uint8 **pp, H5G_entry_t *ent);
-herr_t H5G_decode_vec (hdf5_file_t *f, uint8 **pp, H5G_entry_t *ent, intn n);
 herr_t H5G_encode (hdf5_file_t *f, uint8 **pp, H5G_entry_t *ent);
-herr_t H5G_encode_vec (hdf5_file_t *f, uint8 **pp, H5G_entry_t *ent, intn n);
+herr_t H5G_decode (hdf5_file_t *f, uint8 **pp, H5G_entry_t *ent);
 herr_t H5G_debug (hdf5_file_t *f, H5G_entry_t *ent, FILE *stream, intn indent,
 		  intn fwidth);
+herr_t H5G_node_debug (hdf5_file_t *f, haddr_t addr, FILE *stream, intn indent,
+		       intn fwidth, haddr_t heap);
+
 
 #endif