diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2014-12-30 05:56:05 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2014-12-30 05:56:05 (GMT) |
| commit | aebc4ae149b95814810c34a5036333ac732e21ea (patch) | |
| tree | b68415a4048a0e218acc0a77aef6ef6345e0cfc2 /tools/perform/pio_engine.c | |
| parent | b65eae7aeeabcb15b2ef002692e1d0435902d44a (diff) | |
| download | hdf5-aebc4ae149b95814810c34a5036333ac732e21ea.zip hdf5-aebc4ae149b95814810c34a5036333ac732e21ea.tar.gz hdf5-aebc4ae149b95814810c34a5036333ac732e21ea.tar.bz2 | |
[svn-r25932] HDFFV-8902: merge the source code of h5perf and h5perf_serial, stage 1.
tools/perform/sio_timer.h:
tools/perform/pio_timer.c:
tools/perform/io_timer.h:
tools/perform/io_timer.c:
Renamed pio_timer.[ch] as io_timer.[ch];
merged content of sio_timer.[ch] into io_timer.[ch] so that both h5perf and h5perf_serial
call the combined io_timer.[ch].
Moved the debug printing code segment in set_time() in [sp]io_timer.c to as debug_start_stop_time() in [sp]io_perf.c where it belongs.
Screened out set_timer_type() and get_timer_type() which were not used by any code.
tools/perform/Makefile.am:
tools/perform/Makefile.in:
tools/perform/CMakeLists.txt
Adjusted to use io_timer.c for both h5perf and h5perf_serial.
tools/perform/pio_perf.c:
tools/perform/sio_perf.c:
tools/perform/pio_perf.h:
tools/perform/sio_perf.h:
Renamed [sp]io_time_destory() to same io_time_destroy();
Moved the debug printing code segment in set_time() in [sp]io_timer.c to as debug_start_stop_time() in [sp]io_perf.c where it belongs.
tools/perform/pio_engine.c:
tools/perform/sio_engine.c:
Removed #include io_timer.h since it was already #include by [sp]io_perf.h.
MANIFEST:
Updated the merge of [sp]io_timer.[ch] into io_timer.[ch].
Tested: h5committest and jam in extra.
Diffstat (limited to 'tools/perform/pio_engine.c')
| -rw-r--r-- | tools/perform/pio_engine.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/perform/pio_engine.c b/tools/perform/pio_engine.c index 3535fb4..8cb9138 100644 --- a/tools/perform/pio_engine.c +++ b/tools/perform/pio_engine.c @@ -38,7 +38,7 @@ #endif /* !MPI_FILE_NULL */ #include "pio_perf.h" -#include "pio_timer.h" +//#include "io_timer.h" /* Macro definitions */ @@ -174,15 +174,15 @@ do_pio(parameters param) switch (iot) { case MPIO: fd.mpifd = MPI_FILE_NULL; - res.timers = pio_time_new(MPI_TIMER); + res.timers = io_time_new(MPI_CLOCK); break; case POSIXIO: fd.posixfd = -1; - res.timers = pio_time_new(MPI_TIMER); + res.timers = io_time_new(MPI_CLOCK); break; case PHDF5: fd.h5fd = -1; - res.timers = pio_time_new(MPI_TIMER); + res.timers = io_time_new(MPI_CLOCK); break; default: /* unknown request */ |