[svn-r22444] (1) fix for making MEM_GHEAP as MEM_DRAW

(2) fix to extend into the aggregator based on threshold
(3) fix for the "flavor" logging problem
(4) fix for test failures due to the above fixes
(5) bug fix for h5stat when h5stat against a non-existing file

5 files changed, 103 insertions, 120 deletions

diff --git a/tools/h5copy/testfiles/h5copy_ref.out.ls b/tools/h5copy/testfiles/h5copy_ref.out.ls
index 0769dc8..d685af2 100644
--- a/tools/h5copy/testfiles/h5copy_ref.out.ls
+++ b/tools/h5copy/testfiles/h5copy_ref.out.ls
@@ -21,7 +21,7 @@ Opened "./testfiles/h5copy_ref.out.h5" with sec2 driver.
     Storage:   <details removed for portability>
     Type:      object reference
 /COPY/Dset_REGREF        Dataset {2/2}
-    Location:  1:9400
+    Location:  1:5304
     Links:     1
     Storage:   <details removed for portability>
     Type:      dataset region reference
diff --git a/tools/h5copy/testfiles/h5copytst.out.ls b/tools/h5copy/testfiles/h5copytst.out.ls
index 62c860b..4044aaf 100644
--- a/tools/h5copy/testfiles/h5copytst.out.ls
+++ b/tools/h5copy/testfiles/h5copytst.out.ls
@@ -3,57 +3,57 @@ Opened "./testfiles/h5copytst.out.h5" with sec2 driver.
     Location:  1:96
     Links:     1
 /A                       Group
-    Location:  1:88336
+    Location:  1:84304
     Links:     1
 /A/B1                    Group
-    Location:  1:89040
+    Location:  1:85008
     Links:     1
 /A/B1/simple             Dataset {6/6}
-    Location:  1:88208
+    Location:  1:84176
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /A/B2                    Group
-    Location:  1:92576
+    Location:  1:88544
     Links:     1
 /A/B2/simple2            Dataset {6/6}
-    Location:  1:92448
+    Location:  1:88416
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /C                       Group
-    Location:  1:95784
+    Location:  1:91752
     Links:     1
 /C/D                     Group
-    Location:  1:96488
+    Location:  1:92456
     Links:     1
 /C/D/simple              Dataset {6/6}
-    Location:  1:95656
+    Location:  1:91624
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /E                       Group
-    Location:  1:110400
+    Location:  1:106368
     Links:     1
 /E/F                     Group
-    Location:  1:111104
+    Location:  1:107072
     Links:     1
 /E/F/grp_dsets           Group
-    Location:  1:98600
+    Location:  1:94568
     Links:     1
 /E/F/grp_dsets/chunk     Dataset {6/6}
-    Location:  1:102784
+    Location:  1:98752
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /E/F/grp_dsets/compact   Dataset {6/6}
-    Location:  1:103240
+    Location:  1:99208
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /E/F/grp_dsets/compound  Dataset {2/2}
-    Location:  1:103376
+    Location:  1:99344
     Links:     1
     Storage:   <details removed for portability>
     Type:      struct {
@@ -61,60 +61,60 @@ Opened "./testfiles/h5copytst.out.h5" with sec2 driver.
                    "str2"             +20   20-byte null-terminated ASCII string
                } 40 bytes
 /E/F/grp_dsets/compressed Dataset {6/6}
-    Location:  1:105688
+    Location:  1:101656
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   <details removed for portability>
     Filter-0:  deflate-1 OPT {1}
     Type:      32-bit little-endian integer
 /E/F/grp_dsets/named_vl  Dataset {2/2}
-    Location:  1:109952
+    Location:  1:105920
     Links:     1
     Storage:   <details removed for portability>
-    Type:      shared-1:110080 variable length of
+    Type:      shared-1:106048 variable length of
                    32-bit little-endian integer
 /E/F/grp_dsets/nested_vl Dataset {2/2}
-    Location:  1:110128
+    Location:  1:106096
     Links:     1
     Storage:   <details removed for portability>
     Type:      variable length of
                    variable length of
                        32-bit little-endian integer
 /E/F/grp_dsets/simple    Dataset {6/6}
