From 3fa119253b4bf22a4bbc21e8e36848c390e0d3f2 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Tue, 11 Oct 2011 08:49:40 -0500 Subject: [svn-r21513] Add HDprefix and change when pio_timer.h is included Tested --- perform/pio_perf.c | 6 +++--- perform/pio_timer.c | 6 +++--- test/h5test.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/perform/pio_perf.c b/perform/pio_perf.c index d3e2531..411fb12 100644 --- a/perform/pio_perf.c +++ b/perform/pio_perf.c @@ -1312,11 +1312,11 @@ parse_command_line(int argc, char *argv[]) if (isalnum(*end) && i < 10) buf[i++] = *end; - if (!strcasecmp(buf, "phdf5")) { + if (!HDstrcasecmp(buf, "phdf5")) { cl_opts->io_types |= PIO_HDF5; - } else if (!strcasecmp(buf, "mpiio")) { + } else if (!HDstrcasecmp(buf, "mpiio")) { cl_opts->io_types |= PIO_MPI; - } else if (!strcasecmp(buf, "posix")) { + } else if (!HDstrcasecmp(buf, "posix")) { cl_opts->io_types |= PIO_POSIX; } else { fprintf(stderr, "pio_perf: invalid --api option %s\n", diff --git a/perform/pio_timer.c b/perform/pio_timer.c index 66f9eb0..9c8abb7 100644 --- a/perform/pio_timer.c +++ b/perform/pio_timer.c @@ -22,7 +22,7 @@ #include #include -#include "pio_timer.h" +#include "hdf5.h" #ifdef H5_HAVE_PARALLEL @@ -157,7 +157,7 @@ set_time(pio_time *pt, timer_type t, int start_stop) } } else { if (start_stop == START) { - gettimeofday(&pt->sys_timer[t], NULL); + HDgettimeofday(&pt->sys_timer[t], NULL); /* When we start the timer for HDF5_FINE_WRITE_FIXED_DIMS or HDF5_FINE_READ_FIXED_DIMS * we compute the time it took to only open the file */ @@ -170,7 +170,7 @@ set_time(pio_time *pt, timer_type t, int start_stop) } else { struct timeval sys_t; - gettimeofday(&sys_t, NULL); + HDgettimeofday(&sys_t, NULL); pt->total_time[t] += sub_time(&sys_t, &(pt->sys_timer[t])); /* ((double)sys_t.tv_sec + diff --git a/test/h5test.h b/test/h5test.h index 465bb97..da5f422 100644 --- a/test/h5test.h +++ b/test/h5test.h @@ -80,7 +80,7 @@ */ H5TEST_DLLVAR char *paraprefix; #ifdef H5_HAVE_PARALLEL -extern MPI_Info h5_io_info_g; /* MPI INFO object for IO */ +H5TEST_DLLVAR MPI_Info h5_io_info_g; /* MPI INFO object for IO */ #endif /* -- cgit v0.12