[svn-r21985] Tools must call h5tools_init before command_line parsing or using tools_mesg functions.

Tools library uses alais variables for stdout, stderr and tools library uses HDfprintf() functions.

Tested: local linux

2 files changed, 41 insertions, 31 deletions

diff --git a/perform/pio_perf.c b/perform/pio_perf.c
index 411fb12..9cbd65d 100644
--- a/perform/pio_perf.c
+++ b/perform/pio_perf.c
@@ -288,14 +288,14 @@ struct options {
     unsigned interleaved;       /* Interleaved vs. contiguous blocks    */
     unsigned collective;        /* Collective vs. independent I/O       */
     unsigned dim2d;             /* 1D vs. 2D geometry                   */
-    int print_times;       	/* print times as well as throughputs   */
-    int print_raw;         	/* print raw data throughput info       */
+    int print_times;         /* print times as well as throughputs   */
+    int print_raw;           /* print raw data throughput info       */
     off_t h5_alignment;         /* alignment in HDF5 file               */
     off_t h5_threshold;         /* threshold for alignment in HDF5 file */
-    int h5_use_chunks;     	/* Make HDF5 dataset chunked            */
-    int h5_write_only;        	/* Perform the write tests only         */
+    int h5_use_chunks;       /* Make HDF5 dataset chunked            */
+    int h5_write_only;          /* Perform the write tests only         */
     unsigned h5_use_mpi_posix;  /* Use MPI-posix VFD for HDF5 I/O (instead of MPI-I/O VFD) */
-    int verify;        		/* Verify data correctness              */
+    int verify;            /* Verify data correctness              */
 };
 
 typedef struct _minmax {
@@ -339,6 +339,11 @@ main(int argc, char **argv)
     int exit_value = EXIT_SUCCESS;
     struct options *opts = NULL;
 
+#ifndef STANDALONE
+    /* Initialize h5tools lib */
+    h5tools_init();
+#endif
+
     output = stdout;
 
     /* initialize MPI and get the maximum num of processors we started with */
@@ -678,7 +683,7 @@ run_test(iotype iot, parameters parms, struct options *opts)
     /*
      * Show various statistics
      */
-    /* Write statistics	*/
+    /* Write statistics  */
     /* Print the raw data throughput if desired */
     if (opts->print_raw) {
         /* accumulate and output the max, min, and average "raw write" times */
@@ -744,7 +749,7 @@ run_test(iotype iot, parameters parms, struct options *opts)
     }
 
     if (!parms.h5_write_only) {
-        /* Read statistics	*/
+        /* Read statistics  */
         /* Print the raw data throughput if desired */
         if (opts->print_raw) {
             /* accumulate and output the max, min, and average "raw read" times */
@@ -1098,10 +1103,10 @@ print_indent(register int indent)
     MPI_Comm_rank(pio_comm_g, &myrank);
 
     if (myrank == 0) {
-	indent *= TAB_SPACE;
+  indent *= TAB_SPACE;
 
-	for (; indent > 0; --indent)
-	    fputc(' ', output);
+  for (; indent > 0; --indent)
+      fputc(' ', output);
     }
 }
 
@@ -1126,11 +1131,11 @@ static void
 print_io_api(long io_types)
 {
     if (io_types & PIO_POSIX)
-	HDfprintf(output, "posix ");
+  HDfprintf(output, "posix ");
     if (io_types & PIO_MPI)
-	HDfprintf(output, "mpiio ");
+  HDfprintf(output, "mpiio ");
     if (io_types & PIO_HDF5)
-	HDfprintf(output, "phdf5 ");
+  HDfprintf(output, "phdf5 ");
     HDfprintf(output, "\n");
 }
 
@@ -1139,7 +1144,7 @@ report_parameters(struct options *opts)
 {
     int rank = comm_world_rank_g;
 
-    print_version("HDF5 Library");	/* print library version */
+    print_version("HDF5 Library");  /* print library version */
     HDfprintf(output, "rank %d: ==== Parameters ====\n", rank);
 
     HDfprintf(output, "rank %d: IO API=", rank);
@@ -1560,7 +1565,7 @@ parse_size_directive(const char *size)
  * Return:      Nothing
  * Programmer:  Bill Wendling, 31. October 2001
  * Modifications:
- * 	Added 2D testing (Christian Chilan, 10. August 2005)
+ *   Added 2D testing (Christian Chilan, 10. August 2005)
  */
 static void
 usage(const char *prog)
@@ -1570,7 +1575,7 @@ usage(const char *prog)
     MPI_Comm_rank(pio_comm_g, &myrank);
 
     if (myrank == 0) {
-	print_version(prog);
+  print_version(prog);
         printf("usage: %s [OPTIONS]\n", prog);
         printf("  OPTIONS\n");
         printf("     -h, --help                  Print a usage message and exit\n");
diff --git a/perform/sio_perf.c b/perform/sio_perf.c
index d852a45..8900e2e 100644
--- a/perform/sio_perf.c
+++ b/perform/sio_perf.c
@@ -295,15 +295,15 @@ struct options {
     int buf_rank;             /* Rank                   */
     int order_rank;             /* Rank                   */
     int chk_rank;             /* Rank                   */
-    int print_times;       	/* print times as well as throughputs   */
-    int print_raw;         	/* print raw data throughput info       */
+    int print_times;         /* print times as well as throughputs   */
+    int print_raw;           /* print raw data throughput info       */
     off_t h5_alignment;         /* alignment in HDF5 file               */
     off_t h5_threshold;         /* threshold for alignment in HDF5 file */
-    int h5_use_chunks;     	/* Make HDF5 dataset chunked            */
-    int h5_write_only;        	/* Perform the write tests only         */
-    int h5_extendable;        	/* Perform the write tests only         */
+    int h5_use_chunks;       /* Make HDF5 dataset chunked            */
+    int h5_write_only;          /* Perform the write tests only         */
+    int h5_extendable;          /* Perform the write tests only         */
     unsigned h5_use_mpi_posix;  /* Use MPI-posix VFD for HDF5 I/O (instead of MPI-I/O VFD) */
-    int verify;        		/* Verify data correctness              */
+    int verify;            /* Verify data correctness              */
     vfdtype     vfd;            /* File driver */
 
 };
@@ -343,6 +343,11 @@ main(int argc, char **argv)
     int exit_value = EXIT_SUCCESS;
     struct options *opts = NULL;
 
+#ifndef STANDALONE
+    /* Initialize h5tools lib */
+    h5tools_init();
+#endif
+    
     output = stdout;
 
     opts = parse_command_line(argc, argv);
@@ -553,7 +558,7 @@ run_test(iotype iot, parameters parms, struct options *opts)
     /*
      * Show various statistics
      */
-    /* Write statistics	*/
+    /* Write statistics  */
     /* Print the raw data throughput if desired */
     if (opts->print_raw) {
         /* accumulate and output the max, min, and average "raw write" times */
@@ -599,7 +604,7 @@ run_test(iotype iot, parameters parms, struct options *opts)
     output_results(opts,"Write Open-Close",write_gross_mm_table,parms.num_iters,raw_size);
 
     if (!parms.h5_write_only) {
-        /* Read statistics	*/
+        /* Read statistics  */
         /* Print the raw data throughput if desired */
         if (opts->print_raw) {
             /* accumulate and output the max, min, and average "raw read" times */
@@ -810,10 +815,10 @@ output_report(const char *fmt, ...)
 static void
 print_indent(register int indent)
 {
-	indent *= TAB_SPACE;
+  indent *= TAB_SPACE;
 
-	for (; indent > 0; --indent)
-	    fputc(' ', output);
+  for (; indent > 0; --indent)
+      fputc(' ', output);
 }
 
 static void
@@ -837,9 +842,9 @@ static void
 print_io_api(long io_types)
 {
     if (io_types & SIO_POSIX)
-	HDfprintf(output, "posix ");
+  HDfprintf(output, "posix ");
     if (io_types & SIO_HDF5)
-	HDfprintf(output, "hdf5 ");
+  HDfprintf(output, "hdf5 ");
     HDfprintf(output, "\n");
 }
 
@@ -849,7 +854,7 @@ report_parameters(struct options *opts)
     int i, rank;
     rank = opts->dset_rank;
 
-    print_version("HDF5 Library");	/* print library version */
+    print_version("HDF5 Library");  /* print library version */
     HDfprintf(output, "==== Parameters ====\n");
 
     HDfprintf(output, "IO API=");
@@ -1343,7 +1348,7 @@ parse_size_directive(const char *size)
 static void
 usage(const char *prog)
 {
-	print_version(prog);
+  print_version(prog);
         printf("usage: %s [OPTIONS]\n", prog);
         printf("  OPTIONS\n");
         printf("     -h                Print an usage message and exit\n");