-    Location:  1:110272
+    Location:  1:106240
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /E/F/grp_dsets/vl        Type
-    Location:  1:110080
+    Location:  1:106048
     Links:     2
-    Type:      shared-1:110080 variable length of
+    Type:      shared-1:106048 variable length of
                    32-bit little-endian integer
 /G                       Group
-    Location:  1:126048
+    Location:  1:122016
     Links:     1
 /G/H                     Group
-    Location:  1:126752
+    Location:  1:122720
     Links:     1
 /G/H/grp_nested          Group
-    Location:  1:113128
+    Location:  1:109096
     Links:     1
 /G/H/grp_nested/grp_dsets Group
-    Location:  1:113920
+    Location:  1:109888
     Links:     1
 /G/H/grp_nested/grp_dsets/chunk Dataset {6/6}
-    Location:  1:118104
+    Location:  1:114072
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /G/H/grp_nested/grp_dsets/compact Dataset {6/6}
-    Location:  1:118560
+    Location:  1:114528
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /G/H/grp_nested/grp_dsets/compound Dataset {2/2}
-    Location:  1:118696
+    Location:  1:114664
     Links:     1
     Storage:   <details removed for portability>
     Type:      struct {
@@ -122,34 +122,34 @@ Opened "./testfiles/h5copytst.out.h5" with sec2 driver.
                    "str2"             +20   20-byte null-terminated ASCII string
                } 40 bytes
 /G/H/grp_nested/grp_dsets/compressed Dataset {6/6}
-    Location:  1:121008
+    Location:  1:116976
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   <details removed for portability>
     Filter-0:  deflate-1 OPT {1}
     Type:      32-bit little-endian integer
 /G/H/grp_nested/grp_dsets/named_vl Dataset {2/2}
-    Location:  1:125272
+    Location:  1:121240
     Links:     1
     Storage:   <details removed for portability>
-    Type:      shared-1:125400 variable length of
+    Type:      shared-1:121368 variable length of
                    32-bit little-endian integer
 /G/H/grp_nested/grp_dsets/nested_vl Dataset {2/2}
-    Location:  1:125448
+    Location:  1:121416
     Links:     1
     Storage:   <details removed for portability>
     Type:      variable length of
                    variable length of
                        32-bit little-endian integer
 /G/H/grp_nested/grp_dsets/simple Dataset {6/6}
-    Location:  1:125592
+    Location:  1:121560
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /G/H/grp_nested/grp_dsets/vl Type
-    Location:  1:125400
+    Location:  1:121368
     Links:     2
-    Type:      shared-1:125400 variable length of
+    Type:      shared-1:121368 variable length of
                    32-bit little-endian integer
 /chunk                   Dataset {6/6}
     Location:  1:6312
@@ -178,21 +178,21 @@ Opened "./testfiles/h5copytst.out.h5" with sec2 driver.
     Filter-0:  deflate-1 OPT {1}
     Type:      32-bit little-endian integer
 /grp_dsets               Group
-    Location:  1:32160
+    Location:  1:28128
     Links:     1
 /grp_dsets/chunk         Dataset {6/6}
-    Location:  1:36344
+    Location:  1:32312
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /grp_dsets/compact       Dataset {6/6}
-    Location:  1:36800
+    Location:  1:32768
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /grp_dsets/compound      Dataset {2/2}
-    Location:  1:36936
+    Location:  1:32904
     Links:     1
     Storage:   <details removed for portability>
     Type:      struct {
@@ -200,62 +200,62 @@ Opened "./testfiles/h5copytst.out.h5" with sec2 driver.
                    "str2"             +20   20-byte null-terminated ASCII string
                } 40 bytes
 /grp_dsets/compressed    Dataset {6/6}
-    Location:  1:39248
+    Location:  1:35216
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   <details removed for portability>
     Filter-0:  deflate-1 OPT {1}
     Type:      32-bit little-endian integer
 /grp_dsets/named_vl      Dataset {2/2}
