summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2011-10-07 15:24:56 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2011-10-07 15:24:56 (GMT)
commit0d8bd0c44d3b177e98e4a17db08d6eaee288b463 (patch)
tree862bdc63a727df71fb0b74e6f3d14950c39f56e5
parent1f115749c4e53c2cd83744fd4008897b3cb96e77 (diff)
downloadhdf5-0d8bd0c44d3b177e98e4a17db08d6eaee288b463.zip
hdf5-0d8bd0c44d3b177e98e4a17db08d6eaee288b463.tar.gz
hdf5-0d8bd0c44d3b177e98e4a17db08d6eaee288b463.tar.bz2
[svn-r21484] Add HDprefix and change when pio_timer.h is included
Tested
-rw-r--r--perform/pio_perf.c6
-rw-r--r--perform/pio_perf.h2
-rw-r--r--perform/pio_timer.c6
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_perf.h b/perform/pio_perf.h
index f9a8e03..6f510ca 100644
--- a/perform/pio_perf.h
+++ b/perform/pio_perf.h
@@ -16,7 +16,6 @@
#ifndef PIO_PERF_H__
#define PIO_PERF_H__
-#include "pio_timer.h"
#ifndef STANDALONE
#include "H5private.h"
#include "h5test.h"
@@ -24,6 +23,7 @@
#else
#include "pio_standalone.h"
#endif
+#include "pio_timer.h"
/* setup the dataset no fill option if this is v1.5 or more */
#if H5_VERS_MAJOR > 1 || H5_VERS_MINOR > 4
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 <stdio.h>
#include <stdlib.h>
-#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 +