[svn-r5463] Description:

    Folded the changes made in v1.4 into v1.5.
    print library version information in help page too.
    Specify the nofill feature supported in v1.5 only.
    Print the values of the KB, MB and GB in case a user wants to see them.
    Setup a macro, H5_HAVE_NOFILL, to indicate if Dataset no fill feature
    is supported.  If not, --no-fill is an invalid option.
Platforms tested:
    modi4

1 files changed, 12 insertions, 5 deletions

diff --git a/perform/pio_perf.c b/perform/pio_perf.c
index e44e2b8..72bfd06 100644
--- a/perform/pio_perf.c
+++ b/perform/pio_perf.c
@@ -1051,7 +1051,13 @@ parse_command_line(int argc, char *argv[])
             cl_opts->num_iters = atoi(opt_arg);
             break;
         case 'n':       /* Turn off writing fill values */
+#ifdef H5_HAVE_NOFILL
             cl_opts->h5_no_fill = 1;
+#else
+	    fprintf(stderr, "pio_perf: --no-fill not supported\n");
+            usage(progname);
+	    exit(1);
+#endif
             break;
         case 'o':
             cl_opts->output_file = opt_arg;
@@ -1147,7 +1153,7 @@ usage(const char *prog)
     MPI_Comm_rank(pio_comm_g, &myrank);
 
     if (myrank == 0) {
-        fflush(stdout);
+	print_version(prog);
         printf("usage: %s [OPTIONS]\n", prog);
         printf("  OPTIONS\n");
         printf("     -h, --help                  Print a usage message and exit\n");
@@ -1164,6 +1170,7 @@ usage(const char *prog)
         printf("     -F N, --num-files=N         Number of files [default: 1]\n");
         printf("     -i, --num-iterations        Number of iterations to perform [default: 1]\n");
         printf("     -n, --no-fill               Don't write fill values to HDF5 dataset\n");
+        printf("                                 (Supported in HDF5 library v1.5 only)\n");
         printf("                                 [default: off (i.e. write fill values)]\n");
         printf("     -o F, --output=F            Output raw data into file F [default: none]\n");
         printf("     -P N, --max-num-processes=N Maximum number of processes to use\n");
@@ -1177,11 +1184,11 @@ usage(const char *prog)
         printf("  F  - is a filename.\n");
         printf("  N  - is an integer >=0.\n");
         printf("  S  - is a size specifier, an integer >=0 followed by a size indicator:\n");
-        printf("          K - Kilobyte\n");
-        printf("          M - Megabyte\n");
-        printf("          G - Gigabyte\n");
+        printf("          K - Kilobyte (%d)\n", ONE_KB);
+        printf("          M - Megabyte (%d)\n", ONE_MB);
+        printf("          G - Gigabyte (%d)\n", ONE_GB);
         printf("\n");
-        printf("      Example: 37M = 37 Megabytes\n");
+        printf("      Example: 37M = 37 Megabytes = %d bytes\n", 37*ONE_MB);
         printf("\n");
         printf("  AL - is an API list. Valid values are:\n");
         printf("          phdf5 - Parallel HDF5\n");