[svn-r25945] [merge changes r25932 and r25933 from Trunk]

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.

1 files changed, 2 insertions, 4 deletions

diff --git a/MANIFEST b/MANIFEST
index 573bfc8..b1a1b6c 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -2074,15 +2074,13 @@
 ./tools/perform/pio_perf.h
 ./tools/perform/pio_standalone.c
 ./tools/perform/pio_standalone.h
-./tools/perform/pio_timer.c
-./tools/perform/pio_timer.h
+./tools/perform/io_timer.c
+./tools/perform/io_timer.h
 ./tools/perform/sio_engine.c
 ./tools/perform/sio_perf.c
 ./tools/perform/sio_perf.h
 ./tools/perform/sio_standalone.c
 ./tools/perform/sio_standalone.h
-./tools/perform/sio_timer.c
-./tools/perform/sio_timer.h
 ./tools/perform/zip_perf.c