-    Location:  1:43512
+    Location:  1:39480
     Links:     1
     Storage:   <details removed for portability>
-    Type:      shared-1:43640 variable length of
+    Type:      shared-1:39608 variable length of
                    32-bit little-endian integer
 /grp_dsets/nested_vl     Dataset {2/2}
-    Location:  1:43688
+    Location:  1:39656
     Links:     1
     Storage:   <details removed for portability>
     Type:      variable length of
                    variable length of
                        32-bit little-endian integer
 /grp_dsets/simple        Dataset {6/6}
-    Location:  1:43832
+    Location:  1:39800
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /grp_dsets/simple_group  Dataset {6/6}
-    Location:  1:59944
+    Location:  1:55912
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /grp_dsets/vl            Type
-    Location:  1:43640
+    Location:  1:39608
     Links:     2
-    Type:      shared-1:43640 variable length of
+    Type:      shared-1:39608 variable length of
                    32-bit little-endian integer
 /grp_empty               Group
-    Location:  1:31368
+    Location:  1:27336
     Links:     1
 /grp_nested              Group
-    Location:  1:44624
+    Location:  1:40592
     Links:     1
 /grp_nested/grp_dsets    Group
-    Location:  1:45416
+    Location:  1:41384
     Links:     1
 /grp_nested/grp_dsets/chunk Dataset {6/6}
-    Location:  1:49600
+    Location:  1:45568
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /grp_nested/grp_dsets/compact Dataset {6/6}
-    Location:  1:50056
+    Location:  1:46024
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /grp_nested/grp_dsets/compound Dataset {2/2}
-    Location:  1:50192
+    Location:  1:46160
     Links:     1
     Storage:   <details removed for portability>
     Type:      struct {
@@ -263,51 +263,51 @@ Opened "./testfiles/h5copytst.out.h5" with sec2 driver.
                    "str2"             +20   20-byte null-terminated ASCII string
                } 40 bytes
 /grp_nested/grp_dsets/compressed Dataset {6/6}
-    Location:  1:52504
+    Location:  1:48472
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   <details removed for portability>
     Filter-0:  deflate-1 OPT {1}
     Type:      32-bit little-endian integer
 /grp_nested/grp_dsets/named_vl Dataset {2/2}
-    Location:  1:56768
+    Location:  1:52736
     Links:     1
     Storage:   <details removed for portability>
-    Type:      shared-1:56896 variable length of
+    Type:      shared-1:52864 variable length of
                    32-bit little-endian integer
 /grp_nested/grp_dsets/nested_vl Dataset {2/2}
-    Location:  1:56944
+    Location:  1:52912
     Links:     1
     Storage:   <details removed for portability>
     Type:      variable length of
                    variable length of
                        32-bit little-endian integer
 /grp_nested/grp_dsets/simple Dataset {6/6}
-    Location:  1:57088
+    Location:  1:53056
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /grp_nested/grp_dsets/vl Type
-    Location:  1:56896
+    Location:  1:52864
     Links:     2
-    Type:      shared-1:56896 variable length of
+    Type:      shared-1:52864 variable length of
                    32-bit little-endian integer
 /grp_rename              Group
-    Location:  1:61152
+    Location:  1:57120
     Links:     1
 /grp_rename/chunk        Dataset {6/6}
-    Location:  1:65336
+    Location:  1:61304
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /grp_rename/compact      Dataset {6/6}
-    Location:  1:65792
+    Location:  1:61760
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /grp_rename/compound     Dataset {2/2}
-    Location:  1:65928
+    Location:  1:61896
     Links:     1
     Storage:   <details removed for portability>
     Type:      struct {
@@ -315,28 +315,28 @@ Opened "./testfiles/h5copytst.out.h5" with sec2 driver.
                    "str2"             +20   20-byte null-terminated ASCII string
                } 40 bytes
 /grp_rename/compressed   Dataset {6/6}
-    Location:  1:68240
+    Location:  1:64208
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   <details removed for portability>
     Filter-0:  deflate-1 OPT {1}
     Type:      32-bit little-endian integer
 /grp_rename/grp_dsets    Group
