[svn-r5333] Purpose:

    Update
Description:
    Print out the other debugging statements if the debugging level is
    set higher.
Platforms tested:
    Linux

2 files changed, 13 insertions, 21 deletions

diff --git a/perform/pio_engine.c b/perform/pio_engine.c
index 5b6bcc3..9edf499 100644
--- a/perform/pio_engine.c
+++ b/perform/pio_engine.c
@@ -256,7 +256,7 @@ buf_size=MIN(1024*1024, buf_size);
         GOTOERROR(FAIL);
     }
 
-    if (pio_debug_level == 4) {
+    if (pio_debug_level >= 4) {
         /* output all of the times for all iterations */
         output_report(output, "Timer details:\n");
     }
@@ -278,11 +278,10 @@ fprintf(stderr, "filename=%s\n", fname);
 
         set_time(res.timers, HDF5_GROSS_WRITE_FIXED_DIMS, START);
 
-        if (pio_debug_level == 4) {
+        if (pio_debug_level >= 4)
             /* output all of the times for all iterations */
             fprintf(output, "    Proc %d: Gross Write Start: %.2f\n",
                     myrank, get_time(res.timers, HDF5_GROSS_WRITE_FIXED_DIMS));
-        }
 
         hrc = do_fopen(iot, fname, &fd, PIO_CREATE | PIO_WRITE);
 
@@ -290,20 +289,18 @@ fprintf(stderr, "filename=%s\n", fname);
 
         set_time(res.timers, HDF5_FINE_WRITE_FIXED_DIMS, START);
 
-        if (pio_debug_level == 4) {
+        if (pio_debug_level >= 4)
             /* output all of the times for all iterations */
             fprintf(output, "    Proc %d: Fine Write Start: %.2f\n",
                     myrank, get_time(res.timers, HDF5_FINE_WRITE_FIXED_DIMS));
-        }
 
         hrc = do_write(&fd, iot, ndsets, nelmts, buf_size, buffer);
         set_time(res.timers, HDF5_FINE_WRITE_FIXED_DIMS, STOP);
 
-        if (pio_debug_level == 4) {
+        if (pio_debug_level >= 4)
             /* output all of the times for all iterations */
             fprintf(output, "    Proc %d: Fine Write Stop: %.2f\n",
                     myrank, get_time(res.timers, HDF5_FINE_WRITE_FIXED_DIMS));
-        }
 
         VRFY((hrc == SUCCESS), "do_write failed");
 
@@ -312,11 +309,10 @@ fprintf(stderr, "filename=%s\n", fname);
 
         set_time(res.timers, HDF5_GROSS_WRITE_FIXED_DIMS, STOP);
 
-        if (pio_debug_level == 4) {
+        if (pio_debug_level >= 4)
             /* output all of the times for all iterations */
             fprintf(output, "    Proc %d: Gross Write Stop: %.2f\n",
                     myrank, get_time(res.timers, HDF5_GROSS_WRITE_FIXED_DIMS));
-        }
 
         VRFY((hrc == SUCCESS), "do_fclose failed");
 
@@ -328,11 +324,10 @@ fprintf(stderr, "filename=%s\n", fname);
         /* Open file for read */
         set_time(res.timers, HDF5_GROSS_READ_FIXED_DIMS, START);
 
-        if (pio_debug_level == 4) {
+        if (pio_debug_level >= 4)
             /* output all of the times for all iterations */
             fprintf(output, "    Proc %d: Gross Read Start: %.2f\n",
                     myrank, get_time(res.timers, HDF5_GROSS_READ_FIXED_DIMS));
-        }
 
         hrc = do_fopen(iot, fname, &fd, PIO_READ);
 
@@ -340,20 +335,18 @@ fprintf(stderr, "filename=%s\n", fname);
 
         set_time(res.timers, HDF5_FINE_READ_FIXED_DIMS, START);
 
-        if (pio_debug_level == 4) {
+        if (pio_debug_level >= 4)
             /* output all of the times for all iterations */
             fprintf(output, "    Proc %d: Fine Read Start: %.2f\n",
                     myrank, get_time(res.timers, HDF5_FINE_READ_FIXED_DIMS));
-        }
 
         hrc = do_read(&fd, iot, ndsets, nelmts, buf_size, buffer);
         set_time(res.timers, HDF5_FINE_READ_FIXED_DIMS, STOP);
 
-        if (pio_debug_level == 4) {
+        if (pio_debug_level >= 4)
             /* output all of the times for all iterations */
             fprintf(output, "    Proc %d: Fine Read Stop: %.2f\n",
                     myrank, get_time(res.timers, HDF5_FINE_READ_FIXED_DIMS));
-        }
 
         VRFY((hrc == SUCCESS), "do_read failed");
 
@@ -362,11 +355,10 @@ fprintf(stderr, "filename=%s\n", fname);
 
         set_time(res.timers, HDF5_GROSS_READ_FIXED_DIMS, STOP);
 
-        if (pio_debug_level == 4) {
+        if (pio_debug_level >= 4)
             /* output all of the times for all iterations */
             fprintf(output, "    Proc %d: Gross Read Stop: %.2f\n",
                     myrank, get_time(res.timers, HDF5_GROSS_READ_FIXED_DIMS));
-        }
 
         VRFY((hrc == SUCCESS), "do_fclose failed");
 
diff --git a/perform/pio_perf.c b/perform/pio_perf.c
index de47dc1..f58146b 100644
--- a/perform/pio_perf.c
+++ b/perform/pio_perf.c
@@ -499,7 +499,7 @@ run_test(FILE *output, iotype iot, parameters parms)
     }
 
     /* accumulate and output the max, min, and average "write" times */
-    if (pio_debug_level == 3) {
+    if (pio_debug_level >= 3) {
         /* output all of the times for all iterations */
         print_indent(output, 3);
         output_report(output, "Write details:\n");
@@ -520,7 +520,7 @@ run_test(FILE *output, iotype iot, parameters parms)
                   total_mm.sum / total_mm.num);
 
     /* accumulate and output the max, min, and average "gross write" times */
-    if (pio_debug_level == 3) {
+    if (pio_debug_level >= 3) {
         /* output all of the times for all iterations */
         print_indent(output, 3);
         output_report(output, "Write Open-Close details:\n");
@@ -541,7 +541,7 @@ run_test(FILE *output, iotype iot, parameters parms)
                   total_mm.sum / total_mm.num);
 
     /* accumulate and output the max, min, and average "read" times */
-    if (pio_debug_level == 3) {
+    if (pio_debug_level >= 3) {
         /* output all of the times for all iterations */
         print_indent(output, 3);
         output_report(output, "Read details:\n");
@@ -562,7 +562,7 @@ run_test(FILE *output, iotype iot, parameters parms)
                   total_mm.sum / total_mm.num);
 
     /* accumulate and output the max, min, and average "gross read" times */
-    if (pio_debug_level == 3) {
+    if (pio_debug_level >= 3) {
         /* output all of the times for all iterations */
         print_indent(output, 3);
         output_report(output, "Read Open-Close details:\n");