[svn-r23975] This checkin contains--

A) Fix for HDFFV-1238:
   --Add 3 new options to allow users in setting threshold for small groups/datasets/attributes (tools/h5stat/h5stat.c)
   --Generate new test file for testing the new options (tools/h5stat/h5stat_gentest.c)
   --Add tests for the new options (tools/h5stat/testh5stat.sh.in)
   --Update expected output files (tools/h5stat/testfiles/*.ddl)
B) Fix a bug in determining maximum dimension size for 1-D dataset in dataset_stats() (tools/h5stat/h5stat.c)

10 files changed, 55 insertions, 42 deletions

diff --git a/tools/h5stat/testfiles/h5stat_filters-d.ddl b/tools/h5stat/testfiles/h5stat_filters-d.ddl
index 3cc9071..dae1f06 100644
--- a/tools/h5stat/testfiles/h5stat_filters-d.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters-d.ddl
@@ -9,10 +9,10 @@ Dataset dimension information:
 		# of dataset with rank 2: 14
 1-D Dataset information:
 	Max. dimension size of 1-D datasets: 100
-	Small 1-D datasets:
-		Total small datasets: 0
+	Small 1-D datasets (with dimension sizes 0 to 9):
+		Total # of small datasets: 0
 	1-D Dataset dimension bins:
-		# of datasets of size 100 - 999: 1
+		# of datasets with dimension size 100 - 999: 1
 		Total # of datasets: 1
 Dataset storage information:
 	Total raw data size: 8659
diff --git a/tools/h5stat/testfiles/h5stat_filters-dT.ddl b/tools/h5stat/testfiles/h5stat_filters-dT.ddl
index ae9121d..5c7a4ab 100644
--- a/tools/h5stat/testfiles/h5stat_filters-dT.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters-dT.ddl
@@ -9,10 +9,10 @@ Dataset dimension information:
 		# of dataset with rank 2: 14
 1-D Dataset information:
 	Max. dimension size of 1-D datasets: 100
-	Small 1-D datasets:
-		Total small datasets: 0
+	Small 1-D datasets (with dimension sizes 0 to 9):
+		Total # of small datasets: 0
 	1-D Dataset dimension bins:
-		# of datasets of size 100 - 999: 1
+		# of datasets with dimension size 100 - 999: 1
 		Total # of datasets: 1
 Dataset storage information:
 	Total raw data size: 8659
diff --git a/tools/h5stat/testfiles/h5stat_filters-g.ddl b/tools/h5stat/testfiles/h5stat_filters-g.ddl
index d488b8f..6cb791c 100644
--- a/tools/h5stat/testfiles/h5stat_filters-g.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters-g.ddl
@@ -2,8 +2,8 @@
 Expected output for 'h5stat -g h5stat_filters.h5'
 #############################
 Filename: h5stat_filters.h5
-Small groups:
+Small groups (with 0 to 9 links):
 	Total # of small groups: 0
 Group bins:
-	# of groups of size 10 - 99: 1
+	# of groups with 10 - 99 links: 1
 	Total # of groups: 1
diff --git a/tools/h5stat/testfiles/h5stat_filters.ddl b/tools/h5stat/testfiles/h5stat_filters.ddl
index ddafd81..0a6733d 100644
--- a/tools/h5stat/testfiles/h5stat_filters.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters.ddl
@@ -35,10 +35,10 @@ File space information for file metadata (in bytes):
 	Free-space managers:
 		Header: 0
 		Amount of free space: 0
-Small groups:
+Small groups (with 0 to 9 links):
 	Total # of small groups: 0
 Group bins:
-	# of groups of size 10 - 99: 1
+	# of groups with 10 - 99 links: 1
 	Total # of groups: 1
 Dataset dimension information:
 	Max. rank of datasets: 2
@@ -47,10 +47,10 @@ Dataset dimension information:
 		# of dataset with rank 2: 14
 1-D Dataset information:
 	Max. dimension size of 1-D datasets: 100
-	Small 1-D datasets:
-		Total small datasets: 0
+	Small 1-D datasets (with dimension sizes 0 to 9):
+		Total # of small datasets: 0
 	1-D Dataset dimension bins:
-		# of datasets of size 100 - 999: 1
+		# of datasets with dimension size 100 - 999: 1
 		Total # of datasets: 1
 Dataset storage information:
 	Total raw data size: 8659
@@ -79,7 +79,7 @@ Dataset datatype information:
 		Count (total/named) = (1/0)
 		Size (desc./elmt) = (14/4)
 	Total dataset datatype count: 15
-Small # of attributes:
+Small # of attributes (objects with 1 to 10 attributes):
 	Total # of objects with small # of attributes: 0
 Attribute bins:
 	Total # of objects with attributes: 0
diff --git a/tools/h5stat/testfiles/h5stat_help1.ddl b/tools/h5stat/testfiles/h5stat_help1.ddl
index 5665b35..d79c99f 100644
--- a/tools/h5stat/testfiles/h5stat_help1.ddl
+++ b/tools/h5stat/testfiles/h5stat_help1.ddl
@@ -9,10 +9,19 @@ Usage: h5stat [OPTIONS] file
      -f, --file            Print file information
      -F, --filemetadata    Print file space information for file's metadata
      -g, --group           Print group information
+     -l N, --links=N       Set the threshold for the # of links when printing
+                           information for small groups.  N is an integer greater
+                           than 0.  The default threshold is 10.
      -G, --groupmetadata   Print file space information for groups' metadata
      -d, --dset            Print dataset information
+     -m N, --dims=N        Set the threshold for the dimension sizes when printing
+                           information for small datasets.  N is an integer greater
+                           than 0.  The default threshold is 10.
      -D, --dsetmetadata    Print file space information for datasets' metadata
      -T, --dtypemetadata   Print datasets' datatype information
      -A, --attribute       Print attribute information
+     -a N, --numattrs=N    Set the threshold for the # of attributes when printing
+                           information for small # of attributes.  N is an integer greater
+                           than 0.  The default threshold is 10.
      -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 3fb303a..af48e3a 100644
--- a/tools/h5stat/testfiles/h5stat_help2.ddl
+++ b/tools/h5stat/testfiles/h5stat_help2.ddl
@@ -9,10 +9,19 @@ Usage: h5stat [OPTIONS] file
      -f, --file            Print file information
      -F, --filemetadata    Print file space information for file's metadata
      -g, --group           Print group information
+     -l N, --links=N       Set the threshold for the # of links when printing
+                           information for small groups.  N is an integer greater
+                           than 0.  The default threshold is 10.
      -G, --groupmetadata   Print file space information for groups' metadata
      -d, --dset            Print dataset information
+     -m N, --dims=N        Set the threshold for the dimension sizes when printing
+                           information for small datasets.  N is an integer greater
+                           than 0.  The default threshold is 10.
      -D, --dsetmetadata    Print file space information for datasets' metadata
      -T, --dtypemetadata   Print datasets' datatype information
      -A, --attribute       Print attribute information
+     -a N, --numattrs=N    Set the threshold for the # of attributes when printing
+                           information for small # of attributes.  N is an integer greater
+                           than 0.  The default threshold is 10.
      -s, --freespace       Print free space information
      -S, --summary         Print summary of file space information
diff --git a/tools/h5stat/testfiles/h5stat_newgrat-UA.ddl b/tools/h5stat/testfiles/h5stat_newgrat-UA.ddl
index 70f9a82..18f91f3 100644
--- a/tools/h5stat/testfiles/h5stat_newgrat-UA.ddl
+++ b/tools/h5stat/testfiles/h5stat_newgrat-UA.ddl
@@ -2,7 +2,7 @@
 Expected output for 'h5stat -A h5stat_newgrat.h5'
 #############################
 Filename: h5stat_newgrat.h5
-Small # of attributes:
+Small # of attributes (objects with 1 to 10 attributes):
 	Total # of objects with small # of attributes: 0
 Attribute bins:
 	# of objects with 100 - 999 attributes: 1
diff --git a/tools/h5stat/testfiles/h5stat_newgrat.ddl b/tools/h5stat/testfiles/h5stat_newgrat.ddl
index b93fa17..7d4ef91 100644
--- a/tools/h5stat/testfiles/h5stat_newgrat.ddl
+++ b/tools/h5stat/testfiles/h5stat_newgrat.ddl
@@ -33,14 +33,14 @@ File space information for file metadata (in bytes):
 		B-tree/List: 0
 		Heap: 0
 	Free-space managers:
-		Header: 1584
-		Amount of free space: 6042
-Small groups:
-	# of groups of size 0: 35000
+		Header: 180
+		Amount of free space: 132
+Small groups (with 0 to 9 links):
+	# of groups with 0 link(s): 35000
 	Total # of small groups: 35000
 Group bins:
-	# of groups of size 0: 35000
-	# of groups of size 10000 - 99999: 1
+	# of groups with 0 link: 35000
+	# of groups with 10000 - 99999 links: 1
 	Total # of groups: 35001
 Dataset dimension information:
 	Max. rank of datasets: 0
@@ -48,8 +48,8 @@ Dataset dimension information:
 		# of dataset with rank 0: 1
 1-D Dataset information:
 	Max. dimension size of 1-D datasets: 0
-	Small 1-D datasets:
-		Total small datasets: 0
+	Small 1-D datasets (with dimension sizes 0 to 9):
+		Total # of small datasets: 0
 Dataset storage information:
 	Total raw data size: 0
 	Total external raw data size: 0
@@ -74,7 +74,7 @@ Dataset datatype information:
 		Count (total/named) = (1/0)
 		Size (desc./elmt) = (14/4)
 	Total dataset datatype count: 1
-Small # of attributes:
+Small # of attributes (objects with 1 to 10 attributes):
 	Total # of objects with small # of attributes: 0
 Attribute bins:
 	# of objects with 100 - 999 attributes: 1
@@ -83,20 +83,15 @@ Attribute bins:
 Free-space section threshold: 1 bytes
 Small size free-space sections (< 10 bytes):
 	# of sections of size 1: 1
-	# of sections of size 2: 12
-	# of sections of size 3: 1
-	# of sections of size 7: 1
-	# of sections of size 8: 2
-	Total # of small size sections: 17
+	Total # of small size sections: 1
 Free-space section bins:
-	# of sections of size 1 - 9: 17
-	# of sections of size 10 - 99: 49
-	# of sections of size 100 - 999: 27
-	Total # of sections: 93
+	# of sections of size 1 - 9: 1
+	# of sections of size 10 - 99: 4
+	Total # of sections: 5
 File space management strategy: H5F_FILE_SPACE_ALL_PERSIST
 Summary of file space information:
-  File metadata: 6363440 bytes
+  File metadata: 6362036 bytes
   Raw data: 0 bytes
-  Amount/Percent of tracked free space: 6042 bytes/0.1%
+  Amount/Percent of tracked free space: 132 bytes/0.0%
   Unaccounted space: 0 bytes
-Total space: 6369482 bytes
+Total space: 6362168 bytes
diff --git a/tools/h5stat/testfiles/h5stat_newgrat.h5 b/tools/h5stat/testfiles/h5stat_newgrat.h5
index cb5f47f..c919b71 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 6ee8aa8..788421b 100644
--- a/tools/h5stat/testfiles/h5stat_tsohm.ddl
+++ b/tools/h5stat/testfiles/h5stat_tsohm.ddl
@@ -35,11 +35,11 @@ File space information for file metadata (in bytes):
 	Free-space managers:
 		Header: 0
 		Amount of free space: 0
-Small groups:
-	# of groups of size 3: 1
+Small groups (with 0 to 9 links):
+	# of groups with 3 link(s): 1
 	Total # of small groups: 1
 Group bins:
-	# of groups of size 1 - 9: 1
+	# of groups with 1 - 9 links: 1
 	Total # of groups: 1
 Dataset dimension information:
 	Max. rank of datasets: 2
@@ -47,8 +47,8 @@ Dataset dimension information:
 		# of dataset with rank 2: 3
 1-D Dataset information:
 	Max. dimension size of 1-D datasets: 0
-	Small 1-D datasets:
-		Total small datasets: 0
+	Small 1-D datasets (with dimension sizes 0 to 9):
+		Total # of small datasets: 0
 Dataset storage information:
 	Total raw data size: 0
 	Total external raw data size: 0
@@ -73,7 +73,7 @@ Dataset datatype information:
 		Count (total/named) = (3/0)
 		Size (desc./elmt) = (14/8)
 	Total dataset datatype count: 3
-Small # of attributes:
+Small # of attributes (objects with 1 to 10 attributes):
 	Total # of objects with small # of attributes: 0
 Attribute bins:
 	Total # of objects with attributes: 0