[svn-r1240] Changes since 19990427

----------------------

./tools/h5ls.c
	Added a `--address' (`-a') switch which causes h5ls to display
	file addresses for raw data. For contiguous datasets it's just
	a nice simple number, but for chunked datasets it's a list of
	logical dataset coordinates, file addresses, filter masks, and
	storage sizes.

	Changed `--dump' switch to `--data'.

./src/H5D.c
./src/H5F.c
./src/H5Fprivate.h
	Enhanced the indexed-storage B-tree iterator so it can dump
	raw data addresses (and other info) to the standard error
	stream.

	Added H5Ddebug() so h5ls has a way to dump addresses for
	datasets. I'm not sure what else this API function should do,
	so I think we should discuss it before we document it. So far,
	h5ls is the only thing that uses it, and we can easily change
	that.

./src/H5Tconv.c
./test/dtypes.c
	Finally had a chance to verify Paul's H5T_conv_s_s (general
	string to string conversions) bug fixes and incorporate them
	into H5T_conv_f_f (general floating-point to floating-point
	conversions) and H5T_conv_i_i (general integer to integer
	conversons). Thanks Paul.

./src/H5D.c
./src/H5S.c
./src/H5Sprivate.h
	Added performance timers around data space read and write
	callbacks. They were already there for the gather/scatter
	callbacks.

	The timings for read/write callbacks are displayed along with
	gather/scatter when data space debugging is turned on.

./bin/iostats
	Updated to print totals. Added a `--fast' option that doesn't
	do any output except the totals and is much faster.

./bin/trace
	Changed __unused__ to UNUSED to match source code.

./config/gnu-flags
	Updated error message for pgcc. I've sent bug reports to the
	pgcc people but the new version still has the same bug.

./configure.in
./config/conclude.in
./config/depend.in
	Fixed dependencies for non-GNU makes when run in a directory
	other than the hdf5 source tree.

	Updated GNU `make dep' rules to copy the distributed
	dependencies for non-GNU makes into the source tree when run
	in some other directory.

1 files changed, 18 insertions, 8 deletions

diff --git a/tools/h5ls.c b/tools/h5ls.c
index 6073738..6dc1ed5 100644
--- a/tools/h5ls.c
+++ b/tools/h5ls.c
@@ -18,7 +18,8 @@
 /* Command-line switches */
 static int verbose_g = 0;		/*lots of extra output		     */
 static int width_g = 80;		/*output width in characters	     */
-static hbool_t dump_g = FALSE;		/*display dataset values?	     */
+static hbool_t address_g = FALSE;	/*print raw data addresses	     */
+static hbool_t data_g = FALSE;		/*display dataset values?	     */
 static hbool_t label_g = FALSE;		/*label compound values?	     */
 static hbool_t string_g = FALSE;	/*print 1-byte numbers as ASCII?     */
 static hbool_t fullname_g = FALSE;	/*print full path names		     */
@@ -83,7 +84,8 @@ usage (const char *progname)
 usage: %s [OPTIONS] FILE [OBJECTS...]\n\
    OPTIONS\n\
       -h, -?, --help   Print a usage message and exit\n\
-      -d, --dump       Print the values of datasets\n\
+      -a, --address    Print addresses for raw data\n\
+      -d, --data       Print the values of datasets\n\
       -f, --full       Print full path names instead of base names\n\
       -g, --group      Show information about a group, not its contents\n\
       -l, --label      Label members of compound datasets\n\
@@ -1312,13 +1314,16 @@ dataset_list2(hid_t dset, const char UNUSED *name)
 	display_type(type, 15);
 	printf("\n");
 
+	/* Print address information */
+	if (address_g) H5Ddebug(dset, 0);
+
 	/* Close stuff */
 	H5Tclose(type);
 	H5Sclose(space);
 	H5Pclose(dcpl);
     }
 
-    if (dump_g) dump_dataset_values(dset);
+    if (data_g) dump_dataset_values(dset);
     return 0;
 }
 
@@ -1402,7 +1407,7 @@ datatype_list2(hid_t type, const char UNUSED *name)
 static herr_t
 ragged_list2(hid_t UNUSED ra, const char UNUSED *name)
 {
-    if (dump_g) {
+    if (data_g) {
 	puts("    Data:      Not implemented yet (see values of member");
 	puts("               datasets `raw', `over', and `meta')");
     }
@@ -1752,10 +1757,12 @@ main (int argc, char *argv[])
 	} else if (!strcmp(argv[argno], "--help")) {
 	    usage(progname);
 	    exit(0);
+	} else if (!strcmp(argv[argno], "--address")) {
+	    address_g = TRUE;
 	} else if (!strcmp(argv[argno], "--group")) {
 	    grp_literal_g = TRUE;
-	} else if (!strcmp(argv[argno], "--dump")) {
-	    dump_g = TRUE;
+	} else if (!strcmp(argv[argno], "--data")) {
+	    data_g = TRUE;
 	} else if (!strcmp(argv[argno], "--full")) {
 	    fullname_g = TRUE;
 	} else if (!strcmp(argv[argno], "--label")) {
@@ -1799,8 +1806,11 @@ main (int argc, char *argv[])
 		case 'h':	/* --help */
 		    usage(progname);
 		    exit(0);
-		case 'd':	/* --dump */
-		    dump_g++;
+		case 'a':	/* --address */
+		    address_g = TRUE;
+		    break;
+		case 'd':	/* --data */
+		    data_g = TRUE;
 		    break;
 		case 'f':	/* --full */
 		    fullname_g = TRUE;