[svn-r17582] Description:

	Bring changes from file free space branch back to the trunk.  *yay!*

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.5.8 (amazon) in debug mode
        Mac OS X/32 10.5.8 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode

9 files changed, 90 insertions, 35 deletions

diff --git a/tools/h5stat/testfiles/h5stat_filters-F.ddl b/tools/h5stat/testfiles/h5stat_filters-F.ddl
index 6bc6cc2..78c7c5a 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:
+Storage information (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
@@ -14,9 +17,13 @@ Storage information:
 		B-tree/List: 0
 		Heap: 0
 	Chunked datasets:
-		B-tree: 31392
+		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.ddl b/tools/h5stat/testfiles/h5stat_filters.ddl
index f9adebd..6ce04fe 100644
--- a/tools/h5stat/testfiles/h5stat_filters.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters.ddl
@@ -10,11 +10,14 @@ File information
 	# 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:
+Storage information (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
@@ -22,12 +25,16 @@ Storage information:
 		B-tree/List: 0
 		Heap: 0
 	Chunked datasets:
-		B-tree: 31392
+		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,7 @@ Small # of attributes:
 Attribute bins:
 	Total # of objects with attributes: 0
 	Max. # of attributes to objects: 0
+Small size free-space sections (< 10 bytes):
+	Total # of small size sections: 0
+Free-space section bins:
+	Total # of sections: 0
diff --git a/tools/h5stat/testfiles/h5stat_help1.ddl b/tools/h5stat/testfiles/h5stat_help1.ddl
index 0a86b4c..5808c49 100644
--- a/tools/h5stat/testfiles/h5stat_help1.ddl
+++ b/tools/h5stat/testfiles/h5stat_help1.ddl
@@ -14,4 +14,5 @@ Usage: h5stat [OPTIONS] file
      -D, --dsetmetadata    Print dataset metadata
      -T, --dtypemetadata   Print datatype metadata
      -A, --attribute       Print attribute information
-
+     -s, --freespace       Print free-space information
+     -S, --Summary         Print summary of storage information
diff --git a/tools/h5stat/testfiles/h5stat_help2.ddl b/tools/h5stat/testfiles/h5stat_help2.ddl
index e41eb9e..169787f 100644
--- a/tools/h5stat/testfiles/h5stat_help2.ddl
+++ b/tools/h5stat/testfiles/h5stat_help2.ddl
@@ -14,4 +14,5 @@ Usage: h5stat [OPTIONS] file
      -D, --dsetmetadata    Print dataset metadata
      -T, --dtypemetadata   Print datatype metadata
      -A, --attribute       Print attribute information
-
+     -s, --freespace       Print free-space information
+     -S, --Summary         Print summary of storage information
diff --git a/tools/h5stat/testfiles/h5stat_newgrat.ddl b/tools/h5stat/testfiles/h5stat_newgrat.ddl
index 4f9bcac..877e55a 100644
--- a/tools/h5stat/testfiles/h5stat_newgrat.ddl
+++ b/tools/h5stat/testfiles/h5stat_newgrat.ddl
@@ -10,24 +10,31 @@ File information
 	# 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:
+Storage information (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:
-		B-tree: 0
+		Index: 0
+	Datasets:
+		Heap: 0
 	Shared Messages:
 		Header: 0
 		B-tree/List: 0
 		Heap: 0
-	Superblock extension: 0
+	Free-space managers:
+		Header: 1350
+		Amount of free space: 4463
 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
+Small size free-space sections (< 10 bytes):
+	# of sections of size 1: 1
+	# of sections of size 2: 12
+	# of sections of size 3: 3
+	# of sections of size 7: 1
+	# of sections of size 8: 2
+	Total # of small size sections: 19
+Free-space section bins:
+	# of sections of size 1 - 9: 19
+	# of sections of size 10 - 99: 44
+	# of sections of size 100 - 999: 18
+	Total # of sections: 81
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 e536c33..a53e40c 100644
--- a/tools/h5stat/testfiles/h5stat_tsohm.ddl
+++ b/tools/h5stat/testfiles/h5stat_tsohm.ddl
@@ -10,11 +10,14 @@ File information
 	# 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:
+Storage information (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
@@ -22,12 +25,16 @@ Storage information:
 		B-tree/List: 0
 		Heap: 0
 	Chunked datasets:
-		B-tree: 0
+		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,7 @@ Small # of attributes:
 Attribute bins:
 	Total # of objects with attributes: 0
 	Max. # of attributes to objects: 0
+Small size free-space sections (< 10 bytes):
+	Total # of small size sections: 0
+Free-space section bins:
+	Total # of sections: 0