-    Location:  1:74032
+    Location:  1:70000
     Links:     1
 /grp_rename/grp_dsets/chunk Dataset {6/6}
-    Location:  1:78216
+    Location:  1:74184
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /grp_rename/grp_dsets/compact Dataset {6/6}
-    Location:  1:78672
+    Location:  1:74640
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /grp_rename/grp_dsets/compound Dataset {2/2}
-    Location:  1:78808
+    Location:  1:74776
     Links:     1
     Storage:   <details removed for portability>
     Type:      struct {
@@ -344,73 +344,73 @@ Opened "./testfiles/h5copytst.out.h5" with sec2 driver.
                    "str2"             +20   20-byte null-terminated ASCII string
                } 40 bytes
 /grp_rename/grp_dsets/compressed Dataset {6/6}
-    Location:  1:81120
+    Location:  1:77088
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   <details removed for portability>
     Filter-0:  deflate-1 OPT {1}
     Type:      32-bit little-endian integer
 /grp_rename/grp_dsets/named_vl Dataset {2/2}
-    Location:  1:85384
+    Location:  1:81352
     Links:     1
     Storage:   <details removed for portability>
-    Type:      shared-1:85512 variable length of
+    Type:      shared-1:81480 variable length of
                    32-bit little-endian integer
 /grp_rename/grp_dsets/nested_vl Dataset {2/2}
-    Location:  1:85560
+    Location:  1:81528
     Links:     1
     Storage:   <details removed for portability>
     Type:      variable length of
                    variable length of
                        32-bit little-endian integer
 /grp_rename/grp_dsets/simple Dataset {6/6}
-    Location:  1:85704
+    Location:  1:81672
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /grp_rename/grp_dsets/vl Type
-    Location:  1:85512
+    Location:  1:81480
     Links:     2
-    Type:      shared-1:85512 variable length of
+    Type:      shared-1:81480 variable length of
                    32-bit little-endian integer
 /grp_rename/named_vl     Dataset {2/2}
-    Location:  1:72504
+    Location:  1:68472
     Links:     1
     Storage:   <details removed for portability>
-    Type:      shared-1:72632 variable length of
+    Type:      shared-1:68600 variable length of
                    32-bit little-endian integer
 /grp_rename/nested_vl    Dataset {2/2}
-    Location:  1:72680
+    Location:  1:68648
     Links:     1
     Storage:   <details removed for portability>
     Type:      variable length of
                    variable length of
                        32-bit little-endian integer
 /grp_rename/simple       Dataset {6/6}
-    Location:  1:72824
+    Location:  1:68792
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /grp_rename/vl           Type
-    Location:  1:72632
+    Location:  1:68600
     Links:     2
-    Type:      shared-1:72632 variable length of
+    Type:      shared-1:68600 variable length of
                    32-bit little-endian integer
 /named_vl                Dataset {2/2}
-    Location:  1:19296
+    Location:  1:17280
     Links:     1
     Storage:   <details removed for portability>
-    Type:      shared-1:19424 variable length of
+    Type:      shared-1:17408 variable length of
                    32-bit little-endian integer
 /nested_vl               Dataset {2/2}
-    Location:  1:25792
+    Location:  1:21760
     Links:     1
     Storage:   <details removed for portability>
     Type:      variable length of
                    variable length of
                        32-bit little-endian integer
 /rename                  Dataset {2/2}
