diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2015-01-03 17:01:03 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2015-01-03 17:01:03 (GMT) |
| commit | 24c5c0bf1b4e7ac79a1449a6ebf4d659d99c0a43 (patch) | |
| tree | e128bd7128483ae4d32c1248bedd3491c6d2ce6f /tools/perform/sio_perf.h | |
| parent | 9e0a0975b6285d01178facb76d7c2fff2a81b57b (diff) | |
| download | hdf5-24c5c0bf1b4e7ac79a1449a6ebf4d659d99c0a43.zip hdf5-24c5c0bf1b4e7ac79a1449a6ebf4d659d99c0a43.tar.gz hdf5-24c5c0bf1b4e7ac79a1449a6ebf4d659d99c0a43.tar.bz2 | |
[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.
Diffstat (limited to 'tools/perform/sio_perf.h')
| -rw-r--r-- | tools/perform/sio_perf.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/perform/sio_perf.h b/tools/perform/sio_perf.h index b40fed3..311d909 100644 --- a/tools/perform/sio_perf.h +++ b/tools/perform/sio_perf.h @@ -15,7 +15,7 @@ #ifndef SIO_PERF_H__ #define SIO_PERF_H__ -#include "sio_timer.h" +#include "io_timer.h" #ifndef STANDALONE #include "H5private.h" #include "h5test.h" @@ -71,7 +71,7 @@ typedef struct parameters_ { typedef struct results_ { herr_t ret_code; - sio_time *timers; + io_time_t *timers; } results; #ifndef SUCCESS @@ -83,7 +83,7 @@ typedef struct results_ { #endif /* !FAIL */ extern FILE *output; /* output file */ -extern sio_time *timer_g; /* timer: global for stub functions */ +extern io_time_t *timer_g; /* timer: global for stub functions */ extern int sio_debug_level; /* The debug level: * 0 - Off * 1 - Minimal |