[svn-r17896] Description:

	Bring r17546:17895 from trunk to revise_chunks branch.  Changes to
fixed and extensible array dataset chunk indexing code to accommodate changes
to private APIs in those interfaces.  Also, other adjustments to source code
and expected output in response to changes on the trunk.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (smirom) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
        Mac OS X/32 10.6.2 (amazon) in debug mode
        Mac OS X/32 10.6.2 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode

1 files changed, 557 insertions, 186 deletions

diff --git a/tools/h5stat/h5stat.c b/tools/h5stat/h5stat.c
index 657cf32..b21e5a0 100644
--- a/tools/h5stat/h5stat.c
+++ b/tools/h5stat/h5stat.c
@@ -26,12 +26,21 @@
 #define SIZE_SMALL_GROUPS       10
 #define SIZE_SMALL_ATTRS	10
 #define SIZE_SMALL_DSETS        10
+#define SIZE_SMALL_SECTS        10
 
 #define  H5_NFILTERS_IMPL        8     /* Number of currently implemented filters + one to
                                           accommodate for user-define filters + one
                                           to accomodate datasets whithout any filters */
 
-
+/* File space management strategies: see H5Fpublic.h for declarations */
+const char *FS_STRATEGY_NAME[] = {
+    "unknown",			
+    "H5F_FILE_SPACE_ALL_PERSIST",
+    "H5F_FILE_SPACE_ALL",
+    "H5F_FILE_SPACE_AGGR_VFD",
+    "H5F_FILE_SPACE_VFD",
+    NULL
+};
 
 /* Datatype statistics for datasets */
 typedef struct dtype_info_t {
@@ -48,7 +57,7 @@ typedef struct ohdr_info_t {
 /* Info to pass to the iteration functions */
 typedef struct iter_t {
     hid_t fid;                          /* File ID */
-
+    hsize_t filesize;			/* Size of the file */
     unsigned long uniq_groups;          /* Number of unique groups */
     unsigned long uniq_dsets;           /* Number of unique datasets */
     unsigned long uniq_dtypes;          /* Number of unique named datatypes */
@@ -79,6 +88,7 @@ typedef struct iter_t {
     unsigned long *dset_dim_bins;       /* Pointer to array of bins for dataset dimensions */
     ohdr_info_t dset_ohdr_info;         /* Object header information for datasets */
     hsize_t dset_storage_size;          /* Size of raw data for datasets */
+    hsize_t dset_external_storage_size; /* Size of raw data for datasets with external storage */
     ohdr_info_t dtype_ohdr_info;        /* Object header information for datatypes */
     hsize_t groups_btree_storage_size;  /* btree size for group */
     hsize_t groups_heap_storage_size;   /* heap size for group */
@@ -87,8 +97,18 @@ typedef struct iter_t {
     hsize_t SM_hdr_storage_size;        /* header size for SOHM table (1.8) */
     hsize_t SM_index_storage_size;      /* index (btree & list) size for SOHM table (1.8) */
     hsize_t SM_heap_storage_size;	/* fractal heap size for SOHM table (1.8) */
+    hsize_t super_size;	   	   	/* superblock size */
     hsize_t super_ext_size;	   	/* superblock extension size */
-    hsize_t datasets_index_storage_size;   /* meta size for chunked dataset's indexing type */
+    hsize_t ublk_size;	   		/* user block size (if exists) */
+    H5F_file_space_type_t  fs_strategy;	/* File space management strategy */
+    hsize_t fs_threshold;		/* Free-space section threshold */
+    hsize_t free_space;                	/* amount of freespace in the file */
+    hsize_t free_hdr;                	/* size of free space manager metadata in the file */
+    unsigned long num_small_sects[SIZE_SMALL_SECTS];   /* Size of small free-space sections */
+    unsigned sect_nbins;               /* Number of bins for free-space section sizes */
+    unsigned long *sect_bins;          /* Pointer to array of bins for free-space section sizes */
+    hsize_t datasets_index_storage_size;/* meta size for chunked dataset's indexing type */
+    hsize_t datasets_heap_storage_size; /* heap size for dataset with external storage */
     unsigned long nexternal;            /* Number of external files for a dataset */
     int           local;                /* Flag to indicate iteration over the object*/
 } iter_t;
@@ -96,14 +116,24 @@ typedef struct iter_t {
 
 const char *progname = "h5stat";
 int               d_status = EXIT_SUCCESS;
+
+/* Enable the printing of everything */
 static int        display_all = TRUE;
-static int        display_file_metadata = FALSE;
-static int        display_file = FALSE;
-static int        display_group = FALSE;
-static int        display_dset = FALSE;
-static int        display_dtype_metadata = FALSE;
-static int        display_object = FALSE;
-static int        display_attr = FALSE;
+
+/* Enable the printing of selected statistics */
+static int        display_file = FALSE;		/* display file information */
+static int        display_group = FALSE;	/* display groups information */
+static int        display_dset = FALSE;		/* display datasets information */
+static int        display_dset_dtype_info = FALSE;  /* display datasets' datatype information */
+static int        display_attr = FALSE;		/* display attributes information */
+static int        display_free_sections = FALSE;    /* display free space information */
+static int        display_summary = FALSE;	/* display summary of file space information */
+
+static int        display_file_metadata = FALSE;    /* display file space info for file's metadata */
+static int        display_group_metadata = FALSE;   /* display file space info for groups' metadata */
+static int        display_dset_metadata = FALSE;    /* display file space info for datasets' metadata */
+
+static int        display_object = FALSE;	/* not implemented yet */
 
 /* a structure for handling the order command-line parameters come in */
 struct handler_t {
@@ -111,10 +141,11 @@ struct handler_t {
 };
 
 
-static const char *s_opts ="ADdFfhGgTO:V";
+static const char *s_opts ="aDdFfhGgsSTO:v";
 static struct long_options l_opts[] = {
     {"help", no_arg, 'h'},
     {"hel", no_arg, 'h'},
+    {"he", no_arg, 'h'},
     {"file", no_arg, 'f'},
     {"fil", no_arg, 'f'},
     {"fi", no_arg, 'f'},
@@ -130,55 +161,66 @@ static struct long_options l_opts[] = {
     {"grou", no_arg, 'g'},
     {"gro", no_arg, 'g'},
     {"gr", no_arg, 'g'},
-    {"groupmetadata", no_arg, 'G'},
-    {"groupmetadat", no_arg, 'G'},
-    {"groupmetada", no_arg, 'G'},
-    {"groupmetad", no_arg, 'G'},
-    {"groupmeta", no_arg, 'G'},
-    {"groupmet", no_arg, 'G'},
-    {"groupme", no_arg, 'G'},
-    {"groupm", no_arg, 'G'},
+    {"GROUPmetadata", no_arg, 'G'},
+    {"GROUPmetadat", no_arg, 'G'},
+    {"GROUPmetada", no_arg, 'G'},
+    {"GROUPmetad", no_arg, 'G'},
+    {"GROUPmeta", no_arg, 'G'},
+    {"GROUPmet", no_arg, 'G'},
+    {"GROUPme", no_arg, 'G'},
+    {"GROUPm", no_arg, 'G'},
     {"dset", no_arg, 'd'},
     {"dse", no_arg, 'd'},
     {"ds", no_arg, 'd'},
-    {"d", no_arg, 'd'},
-    {"dsetmetadata", no_arg, 'D'},
-    {"dsetmetadat", no_arg, 'D'},
-    {"dsetmetada", no_arg, 'D'},
-    {"dsetmetad", no_arg, 'D'},
-    {"dsetmeta", no_arg, 'D'},
-    {"dsetmet", no_arg, 'D'},
-    {"dsetme", no_arg, 'D'},
-    {"dsetm", no_arg, 'D'},
-    {"dtypemetadata", no_arg, 'T'},
-    {"dtypemetadat", no_arg, 'T'},
-    {"dtypemetada", no_arg, 'T'},
-    {"dtypemetad", no_arg, 'T'},
-    {"dtypemeta", no_arg, 'T'},
-    {"dtypemet", no_arg, 'T'},
-    {"dtypeme", no_arg, 'T'},
-    {"dtypem", no_arg, 'T'},
-    {"dtype", no_arg, 'T'},
+    {"DSETmetadata", no_arg, 'D'},
+    {"DSETmetadat", no_arg, 'D'},
+    {"DSETmetada", no_arg, 'D'},
+    {"DSETmetad", no_arg, 'D'},
+    {"DSETmeta", no_arg, 'D'},
+    {"DSETmet", no_arg, 'D'},
+    {"DSETme", no_arg, 'D'},
+    {"DSETm", no_arg, 'D'},
+    {"DSETtypeinfo", no_arg, 'T'},
+    {"DSETtypeinf", no_arg, 'T'},
+    {"DSETtypein", no_arg, 'T'},
+    {"DSETtypei", no_arg, 'T'},
+    {"DSETtype", no_arg, 'T'},
+    {"DSETtyp", no_arg, 'T'},
+    {"DSETty", no_arg, 'T'},
+    {"DSETt", no_arg, 'T'},
     { "object", require_arg, 'O' },
     { "objec", require_arg, 'O' },
     { "obje", require_arg, 'O' },
     { "obj", require_arg, 'O' },
     { "ob", require_arg, 'O' },
-    { "version", no_arg, 'V' },
-    { "versio", no_arg, 'V' },
-    { "versi", no_arg, 'V' },
-    { "vers", no_arg, 'V' },
-    { "ver", no_arg, 'V' },
-    { "ve", no_arg, 'V' },
-    { "attribute", no_arg, 'A' },
-    { "attribut", no_arg, 'A' },
-    { "attribu", no_arg, 'A' },
-    { "attrib", no_arg, 'A' },
-    { "attri", no_arg, 'A' },
-    { "attr", no_arg, 'A' },
-    { "att", no_arg, 'A' },
-    { "at", no_arg, 'A' },
-    { "a", no_arg, 'A' },
+    { "version", no_arg, 'v' },
+    { "versio", no_arg, 'v' },
+    { "versi", no_arg, 'v' },
+    { "vers", no_arg, 'v' },
+    { "ver", no_arg, 'v' },
+    { "ve", no_arg, 'v' },
+    { "attribute", no_arg, 'a' },
+    { "attribut", no_arg, 'a' },
+    { "attribu", no_arg, 'a' },
+    { "attrib", no_arg, 'a' },
+    { "attri", no_arg, 'a' },
+    { "attr", no_arg, 'a' },
+    { "att", no_arg, 'a' },
+    { "at", no_arg, 'a' },
+    { "freespace", no_arg, 's' },
+    { "freespac", no_arg, 's' },
+    { "freespa", no_arg, 's' },
+    { "freesp", no_arg, 's' },
+    { "frees", no_arg, 's' },
+    { "free", no_arg, 's' },
+    { "fre", no_arg, 's' },
+    { "fr", no_arg, 's' },
+    { "summary", no_arg, 'S' },
+    { "summar", no_arg, 'S' },
+    { "summa", no_arg, 'S' },
+    { "summ", no_arg, 'S' },
+    { "sum", no_arg, 'S' },
+    { "su", no_arg, 'S' },
     { NULL, 0, '\0' }
 };
 
@@ -197,16 +239,17 @@ static void usage(const char *prog)
      fprintf(stdout, "\n");
      fprintf(stdout, "      OPTIONS\n");
      fprintf(stdout, "     -h, --help            Print a usage message and exit\n");
-     fprintf(stdout, "     -V, --version         Print version number and exit\n");
+     fprintf(stdout, "     -v, --version         Print version number and exit\n");
      fprintf(stdout, "     -f, --file            Print file information\n");
-     fprintf(stdout, "     -F, --filemetadata    Print file metadata\n");
+     fprintf(stdout, "     -F, --FILEmetadata    Print file space information for file's metadata\n");
      fprintf(stdout, "     -g, --group           Print group information\n");
-     fprintf(stdout, "     -G, --groupmetadata   Print group metadata\n");
+     fprintf(stdout, "     -G, --GROUPmetadata   Print file space information for groups' metadata\n");
      fprintf(stdout, "     -d, --dset            Print dataset information\n");
-     fprintf(stdout, "     -D, --dsetmetadata    Print dataset metadata\n");
-     fprintf(stdout, "     -T, --dtypemetadata   Print datatype metadata\n");
-     fprintf(stdout, "     -A, --attribute       Print attribute information\n");
-     fprintf(stdout, "\n");
+     fprintf(stdout, "     -D, --DSETmetadata    Print file space information for datasets' metadata\n");
+     fprintf(stdout, "     -T, --DSETtypeinfo    Print datasets' datatype information\n");
+     fprintf(stdout, "     -a, --attribute       Print attribute information\n");
+     fprintf(stdout, "     -s, --freespace       Print free space information\n");
+     fprintf(stdout, "     -S, --summary         Print summary of file space information\n");
 }
 
 
@@ -381,18 +424,6 @@ group_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
  * Programmer:    Quincey Koziol
  *                Tuesday, August 16, 2005
  *
- * Modifications: Refactored code from the walk_function
- *                EIP, Wednesday, August 16, 2006
- *
- *                Vailin Choi 12 July 2007
- *                1. Gathered storage info for btree and heap
- *                   (chunked datasets and attributes)
- *                2. Gathered info for attributes
- *
- *		  Vailin Choi 14 July 2007
- *		  Cast "dims" and "num_attrs" to size_t
- *		  Due to the -Mbounds problem for the pgi-32bit compiler on indexing
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -427,6 +458,7 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
 
     /* Update dataset metadata info */
     iter->datasets_index_storage_size += oi->meta_size.obj.index_size;
+    iter->datasets_heap_storage_size += oi->meta_size.obj.heap_size;
 
     /* Update attribute metadata info */
     ret = attribute_stats(iter, oi);
@@ -434,7 +466,32 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
 
     /* Get storage info */
     storage = H5Dget_storage_size(did);
-    iter->dset_storage_size += storage;
+
+    /* Gather layout statistics */
+    dcpl = H5Dget_create_plist(did);
+    assert(dcpl > 0);
+
+    lout = H5Pget_layout(dcpl);
+    assert(lout >= 0);
+
+    /* Object header's total size for H5D_COMPACT layout includes raw data size */
+    /* "storage" also includes H5D_COMPACT raw data size */
+    if(lout == H5D_COMPACT)
+	iter->dset_ohdr_info.total_size -= storage;
+
+    /* Track the layout type for dataset */
+    (iter->dset_layouts[lout])++;
+
+    /* Get the number of external files for the dataset */
+    num_ext = H5Pget_external_count(dcpl);
+    assert (num_ext >= 0);
+
+    /* Accumulate raw data size accordingly */
+    if(num_ext) {
+        iter->nexternal += (unsigned long)num_ext;
+        iter->dset_external_storage_size += (unsigned long)storage;
+    } else
+	iter->dset_storage_size += storage;
 
     /* Gather dataspace statistics */
     sid = H5Dget_space(did);
@@ -517,22 +574,6 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
     ret = H5Tclose(tid);
     assert(ret >= 0);
 
-    /* Gather layout statistics */
-    dcpl = H5Dget_create_plist(did);
-    assert(dcpl > 0);
-
-    lout = H5Pget_layout(dcpl);
-    assert(lout >= 0);
-
-    /* Track the layout type for dataset */
-    (iter->dset_layouts[lout])++;
-
-    num_ext = H5Pget_external_count(dcpl);
-    assert (num_ext >= 0);
-
-    if(num_ext)
-        iter->nexternal += (unsigned long)num_ext;
-
     /* Track different filters */
     if((nfltr = H5Pget_nfilters(dcpl)) >= 0) {
        if(nfltr == 0)
@@ -587,8 +628,7 @@ datatype_stats(iter_t *iter, const H5O_info_t *oi)
  * Purpose: Gather statistics about an object
  *
  * Return: Success: 0
- *
- *  Failure: -1
+ *  	   Failure: -1
  *
  * Programmer: Quincey Koziol
  *             Tuesday, November 6, 2007
@@ -666,6 +706,66 @@ lnk_stats(const char UNUSED *path, const H5L_info_t *li, void *_iter)
     return 0;
 } /* end lnk_stats() */
 
+/*-------------------------------------------------------------------------
+ * Function: freespace_stats
+ *
+ * Purpose: Gather statistics for free space sections in the file
+ *
+ * Return: Success: 0
+ *  	   Failure: -1
+ *
+ * Programmer:  Vailin Choi; July 7th, 2009
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+freespace_stats(hid_t fid, iter_t *iter)
+{
+    H5F_sect_info_t *sect_info = NULL;    /* Free space sections */
+    ssize_t 	nsects;                   /* Number of free space sections */
+    size_t 	u;                        /* Local index variable */
+
+    /* Query section information */
+    if((nsects = H5Fget_free_sections(fid, H5FD_MEM_DEFAULT, 0, NULL)) < 0)
+	return(FAIL);
+    else if(nsects) {
+	if(NULL == (sect_info = (H5F_sect_info_t *)calloc((size_t)nsects, sizeof(H5F_sect_info_t))))
+	    return(FAIL);
+	nsects = H5Fget_free_sections(fid, H5FD_MEM_DEFAULT, (size_t)nsects, sect_info);
+	assert(nsects);
+    } /* end else-if */
+
+    for(u = 0; u < (size_t)nsects; u++) {
+        unsigned 	bin;       /* "bin" the number of objects falls in */
+
+	if(sect_info[u].size < SIZE_SMALL_SECTS)
+	    (iter->num_small_sects[(size_t)sect_info[u].size])++;
+
+        /* Add section size to proper bin */
+        bin = ceil_log10((unsigned long)sect_info[u].size);
+        if(bin >= iter->sect_nbins) {
+            /* Allocate more storage for section info */
+            iter->sect_bins = (unsigned long *)realloc(iter->sect_bins, (bin + 1) * sizeof(unsigned long));
+            assert(iter->sect_bins);
+
+            /* Initialize counts for intermediate bins */
+            while(iter->sect_nbins < bin)
+                iter->sect_bins[iter->sect_nbins++] = 0;
+            iter->sect_nbins++;
+
+            /* Initialize count for this bin */
+            iter->sect_bins[bin] = 1;
+        } /* end if */
+        else
+            (iter->sect_bins[bin])++;
+    } /* end for */
+
+    if(sect_info)
+        free(sect_info);
+
+    return 0;
+} /* end freespace_stats() */
+
 
 /*-------------------------------------------------------------------------
  * Function: parse_command_line
@@ -679,6 +779,11 @@ lnk_stats(const char UNUSED *path, const H5L_info_t *li, void *_iter)
  * Programmer: Elena Pourmal
  *             Saturday, August 12, 2006
  *
+ * Modifications: 
+ *	Vailin Choi; October 2009
+ *	Turn on display_group_metadata, display_dset_metadata
+ *	Add 'S' & 's' for printing free space info (previous checkin)
+ *
  *-------------------------------------------------------------------------
  */
 static struct handler_t *
@@ -693,11 +798,16 @@ parse_command_line(int argc, const char *argv[])
     /* parse command line options */
     while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) {
         switch ((char)opt) {
-            case 'A':
-                display_all = FALSE;
-                display_attr = TRUE;
+            case 'h':
+                usage(progname);
+                leave(EXIT_SUCCESS);
+
+            case 'v':
+                print_version(progname);
+                leave(EXIT_SUCCESS);
                 break;
 
+
             case 'F':
                 display_all = FALSE;
                 display_file_metadata = TRUE;
@@ -710,6 +820,7 @@ parse_command_line(int argc, const char *argv[])
 
             case 'G':
                 display_all = FALSE;
+		display_group_metadata = TRUE;
                 break;
 
             case 'g':
@@ -717,13 +828,9 @@ parse_command_line(int argc, const char *argv[])
                 display_group = TRUE;
                 break;
 
-            case 'T':
-                display_all = FALSE;
-                display_dtype_metadata = TRUE;
-                break;
-
             case 'D':
                 display_all = FALSE;
+		display_dset_metadata = TRUE;
                 break;
 
             case 'd':
@@ -731,16 +838,28 @@ parse_command_line(int argc, const char *argv[])
                 display_dset = TRUE;
                 break;
 
-            case 'h':
-                usage(progname);
-                leave(EXIT_SUCCESS);
+            case 'T':
+                display_all = FALSE;
+                display_dset_dtype_info = TRUE;
+                break;
 
-            case 'V':
-                print_version(progname);
-                leave(EXIT_SUCCESS);
+            case 'a':
+                display_all = FALSE;
+                display_attr = TRUE;
+                break;
+
+	    case 's':
+                display_all = FALSE;
+                display_free_sections = TRUE;
+                break;
+
+	    case 'S':
+                display_all = FALSE;
+                display_summary = TRUE;
                 break;
 
             case 'O':
+                display_all = FALSE;
                 display_object = TRUE;
                 for(i = 0; i < argc; i++)
                     if(!hand[i].obj) {
@@ -815,62 +934,14 @@ print_file_info(const iter_t *iter)
     printf("File information\n");
     printf("\t# of unique groups: %lu\n", iter->uniq_groups);
     printf("\t# of unique datasets: %lu\n", iter->uniq_dsets);
-    printf("\t# of unique named dataypes: %lu\n", iter->uniq_dtypes);
+    printf("\t# of unique named datatypes: %lu\n", iter->uniq_dtypes);
     printf("\t# of unique links: %lu\n", iter->uniq_links);
     printf("\t# of unique other: %lu\n", iter->uniq_others);
     printf("\tMax. # of links to object: %lu\n", iter->max_links);
     HDfprintf(stdout, "\tMax. # of objects in group: %Hu\n", iter->max_fanout);
 
     return 0;
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: print_file_metadata
- *
- * Purpose: Prints metadata information about file
- *
- * Return: Success: 0
- *
- * Failure: Never fails
- *
- * Programmer: Elena Pourmal
- *             Saturday, August 12, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-print_file_metadata(const iter_t *iter)
-{
-    printf("Object header size: (total/unused)\n");
-    HDfprintf(stdout, "\tGroups: %Hu/%Hu\n", iter->group_ohdr_info.total_size,
-                                             iter->group_ohdr_info.free_size);
-    HDfprintf(stdout, "\tDatasets: %Hu/%Hu\n", iter->dset_ohdr_info.total_size,
-                                               iter->dset_ohdr_info.free_size);
-    HDfprintf(stdout, "\tDatatypes: %Hu/%Hu\n", iter->dtype_ohdr_info.total_size,
-                                               iter->dtype_ohdr_info.free_size);
-
-    printf("Storage information:\n");
-    HDfprintf(stdout, "\tGroups:\n");
-    HDfprintf(stdout, "\t\tB-tree/List: %Hu\n", iter->groups_btree_storage_size);
-    HDfprintf(stdout, "\t\tHeap: %Hu\n", iter->groups_heap_storage_size);
-
-    HDfprintf(stdout, "\tAttributes:\n");
-    HDfprintf(stdout, "\t\tB-tree/List: %Hu\n", iter->attrs_btree_storage_size);
-    HDfprintf(stdout, "\t\tHeap: %Hu\n", iter->attrs_heap_storage_size);
-
-    HDfprintf(stdout, "\tChunked datasets:\n");
-    HDfprintf(stdout, "\t\tIndex: %Hu\n", iter->datasets_index_storage_size);
-
-    HDfprintf(stdout, "\tShared Messages:\n");
-    HDfprintf(stdout, "\t\tHeader: %Hu\n", iter->SM_hdr_storage_size);
-    HDfprintf(stdout, "\t\tB-tree/List: %Hu\n", iter->SM_index_storage_size);
-    HDfprintf(stdout, "\t\tHeap: %Hu\n", iter->SM_heap_storage_size);
-
-    HDfprintf(stdout, "\tSuperblock extension: %Hu\n", iter->super_ext_size);
-
-    return 0;
-}
+} /* print_file_info() */
 
 
 /*-------------------------------------------------------------------------
@@ -927,7 +998,7 @@ print_group_info(const iter_t *iter)
     printf("\tTotal # of groups: %lu\n", total);
 
     return 0;
-}
+} /* print_group_info() */
 
 
 /*-------------------------------------------------------------------------
@@ -978,7 +1049,7 @@ print_attr_info(const iter_t *iter)
     printf("\tMax. # of attributes to objects: %lu\n", (unsigned long)iter->max_attrs);
 
     return 0;
-}
+} /* print_attr_info() */
 
 
 /*-------------------------------------------------------------------------
@@ -1002,7 +1073,6 @@ print_dataset_info(const iter_t *iter)
 {
     unsigned long power;        /* Temporary "power" for bins */
     unsigned long total;        /* Total count for various statistics */
-    size_t   dtype_size;        /* Size of encoded datatype */
     unsigned u;                 /* Local index variable */
 
     if(iter->uniq_dsets > 0) {
@@ -1048,6 +1118,7 @@ print_dataset_info(const iter_t *iter)
 
         printf("Dataset storage information:\n");
         HDfprintf(stdout, "\tTotal raw data size: %Hu\n", iter->dset_storage_size);
+        HDfprintf(stdout, "\tTotal external raw data size: %Hu\n", iter->dset_external_storage_size);
 
         printf("Dataset layout information:\n");
         for(u = 0; u < H5D_NLAYOUTS; u++)
@@ -1065,26 +1136,286 @@ print_dataset_info(const iter_t *iter)
         printf("\t\tNBIT filter: %lu\n", iter->dset_comptype[H5Z_FILTER_NBIT]);
         printf("\t\tSCALEOFFSET filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SCALEOFFSET]);
         printf("\t\tUSER-DEFINED filter: %lu\n", iter->dset_comptype[H5_NFILTERS_IMPL-1]);
-
-        if(display_dtype_metadata) {
-            printf("Dataset datatype information:\n");
-            printf("\t# of unique datatypes used by datasets: %lu\n", iter->dset_ntypes);
-            total = 0;
-            for(u = 0; u < iter->dset_ntypes; u++) {
-                H5Tencode(iter->dset_type_info[u].tid, NULL, &dtype_size);
-                printf("\tDataset datatype #%u:\n", u);
-                printf("\t\tCount (total/named) = (%lu/%lu)\n", iter->dset_type_info[u].count, iter->dset_type_info[u].named);
-                printf("\t\tSize (desc./elmt) = (%lu/%lu)\n", (unsigned long)dtype_size,
-                        (unsigned long)H5Tget_size(iter->dset_type_info[u].tid));
-                H5Tclose(iter->dset_type_info[u].tid);
-                total += iter->dset_type_info[u].count;
-            } /* end for */
-            printf("\tTotal dataset datatype count: %lu\n", total);
-        }
     } /* end if */
 
     return 0;
-}
+} /* print_dataset_info() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: print_dset_dtype_info
+ *
+ * Purpose: Prints datasets' datatype information 
+ *
+ * Return: Success: 0
+ *
+ * Failure: Never fails
+ *
+ * Programmer: 
+ *
+ * Modifications:
+ *	Vailin Choi; October 2009
+ *	Moved from print_dataset_info()
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+print_dset_dtype_info(const iter_t *iter)
+{
+    unsigned long total;        /* Total count for various statistics */
+    size_t   dtype_size;        /* Size of encoded datatype */
+    unsigned u;                 /* Local index variable */
+
+    if(iter->dset_ntypes) {
+	printf("Dataset datatype information:\n");
+	printf("\t# of unique datatypes used by datasets: %lu\n", iter->dset_ntypes);
+	total = 0;
+	for(u = 0; u < iter->dset_ntypes; u++) {
+	    H5Tencode(iter->dset_type_info[u].tid, NULL, &dtype_size);
+	    printf("\tDataset datatype #%u:\n", u);
+	    printf("\t\tCount (total/named) = (%lu/%lu)\n", 
+		iter->dset_type_info[u].count, iter->dset_type_info[u].named);
+	    printf("\t\tSize (desc./elmt) = (%lu/%lu)\n", (unsigned long)dtype_size,
+		(unsigned long)H5Tget_size(iter->dset_type_info[u].tid));
+	    H5Tclose(iter->dset_type_info[u].tid);
+	    total += iter->dset_type_info[u].count;
+	} /* end for */
+	printf("\tTotal dataset datatype count: %lu\n", total);
+    }
+
+    return 0;
+} /* print_dset_dtype_info() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: print_freespace_info
+ *
+ * Purpose: Prints information about free space in the file
+ *
+ * Return: Success: 0
+ *
+ * Failure: Never fails
+ *
+ * Programmer: Vailin Choi; July 7th, 2009
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+print_freespace_info(const iter_t *iter)
+{
+    unsigned long power;        /* Temporary "power" for bins */
+    unsigned long total;        /* Total count for various statistics */
+    unsigned u;                 /* Local index variable */
+
+    HDfprintf(stdout, "Free-space section threshold: %Hu bytes\n", iter->fs_threshold);
+    printf("Small size free-space sections (< %u bytes):\n", (unsigned)SIZE_SMALL_SECTS);
+    total = 0;
+    for(u = 0; u < SIZE_SMALL_SECTS; u++) {
+        if(iter->num_small_sects[u] > 0) {
+            printf("\t# of sections of size %u: %lu\n", u, iter->num_small_sects[u]);
+            total += iter->num_small_sects[u];
+        } /* end if */
+    } /* end for */
+    printf("\tTotal # of small size sections: %lu\n", total);
+
+    printf("Free-space section bins:\n");
+
+    total = 0;
+    power = 1;
+    for(u = 1; u < iter->sect_nbins; u++) {
+        if(iter->sect_bins[u] > 0) {
+           printf("\t# of sections of size %lu - %lu: %lu\n", power, (power * 10) - 1,
+                    iter->sect_bins[u]);
+           total += iter->sect_bins[u];
+        } /* end if */
+        power *= 10;
+    } /* end for */
+    printf("\tTotal # of sections: %lu\n", total);
+
+    return 0;
+} /* print_freespace_info() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: print_storage_summary
+ *
+ * Purpose: Prints file space information for the file
+ *
+ * Return: Success: 0
+ *
+ * Failure: Never fails
+ *
+ * Programmer: Vailin Choi; August 2009
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+print_storage_summary(const iter_t *iter)
+{
+    hsize_t total_meta = 0;
+    hsize_t unaccount = 0;
+    float   percent = 0.0;
+
+    HDfprintf(stdout, "File space management strategy: %s\n", FS_STRATEGY_NAME[iter->fs_strategy]);
+    printf("Summary of file space information:\n");
+    total_meta =
+	iter->super_size + iter->super_ext_size + iter->ublk_size +
+	iter->group_ohdr_info.total_size +
+	iter->dset_ohdr_info.total_size +
+	iter->dtype_ohdr_info.total_size +
+	iter->groups_btree_storage_size +
+	iter->groups_heap_storage_size +
+	iter->attrs_btree_storage_size +
+	iter->attrs_heap_storage_size +
+	iter->datasets_index_storage_size +
+	iter->datasets_heap_storage_size +
+	iter->SM_hdr_storage_size +
+	iter->SM_index_storage_size +
+	iter->SM_heap_storage_size +
+	iter->free_hdr;
+
+    HDfprintf(stdout, "  File metadata: %Hu bytes\n", total_meta);
+    HDfprintf(stdout, "  Raw data: %Hu bytes\n", iter->dset_storage_size);
+
+    percent = ((float)iter->free_space / (float)iter->filesize) * 100;
+    HDfprintf(stdout, "  Amount/Percent of tracked free space: %Hu bytes/%3.1f%\n",
+	    iter->free_space, percent); 
+
+    if(iter->filesize < (total_meta+iter->dset_storage_size+iter->free_space)) {
+	unaccount = (total_meta + iter->dset_storage_size + iter->free_space) - iter->filesize;
+	HDfprintf(stdout, "  ??? File has %Hu more bytes accounted for than its size! ???\n", unaccount);
+    }
+    else {
+	unaccount = iter->filesize - (total_meta + iter->dset_storage_size + iter->free_space);
+	HDfprintf(stdout, "  Unaccounted space: %Hu bytes\n", unaccount);
+    }
+
+    HDfprintf(stdout, "Total space: %Hu bytes\n", 
+	    total_meta+iter->dset_storage_size+iter->free_space+unaccount);
+
+    if(iter->nexternal)
+	HDfprintf(stdout, "External raw data: %Hu bytes\n", iter->dset_external_storage_size);
+
+
+    return 0;
+} /* print_storage_summary() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: print_file_metadata
+ *
+ * Purpose: Prints file space information for file's metadata
+ *
+ * Return: Success: 0
+ *
+ * Failure: Never fails
+ *
+ * Programmer: Elena Pourmal
+ *             Saturday, August 12, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+print_file_metadata(const iter_t *iter)
+{
+    HDfprintf(stdout, "File space information for file metadata (in bytes):\n");
+    HDfprintf(stdout, "\tSuperblock: %Hu\n", iter->super_size);
+    HDfprintf(stdout, "\tSuperblock extension: %Hu\n", iter->super_ext_size);
+    HDfprintf(stdout, "\tUser block: %Hu\n", iter->ublk_size);
+
+    HDfprintf(stdout, "\tObject headers: (total/unused)\n");
+    HDfprintf(stdout, "\t\tGroups: %Hu/%Hu\n",
+                iter->group_ohdr_info.total_size,
+		iter->group_ohdr_info.free_size);
+    HDfprintf(stdout, "\t\tDatasets(exclude compact data): %Hu/%Hu\n", 
+		iter->dset_ohdr_info.total_size,
+		iter->dset_ohdr_info.free_size);
+    HDfprintf(stdout, "\t\tDatatypes: %Hu/%Hu\n",
+                iter->dtype_ohdr_info.total_size,
+		iter->dtype_ohdr_info.free_size);
+
+    HDfprintf(stdout, "\tGroups:\n");
+    HDfprintf(stdout, "\t\tB-tree/List: %Hu\n", iter->groups_btree_storage_size);
+    HDfprintf(stdout, "\t\tHeap: %Hu\n", iter->groups_heap_storage_size);
+
+    HDfprintf(stdout, "\tAttributes:\n");
+    HDfprintf(stdout, "\t\tB-tree/List: %Hu\n", iter->attrs_btree_storage_size);
+    HDfprintf(stdout, "\t\tHeap: %Hu\n", iter->attrs_heap_storage_size);
+
+    HDfprintf(stdout, "\tChunked datasets:\n");
+    HDfprintf(stdout, "\t\tIndex: %Hu\n", iter->datasets_index_storage_size);
+
+    HDfprintf(stdout, "\tDatasets:\n");
+    HDfprintf(stdout, "\t\tHeap: %Hu\n", iter->datasets_heap_storage_size);
+
+    HDfprintf(stdout, "\tShared Messages:\n");
+    HDfprintf(stdout, "\t\tHeader: %Hu\n", iter->SM_hdr_storage_size);
+    HDfprintf(stdout, "\t\tB-tree/List: %Hu\n", iter->SM_index_storage_size);
+    HDfprintf(stdout, "\t\tHeap: %Hu\n", iter->SM_heap_storage_size);
+
+    HDfprintf(stdout, "\tFree-space managers:\n");
+    HDfprintf(stdout, "\t\tHeader: %Hu\n", iter->free_hdr);
+    HDfprintf(stdout, "\t\tAmount of free space: %Hu\n", iter->free_space);
+
+    return 0;
+} /* print_file_metadata() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: print_group_metadata
+ *
+ * Purpose: Prints file space information for groups' metadata 
+ *
+ * Return: Success: 0
+ *
+ * Failure: Never fails
+ *
+ * Programmer: Vailin Choi; October 2009
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+print_group_metadata(const iter_t *iter)
+{
+    printf("File space information for groups' metadata (in bytes):\n");
+
+    HDfprintf(stdout, "\tObject headers (total/unused): %Hu/%Hu\n",
+		iter->group_ohdr_info.total_size, iter->group_ohdr_info.free_size);
+
+    HDfprintf(stdout, "\tB-tree/List: %Hu\n", iter->groups_btree_storage_size);
+    HDfprintf(stdout, "\tHeap: %Hu\n", iter->groups_heap_storage_size);
+
+    return 0;
+} /* print_group_metadata() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: print_dataset_metadata
+ *
+ * Purpose: Prints file space information for datasets' metadata 
+ *
+ * Return: Success: 0
+ *
+ * Failure: Never fails
+ *
+ * Programmer:  Vailin Choi; October 2009
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+print_dset_metadata(const iter_t *iter)
+{
+    printf("File space information for datasets' metadata (in bytes):\n");
+
+    HDfprintf(stdout, "\tObject headers (total/unused): %Hu/%Hu\n",
+		iter->dset_ohdr_info.total_size, iter->dset_ohdr_info.free_size);
+
+    HDfprintf(stdout, "\tIndex for Chunked datasets: %Hu\n",
+		iter->datasets_index_storage_size);
+    HDfprintf(stdout, "\tHeap: %Hu\n", iter->datasets_heap_storage_size);
+
+    return 0;
+} /* print_dset_metadata() */
 
 
 /*-------------------------------------------------------------------------
@@ -1099,6 +1430,11 @@ print_dataset_info(const iter_t *iter)
  * Programmer: Elena Pourmal
  *             Saturday, August 12, 2006
  *
+ * Modifications:
+ *	Vailin Choi; October 2009
+ *	Activate "display_group_metadata", "dislay_dset_metadata" and
+ *	"display_dset_dtype_info".
+ *
  *-------------------------------------------------------------------------
  */
 static void
@@ -1106,18 +1442,31 @@ print_file_statistics(const iter_t *iter)
 {
     if(display_all) {
         display_file = TRUE;
-        display_file_metadata = TRUE;
         display_group = TRUE;
         display_dset = TRUE;
-        display_dtype_metadata = TRUE;
+	display_dset_dtype_info = TRUE;
         display_attr = TRUE;
+	display_free_sections = TRUE;
+	display_summary = TRUE;
+
+        display_file_metadata = TRUE;
+        display_group_metadata = TRUE;
+        display_dset_metadata = TRUE;
     }
 
-    if(display_file)          print_file_info(iter);
-    if(display_file_metadata) print_file_metadata(iter);
-    if(display_group)         print_group_info(iter);
-    if(display_dset)          print_dataset_info(iter);
-    if(display_attr)          print_attr_info(iter);
+    if(display_file)          	print_file_info(iter);
+    if(display_file_metadata) 	print_file_metadata(iter);
+
+    if(display_group)         	print_group_info(iter);
+    if(!display_all && display_group_metadata) 	print_group_metadata(iter);
+
+    if(display_dset)          	print_dataset_info(iter);
+    if(display_dset_dtype_info) print_dset_dtype_info(iter);
+    if(!display_all && display_dset_metadata) 	print_dset_metadata(iter);
+
+    if(display_attr)          	print_attr_info(iter);
+    if(display_free_sections) 	print_freespace_info(iter);
+    if(display_summary)       	print_storage_summary(iter);
 }
 
 
@@ -1176,8 +1525,9 @@ main(int argc, const char *argv[])
     iter_t          	iter;
     const char     	*fname = NULL;
     hid_t           	fid;
+    hid_t           	fcpl;
     struct handler_t   *hand;
-    H5F_info_t      	finfo;
+    H5F_info2_t      	finfo;
 
     /* Disable error reporting */
     H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
@@ -1203,16 +1553,37 @@ main(int argc, const char *argv[])
     /* Initialize iter structure */
     iter_init(&iter, fid);
 
-    /* Get storge info for SOHM's btree/list/heap and superblock extension */
-    if(H5Fget_info(fid, &finfo) < 0)
-	warn_msg(progname, "Unable to retrieve SOHM info\n");
+    if(H5Fget_filesize(fid, &iter.filesize) < 0)
+	warn_msg(progname, "Unable to retrieve file size\n");
+    assert(iter.filesize != 0);
+	
+    /* Get storge info for file-level structures */
+    if(H5Fget_info2(fid, &finfo) < 0)
+	warn_msg(progname, "Unable to retrieve file info\n");
     else {
-	iter.super_ext_size = finfo.super_ext_size;
+	iter.super_size = finfo.super.super_size;
+	iter.super_ext_size = finfo.super.super_ext_size;
 	iter.SM_hdr_storage_size = finfo.sohm.hdr_size;
 	iter.SM_index_storage_size = finfo.sohm.msgs_info.index_size;
 	iter.SM_heap_storage_size = finfo.sohm.msgs_info.heap_size;
+	iter.free_space = finfo.free.tot_space;
+	iter.free_hdr = finfo.free.meta_size;
     } /* end else */
 
+    if((fcpl = H5Fget_create_plist(fid)) < 0)
+	warn_msg(progname, "Unable to retrieve file creation property\n");
+
+    if(H5Pget_userblock(fcpl, &iter.ublk_size) < 0)
+        warn_msg(progname, "Unable to retrieve userblock size\n");
+
+    if(H5Pget_file_space(fcpl, &iter.fs_strategy, &iter.fs_threshold) < 0)
+        warn_msg(progname, "Unable to retrieve file space information\n");
+    assert(iter.fs_strategy != 0 && iter.fs_strategy < H5F_FILE_SPACE_NTYPES);
+
+    /* get information for free-space sections */
+    if(freespace_stats(fid, &iter) < 0)
+        warn_msg(progname, "Unable to retrieve freespace info\n");
+
     /* Walk the objects or all file */
     if(display_object) {
         unsigned u;