[svn-r6182] ./hdf5-devel/tools/testfiles/tcomp-1.ls

Purpose:
    New Feature; Optimization; Clean-up
    (Merged from 1.4 branch)

Description:
    There is no symbolic constant to pass to functions that take an
    optional object ID for when the caller wants to indicate no object
    ID. In the past the caller always passed a negative integer.

    GPFS performs poorly.

    The h5ls tool decides whether to list the file name in the output
    based on a compile-time choice, which isn't always optimal at run
    time.

Solution:
    Added a symbolic constant H5I_INVALID_HID.

    Added code to tell the mmfsd of GPFS to forego byte range token
    prefetching.

    h5ls decides whether to print the file name at runtime based on
    the number of objects being listed.

Platforms tested:
    SuSE Linux (arborea), gcc and mpich-1.2.4
    SunOS (baldric), gcc

1 files changed, 10 insertions, 10 deletions

diff --git a/tools/testfiles/tcomp-1.ls b/tools/testfiles/tcomp-1.ls
index c26f616..599fe68 100644
--- a/tools/testfiles/tcomp-1.ls
+++ b/tools/testfiles/tcomp-1.ls
@@ -1,15 +1,15 @@
 #############################
  output for 'h5ls -w80 -r -d tcompound.h5'
 #############################
-/tcompound.h5/dset1      Dataset {5}
+/dset1                   Dataset {5}
     Data:
         (0) {0, 0, 1}, {1, 1, 0.5}, {2, 4, 0.333333333333333}, {3, 9, 0.25},
         (4) {4, 16, 0.2}
-/tcompound.h5/group1     Group
-/tcompound.h5/group1/dset2 Dataset {5}
+/group1                  Group
+/group1/dset2            Dataset {5}
     Data:
         (0) {0, 0}, {1, 1.1}, {2, 2.2}, {3, 3.3}, {4, 4.4}
-/tcompound.h5/group1/dset3 Dataset {3, 6}
+/group1/dset3            Dataset {3, 6}
     Data:
         (0,0) {[0,1,2,3], [1,2,3,4,5,6,2,3,4,5,6,7,3,4,5,6,7,8,4,5,6,7,8,9,5,6,
         (0,0)  7,8,9,10]},
@@ -47,13 +47,13 @@
         (2,4)  11,12,13,14,15,11,12,13,14,15,16]},
         (2,5) {[7,8,9,10], [8,9,10,11,12,13,9,10,11,12,13,14,10,11,12,13,14,15,
         (2,5)  11,12,13,14,15,16,12,13,14,15,16,17]}
-/tcompound.h5/group1/dset4 Dataset {5}
+/group1/dset4            Dataset {5}
     Data:
         (0) {0, 3}, {1, 4}, {2, 5}, {3, 6}, {4, 7}
-/tcompound.h5/group1/type3 Type
-/tcompound.h5/group2     Group
-/tcompound.h5/group2/dset5 Dataset {5}
+/group1/type3            Type
+/group2                  Group
+/group2/dset5            Dataset {5}
     Data:
         (0) {0, 0}, {1, 0.1}, {2, 0.2}, {3, 0.3}, {4, 0.4}
-/tcompound.h5/type1      Type
-/tcompound.h5/type2      Type
+/type1                   Type
+/type2                   Type