[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

11 files changed, 146 insertions, 54 deletions

diff --git a/tools/h5stat/testfiles/h5stat_filters-F.ddl b/tools/h5stat/testfiles/h5stat_filters-F.ddl
index 8f65c6d..fba875a 100644
--- a/tools/h5stat/testfiles/h5stat_filters-F.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters-F.ddl
@@ -2,11 +2,14 @@
 Expected output for 'h5stat -F h5stat_filters.h5'
 #############################
 Filename: h5stat_filters.h5
-Object header size: (total/unused)
-	Groups: 48/8
-	Datasets: 4936/1344
-	Datatypes: 80/0
-Storage information:
+File space information for file metadata (in bytes):
+	Superblock: 96
+	Superblock extension: 0
+	User block: 0
+	Object headers: (total/unused)
+		Groups: 48/8
+		Datasets(exclude compact data): 4136/1344
+		Datatypes: 80/0
 	Groups:
 		B-tree/List: 1200
 		Heap: 288
@@ -15,8 +18,12 @@ Storage information:
 		Heap: 0
 	Chunked datasets:
 		Index: 31392
+	Datasets:
+		Heap: 72
 	Shared Messages:
 		Header: 0
 		B-tree/List: 0
 		Heap: 0
-	Superblock extension: 0
+	Free-space managers:
+		Header: 0
+		Amount of free space: 0
diff --git a/tools/h5stat/testfiles/h5stat_filters-d.ddl b/tools/h5stat/testfiles/h5stat_filters-d.ddl
index 42d0de3..3cc9071 100644
--- a/tools/h5stat/testfiles/h5stat_filters-d.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters-d.ddl
@@ -15,7 +15,8 @@ Dataset dimension information:
 		# of datasets of size 100 - 999: 1
 		Total # of datasets: 1
 Dataset storage information:
-	Total raw data size: 9059
+	Total raw data size: 8659
+	Total external raw data size: 400
 Dataset layout information:
 	Dataset layout counts[COMPACT]: 1
 	Dataset layout counts[CONTIG]: 2
diff --git a/tools/h5stat/testfiles/h5stat_filters-dT.ddl b/tools/h5stat/testfiles/h5stat_filters-dT.ddl
index 2edcf7e..ae9121d 100644
--- a/tools/h5stat/testfiles/h5stat_filters-dT.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters-dT.ddl
@@ -15,7 +15,8 @@ Dataset dimension information:
 		# of datasets of size 100 - 999: 1
 		Total # of datasets: 1
 Dataset storage information:
-	Total raw data size: 9059
+	Total raw data size: 8659
+	Total external raw data size: 400
 Dataset layout information:
 	Dataset layout counts[COMPACT]: 1
 	Dataset layout counts[CONTIG]: 2
diff --git a/tools/h5stat/testfiles/h5stat_filters-file.ddl b/tools/h5stat/testfiles/h5stat_filters-file.ddl
index 7b8f47f..eddc898 100644
--- a/tools/h5stat/testfiles/h5stat_filters-file.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters-file.ddl
@@ -5,7 +5,7 @@ Filename: h5stat_filters.h5
 File information
 	# of unique groups: 1
 	# of unique datasets: 15
-	# of unique named dataypes: 1
+	# of unique named datatypes: 1
 	# of unique links: 0
 	# of unique other: 0
 	Max. # of links to object: 1
diff --git a/tools/h5stat/testfiles/h5stat_filters.ddl b/tools/h5stat/testfiles/h5stat_filters.ddl
index d070dba..ddafd81 100644
--- a/tools/h5stat/testfiles/h5stat_filters.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters.ddl
@@ -5,16 +5,19 @@ Filename: h5stat_filters.h5
 File information
 	# of unique groups: 1
 	# of unique datasets: 15
-	# of unique named dataypes: 1
+	# of unique named datatypes: 1
 	# of unique links: 0
 	# of unique other: 0
 	Max. # of links to object: 1
 	Max. # of objects in group: 16
-Object header size: (total/unused)
-	Groups: 48/8
-	Datasets: 4936/1344
-	Datatypes: 80/0
-Storage information:
+File space information for file metadata (in bytes):
+	Superblock: 96
+	Superblock extension: 0
+	User block: 0
+	Object headers: (total/unused)
+		Groups: 48/8
+		Datasets(exclude compact data): 4136/1344
+		Datatypes: 80/0
 	Groups:
 		B-tree/List: 1200
 		Heap: 288
@@ -23,11 +26,15 @@ Storage information:
 		Heap: 0
 	Chunked datasets:
 		Index: 31392
+	Datasets:
+		Heap: 72
 	Shared Messages:
 		Header: 0
 		B-tree/List: 0
 		Heap: 0
-	Superblock extension: 0
+	Free-space managers:
+		Header: 0
+		Amount of free space: 0
 Small groups:
 	Total # of small groups: 0
 Group bins:
@@ -46,7 +53,8 @@ Dataset dimension information:
 		# of datasets of size 100 - 999: 1
 		Total # of datasets: 1
 Dataset storage information:
-	Total raw data size: 9059
+	Total raw data size: 8659
+	Total external raw data size: 400
 Dataset layout information:
 	Dataset layout counts[COMPACT]: 1
 	Dataset layout counts[CONTIG]: 2
@@ -76,3 +84,16 @@ Small # of attributes:
 Attribute bins:
 	Total # of objects with attributes: 0
 	Max. # of attributes to objects: 0
+Free-space section threshold: 1 bytes
+Small size free-space sections (< 10 bytes):
+	Total # of small size sections: 0
+Free-space section bins:
+	Total # of sections: 0
+File space management strategy: H5F_FILE_SPACE_ALL
+Summary of file space information:
+  File metadata: 37312 bytes
+  Raw data: 8659 bytes
+  Amount/Percent of tracked free space: 0 bytes/0.0%
+  Unaccounted space: 301 bytes
+Total space: 46272 bytes
+External raw data: 400 bytes
diff --git a/tools/h5stat/testfiles/h5stat_help1.ddl b/tools/h5stat/testfiles/h5stat_help1.ddl
index 0a86b4c..e70fef1 100644
--- a/tools/h5stat/testfiles/h5stat_help1.ddl
+++ b/tools/h5stat/testfiles/h5stat_help1.ddl
@@ -5,13 +5,14 @@ Usage: h5stat [OPTIONS] file
 
       OPTIONS
      -h, --help            Print a usage message and exit
-     -V, --version         Print version number and exit
+     -v, --version         Print version number and exit
      -f, --file            Print file information
-     -F, --filemetadata    Print file metadata
+     -F, --FILEmetadata    Print file space information for file's metadata
      -g, --group           Print group information
-     -G, --groupmetadata   Print group metadata
+     -G, --GROUPmetadata   Print file space information for groups' metadata
      -d, --dset            Print dataset information
-     -D, --dsetmetadata    Print dataset metadata
-     -T, --dtypemetadata   Print datatype metadata
-     -A, --attribute       Print attribute information
-
+     -D, --DSETmetadata    Print file space information for datasets' metadata
+     -T, --DSETtypeinfo    Print datasets' datatype information
+     -a, --attribute       Print attribute information
+     -s, --freespace       Print free space information
+     -S, --summary         Print summary of file space information
diff --git a/tools/h5stat/testfiles/h5stat_help2.ddl b/tools/h5stat/testfiles/h5stat_help2.ddl
index e41eb9e..fbfdd14 100644
--- a/tools/h5stat/testfiles/h5stat_help2.ddl
+++ b/tools/h5stat/testfiles/h5stat_help2.ddl
@@ -5,13 +5,14 @@ Usage: h5stat [OPTIONS] file
 
       OPTIONS
      -h, --help            Print a usage message and exit
-     -V, --version         Print version number and exit
+     -v, --version         Print version number and exit
      -f, --file            Print file information
-     -F, --filemetadata    Print file metadata
+     -F, --FILEmetadata    Print file space information for file's metadata
      -g, --group           Print group information
-     -G, --groupmetadata   Print group metadata
+     -G, --GROUPmetadata   Print file space information for groups' metadata
      -d, --dset            Print dataset information
-     -D, --dsetmetadata    Print dataset metadata
-     -T, --dtypemetadata   Print datatype metadata
-     -A, --attribute       Print attribute information
-
+     -D, --DSETmetadata    Print file space information for datasets' metadata
+     -T, --DSETtypeinfo    Print datasets' datatype information
+     -a, --attribute       Print attribute information
+     -s, --freespace       Print free space information
+     -S, --summary         Print summary of file space information
diff --git a/tools/h5stat/testfiles/h5stat_idx.ddl b/tools/h5stat/testfiles/h5stat_idx.ddl
index f7e6031..2de3d96 100644
--- a/tools/h5stat/testfiles/h5stat_idx.ddl
+++ b/tools/h5stat/testfiles/h5stat_idx.ddl
@@ -5,16 +5,19 @@ Filename: h5stat_idx.h5
 File information
 	# of unique groups: 1
 	# of unique datasets: 2
-	# of unique named dataypes: 0
+	# of unique named datatypes: 0
 	# of unique links: 0
 	# of unique other: 0
 	Max. # of links to object: 1
 	Max. # of objects in group: 2
-Object header size: (total/unused)
-	Groups: 147/47
-	Datasets: 568/362
-	Datatypes: 0/0
-Storage information:
+File space information for file metadata (in bytes):
+	Superblock: 48
+	Superblock extension: 0
+	User block: 0
+	Object headers: (total/unused)
+		Groups: 147/47
+		Datasets(exclude compact data): 568/362
+		Datatypes: 0/0
 	Groups:
 		B-tree/List: 0
 		Heap: 0
@@ -23,11 +26,15 @@ Storage information:
 		Heap: 0
 	Chunked datasets:
 		Index: 202
+	Datasets:
+		Heap: 0
 	Shared Messages:
 		Header: 0
 		B-tree/List: 0
 		Heap: 0
-	Superblock extension: 0
+	Free-space managers:
+		Header: 0
+		Amount of free space: 0
 Small groups:
 	# of groups of size 2: 1
 	Total # of small groups: 1
@@ -47,6 +54,7 @@ Dataset dimension information:
 		Total # of datasets: 2
 Dataset storage information:
 	Total raw data size: 110
+	Total external raw data size: 0
 Dataset layout information:
 	Dataset layout counts[COMPACT]: 0
 	Dataset layout counts[CONTIG]: 0
@@ -73,3 +81,15 @@ Small # of attributes:
 Attribute bins:
 	Total # of objects with attributes: 0
 	Max. # of attributes to objects: 0
+Free-space section threshold: 1 bytes
+Small size free-space sections (< 10 bytes):
+	Total # of small size sections: 0
+Free-space section bins:
+	Total # of sections: 0
+File space management strategy: H5F_FILE_SPACE_ALL
+Summary of file space information:
+  File metadata: 965 bytes
+  Raw data: 110 bytes
+  Amount/Percent of tracked free space: 0 bytes/0.0%
+  Unaccounted space: 1131 bytes
+Total space: 2206 bytes
diff --git a/tools/h5stat/testfiles/h5stat_newgrat.ddl b/tools/h5stat/testfiles/h5stat_newgrat.ddl
index ce93b9c..9218a73 100644
--- a/tools/h5stat/testfiles/h5stat_newgrat.ddl
+++ b/tools/h5stat/testfiles/h5stat_newgrat.ddl
@@ -5,29 +5,36 @@ Filename: h5stat_newgrat.h5
 File information
 	# of unique groups: 35001
 	# of unique datasets: 1
-	# of unique named dataypes: 0
+	# of unique named datatypes: 0
 	# of unique links: 0
 	# of unique other: 0
 	Max. # of links to object: 1
 	Max. # of objects in group: 35001
-Object header size: (total/unused)
-	Groups: 5145147/3220092
-	Datasets: 414/312
-	Datatypes: 0/0
-Storage information:
+File space information for file metadata (in bytes):
+	Superblock: 48
+	Superblock extension: 119
+	User block: 0
+	Object headers: (total/unused)
+		Groups: 5145147/3220092
+		Datasets(exclude compact data): 414/312
+		Datatypes: 0/0
 	Groups:
 		B-tree/List: 470054
-		Heap: 739102
+		Heap: 739045
 	Attributes:
 		B-tree/List: 2598
-		Heap: 4442
+		Heap: 4431
 	Chunked datasets:
 		Index: 0
+	Datasets:
+		Heap: 0
 	Shared Messages:
 		Header: 0
 		B-tree/List: 0
 		Heap: 0
-	Superblock extension: 0
+	Free-space managers:
+		Header: 0
+		Amount of free space: 0
 Small groups:
 	# of groups of size 0: 35000
 	Total # of small groups: 35000
@@ -45,6 +52,7 @@ Dataset dimension information:
 		Total small datasets: 0
 Dataset storage information:
 	Total raw data size: 0
+	Total external raw data size: 0
 Dataset layout information:
 	Dataset layout counts[COMPACT]: 0
 	Dataset layout counts[CONTIG]: 1
@@ -72,3 +80,15 @@ Attribute bins:
 	# of objects with 100 - 999 attributes: 1
 	Total # of objects with attributes: 1
 	Max. # of attributes to objects: 100
+Free-space section threshold: 1 bytes
+Small size free-space sections (< 10 bytes):
+	Total # of small size sections: 0
+Free-space section bins:
+	Total # of sections: 0
+File space management strategy: H5F_FILE_SPACE_ALL
+Summary of file space information:
+  File metadata: 6361856 bytes
+  Raw data: 0 bytes
+  Amount/Percent of tracked free space: 0 bytes/0.0%
+  Unaccounted space: 5813 bytes
+Total space: 6367669 bytes
diff --git a/tools/h5stat/testfiles/h5stat_newgrat.h5 b/tools/h5stat/testfiles/h5stat_newgrat.h5
index 8fa406b..1db0205 100644
--- a/tools/h5stat/testfiles/h5stat_newgrat.h5
+++ b/tools/h5stat/testfiles/h5stat_newgrat.h5
diff --git a/tools/h5stat/testfiles/h5stat_tsohm.ddl b/tools/h5stat/testfiles/h5stat_tsohm.ddl
index 25e1784..c7ed5f4 100644
--- a/tools/h5stat/testfiles/h5stat_tsohm.ddl
+++ b/tools/h5stat/testfiles/h5stat_tsohm.ddl
@@ -5,16 +5,19 @@ Filename: h5stat_tsohm.h5
 File information
 	# of unique groups: 1
 	# of unique datasets: 3
-	# of unique named dataypes: 0
+	# of unique named datatypes: 0
 	# of unique links: 0
 	# of unique other: 0
 	Max. # of links to object: 1
 	Max. # of objects in group: 3
-Object header size: (total/unused)
-	Groups: 51/2
-	Datasets: 852/447
-	Datatypes: 0/0
-Storage information:
+File space information for file metadata (in bytes):
+	Superblock: 48
+	Superblock extension: 40
+	User block: 0
+	Object headers: (total/unused)
+		Groups: 51/2
+		Datasets(exclude compact data): 852/447
+		Datatypes: 0/0
 	Groups:
 		B-tree/List: 872
 		Heap: 120
@@ -23,11 +26,15 @@ Storage information:
 		Heap: 0
 	Chunked datasets:
 		Index: 0
+	Datasets:
+		Heap: 0
 	Shared Messages:
 		Header: 38
 		B-tree/List: 550
 		Heap: 1316
-	Superblock extension: 40
+	Free-space managers:
+		Header: 0
+		Amount of free space: 0
 Small groups:
 	# of groups of size 3: 1
 	Total # of small groups: 1
@@ -44,6 +51,7 @@ Dataset dimension information:
 		Total small datasets: 0
 Dataset storage information:
 	Total raw data size: 0
+	Total external raw data size: 0
 Dataset layout information:
 	Dataset layout counts[COMPACT]: 0
 	Dataset layout counts[CONTIG]: 0
@@ -70,3 +78,15 @@ Small # of attributes:
 Attribute bins:
 	Total # of objects with attributes: 0
 	Max. # of attributes to objects: 0
+Free-space section threshold: 1 bytes
+Small size free-space sections (< 10 bytes):
+	Total # of small size sections: 0
+Free-space section bins:
+	Total # of sections: 0
+File space management strategy: H5F_FILE_SPACE_ALL
+Summary of file space information:
+  File metadata: 3887 bytes
+  Raw data: 0 bytes
+  Amount/Percent of tracked free space: 0 bytes/0.0%
+  Unaccounted space: 0 bytes
+Total space: 3887 bytes