philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Albert Cheng
2015-01-03 12:01:03 -05:00
parent 9e0a0975b6
commit 24c5c0bf1b
15 changed files with 377 additions and 577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/perform/sio_engine.c
View File

@@ -29,7 +29,7 @@
#include "hdf5.h"
#include "sio_perf.h"
#include "sio_timer.h"
//#include "io_timer.h"
/* Macro definitions */
@@ -143,11 +143,11 @@ do_sio(parameters param)
switch (iot) {
case POSIXIO:
fd.posixfd = -1;
res.timers = sio_time_new();
res.timers = io_time_new(SYS_CLOCK);
break;
case HDF5:
fd.h5fd = -1;
res.timers = sio_time_new();
res.timers = io_time_new(SYS_CLOCK);
break;
default:
/* unknown request */