diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2020-01-19 13:46:21 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2020-01-19 13:46:21 (GMT) |
commit | 82463a6a7ae6779536e1e94d1fbcb89a55c0c729 (patch) | |
tree | 00ae2ec939a98849ab540e55de5b4953c5601b97 /tools | |
parent | 29efed58a861346be122b1ff0c50741206742322 (diff) | |
parent | d97fb1b1090d47627d7a832b7e833ed707f63cc4 (diff) | |
download | hdf5-82463a6a7ae6779536e1e94d1fbcb89a55c0c729.zip hdf5-82463a6a7ae6779536e1e94d1fbcb89a55c0c729.tar.gz hdf5-82463a6a7ae6779536e1e94d1fbcb89a55c0c729.tar.bz2 |
Merge pull request #2276 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_12 to hdf5_1_12
* commit 'd97fb1b1090d47627d7a832b7e833ed707f63cc4':
Merge perform standalone changes from develop
Diffstat (limited to 'tools')
-rw-r--r-- | tools/lib/io_timer.h | 10 | ||||
-rw-r--r-- | tools/test/perform/pio_standalone.h | 4 | ||||
-rw-r--r-- | tools/test/perform/sio_standalone.h | 10 |
3 files changed, 20 insertions, 4 deletions
diff --git a/tools/lib/io_timer.h b/tools/lib/io_timer.h index 78bf676..c1fa58e 100644 --- a/tools/lib/io_timer.h +++ b/tools/lib/io_timer.h @@ -28,6 +28,7 @@ #ifdef H5_HAVE_WINSOCK2_H # include <winsock2.h> #endif /* H5_HAVE_WINSOCK2_H */ + /* The different types of timers we can have */ typedef enum timer_type_ { HDF5_FILE_OPENCLOSE, @@ -70,10 +71,19 @@ typedef struct io_time_t { #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ + +#ifdef STANDALONE +io_time_t *io_time_new(clock_type t); +void io_time_destroy(io_time_t *pt); +io_time_t *io_time_set(io_time_t *pt, timer_type t, int start_stop); +double io_time_get(io_time_t *pt, timer_type t); +#else H5TOOLS_DLL io_time_t *io_time_new(clock_type t); H5TOOLS_DLL void io_time_destroy(io_time_t *pt); H5TOOLS_DLL io_time_t *io_time_set(io_time_t *pt, timer_type t, int start_stop); H5TOOLS_DLL double io_time_get(io_time_t *pt, timer_type t); +#endif + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/tools/test/perform/pio_standalone.h b/tools/test/perform/pio_standalone.h index e6db2e8..cf6d980 100644 --- a/tools/test/perform/pio_standalone.h +++ b/tools/test/perform/pio_standalone.h @@ -483,8 +483,8 @@ extern MPI_Info h5_io_info_g; /* MPI INFO object for IO */ #endif #ifdef H5_HAVE_PARALLEL -H5TEST_DLL int h5_set_info_object(void); -H5TEST_DLL void h5_dump_info_object(MPI_Info info); +int h5_set_info_object(void); +void h5_dump_info_object(MPI_Info info); #endif diff --git a/tools/test/perform/sio_standalone.h b/tools/test/perform/sio_standalone.h index 248ef9a..45f6d25 100644 --- a/tools/test/perform/sio_standalone.h +++ b/tools/test/perform/sio_standalone.h @@ -498,8 +498,8 @@ extern MPI_Info h5_io_info_g; /* MPI INFO object for IO */ #endif #ifdef H5_HAVE_PARALLEL -H5TEST_DLL int h5_set_info_object(void); -H5TEST_DLL void h5_dump_info_object(MPI_Info info); +int h5_set_info_object(void); +void h5_dump_info_object(MPI_Info info); #endif @@ -527,4 +527,10 @@ typedef struct long_options { extern int get_option(int argc, const char **argv, const char *opt, const struct long_options *l_opt); + +extern int nCols; /*max number of columns for outputting */ + +/* Definitions of useful routines */ +extern void print_version(const char *progname); + #endif |