Commit Graph

8 Commits

Author SHA1 Message Date
Allen Byrne
a466f16851 Tools merge from develop-1.10 2017-05-17 15:53:42 -05:00
Allen Byrne
0ac0a259c3 Merge pull request #7 in ~BYRN/hdf5_adb from bugfix/HDFFV-9942-standalone-18-perform to hdf5_1_8
* commit 'cd1bc7efa9ddf4679f75218381ad2ea8877ea549':
  Add defines that are missing on OSX
  correct signature
2016-11-10 09:18:45 -06:00
Allen Byrne
1b28a865ca HDFFV-9942: Update perform tool code to align with develop 2016-10-21 16:48:36 -05:00
Allen Byrne
828e9681b4 correct signature 2016-10-19 17:05:39 -05:00
Allen Byrne
2249be3e84 merge include chnages from trunk 2016-10-19 16:22:48 -05:00
Albert Cheng
cac2c7324f [svn-r25948] [Merged r25946 from trunk]
Removed debug statments that use //.

Tested: env CFLAGS=-ansi buildhdf5 in jam and parallel platypus.
2015-01-04 00:33:26 -05:00
Albert Cheng
24c5c0bf1b [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.
2015-01-03 12:01:03 -05:00
Albert Cheng
d6b44d14dc [svn-r25901] HDFFV-9046: reorganize hdf5/perform/ directory
Moved perform/ to tools/perform. Updated all the configure related files for the new location.

Tested: h5committested plus tested in jam and kite.
2014-12-18 19:52:34 -05:00