-    Location:  1:30160
+    Location:  1:26128
     Links:     1
     Storage:   <details removed for portability>
     Type:      struct {
@@ -423,7 +423,7 @@ Opened "./testfiles/h5copytst.out.h5" with sec2 driver.
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /simple_top              Dataset {6/6}
-    Location:  1:27984
+    Location:  1:23952
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
diff --git a/tools/h5stat/h5stat.c b/tools/h5stat/h5stat.c
index 99ea688..a68760d 100644
--- a/tools/h5stat/h5stat.c
+++ b/tools/h5stat/h5stat.c
@@ -937,36 +937,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * Function: init_iter
+ * Function: iter_free
  *
- * Purpose: Initialize iter structure
- *
- * Return: Success: 0
- *
- * Failure: Never fails
- *
- * Programmer: Elena Pourmal
- *             Saturday, August 12, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-iter_init(iter_t *iter, hid_t fid)
-{
-    /* Clear everything to zeros */
-    HDmemset(iter, 0, sizeof(*iter));
-
-    /* Set the file ID for later use in callbacks */
-    iter->fid = fid;
-
-    return 0;
-} /* iter_init() */
-
-
-/*-------------------------------------------------------------------------
- * Function: free_iter
- *
- * Purpose: Freee iter structure
+ * Purpose: Free iter structure
  *
  * Return: Success: 0
  *
@@ -1610,7 +1583,7 @@ main(int argc, const char *argv[])
 {
     iter_t              iter;
     const char         *fname = NULL;
-    hid_t               fid;
+    hid_t               fid = -1;
     hid_t               fcpl;
     struct handler_t   *hand = NULL;
     H5F_info2_t         finfo;
@@ -1633,6 +1606,8 @@ main(int argc, const char *argv[])
 
     printf("Filename: %s\n", fname);
 
+    HDmemset(&iter, 0, sizeof(iter));
+
     fid = H5Fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT);
     if(fid < 0) {
         error_msg("unable to open file \"%s\"\n", fname);
@@ -1641,7 +1616,7 @@ main(int argc, const char *argv[])
     } /* end if */
 
     /* Initialize iter structure */
-    iter_init(&iter, fid);
+    iter.fid = fid;
 
     if(H5Fget_filesize(fid, &iter.filesize) < 0)
         warn_msg("Unable to retrieve file size\n");
@@ -1708,7 +1683,7 @@ done:
         /* Free iter structure */
         iter_free(&iter);
     
-        if(H5Fclose(fid) < 0) {
+        if(fid >= 0 && H5Fclose(fid) < 0) {
             error_msg("unable to close file \"%s\"\n", fname);
             h5tools_setstatus(EXIT_FAILURE);
         }
diff --git a/tools/h5stat/testfiles/h5stat_notexist.ddl b/tools/h5stat/testfiles/h5stat_notexist.ddl
new file mode 100644
index 0000000..ac0fce4
--- /dev/null
+++ b/tools/h5stat/testfiles/h5stat_notexist.ddl
@@ -0,0 +1,5 @@
+#############################
+Expected output for 'h5stat notexist.h5'
+#############################
+Filename: notexist.h5
+h5stat error: unable to open file "notexist.h5"
diff --git a/tools/h5stat/testh5stat.sh.in b/tools/h5stat/testh5stat.sh.in
index c5cb3e8..c594a97 100644
--- a/tools/h5stat/testh5stat.sh.in
+++ b/tools/h5stat/testh5stat.sh.in
@@ -77,6 +77,7 @@ $SRC_H5STAT_TESTFILES/h5stat_newgrat.h5
 LIST_OTHER_TEST_FILES="
 $SRC_H5STAT_TESTFILES/h5stat_help1.ddl
 $SRC_H5STAT_TESTFILES/h5stat_help2.ddl
+$SRC_H5STAT_TESTFILES/h5stat_notexist.ddl
 $SRC_H5STAT_TESTFILES/h5stat_filters.ddl
 $SRC_H5STAT_TESTFILES/h5stat_filters-file.ddl
 $SRC_H5STAT_TESTFILES/h5stat_filters-F.ddl
@@ -189,6 +190,8 @@ COPY_TESTFILES_TO_TESTDIR
 # Test for help flag
 TOOLTEST h5stat_help1.ddl -h
 TOOLTEST h5stat_help2.ddl --help
+# Test when h5stat a file that does not exist
+TOOLTEST h5stat_notexist.ddl notexist.h5
 
 # Test file with groups, compressed datasets, user-applied fileters, etc.
 # h5stat_filters.h5 is a copy of ../../testfiles/tfilters.h5 as of release 1.8.0-alpha4