diff options
Diffstat (limited to 'perform')
| -rw-r--r-- | perform/CMakeLists.txt | 134 | ||||
| -rw-r--r-- | perform/Makefile.in | 2 | ||||
| -rw-r--r-- | perform/benchpar.c | 18 | ||||
| -rw-r--r-- | perform/iopipe.c | 7 | ||||
| -rw-r--r-- | perform/sio_perf.h | 1 | ||||
| -rw-r--r-- | perform/sio_timer.h | 2 |
6 files changed, 140 insertions, 24 deletions
diff --git a/perform/CMakeLists.txt b/perform/CMakeLists.txt new file mode 100644 index 0000000..a0b7fae --- /dev/null +++ b/perform/CMakeLists.txt @@ -0,0 +1,134 @@ +cmake_minimum_required (VERSION 2.8) +PROJECT (HDF5_PERFORM ) + +#----------------------------------------------------------------------------- +# Setup include Directories +#----------------------------------------------------------------------------- +INCLUDE_DIRECTORIES (${HDF5_TEST_SOURCE_DIR}) +INCLUDE_DIRECTORIES (${HDF5_TOOLS_SOURCE_DIR}/lib ) + +#----------------------------------------------------------------------------- +# Add Tests +#----------------------------------------------------------------------------- + +#-- Adding test for h5perf_serial +SET (h5perf_serial_SRCS + ${HDF5_PERFORM_SOURCE_DIR}/sio_timer.c + ${HDF5_PERFORM_SOURCE_DIR}/sio_perf.c + ${HDF5_PERFORM_SOURCE_DIR}/sio_engine.c +) +ADD_EXECUTABLE (h5perf_serial ${h5perf_serial_SRCS}) +H5_NAMING (h5perf_serial) +IF (WIN32) + IF (MSVC) + IF (NOT BUILD_SHARED_LIBS) + SET_TARGET_PROPERTIES (h5perf_serial + PROPERTIES + LINK_FLAGS "/NODEFAULTLIB:MSVCRT" + ) + ENDIF (NOT BUILD_SHARED_LIBS) + ENDIF (MSVC) +ENDIF (WIN32) +TARGET_LINK_LIBRARIES (h5perf_serial ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET}) + +ADD_TEST (NAME h5perf_serial COMMAND $<TARGET_FILE:h5perf_serial>) + +#-- Adding test for chunk +SET (chunk_SRCS + ${HDF5_PERFORM_SOURCE_DIR}/chunk.c +) +ADD_EXECUTABLE(chunk ${chunk_SRCS}) +H5_NAMING (chunk) +IF (WIN32) + IF (MSVC) + IF (NOT BUILD_SHARED_LIBS) + SET_TARGET_PROPERTIES (chunk + PROPERTIES + LINK_FLAGS "/NODEFAULTLIB:MSVCRT" + ) + ENDIF (NOT BUILD_SHARED_LIBS) + ENDIF (MSVC) +ENDIF (WIN32) +TARGET_LINK_LIBRARIES(chunk ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET}) + +ADD_TEST (NAME chunk COMMAND $<TARGET_FILE:chunk>) + +#-- Adding test for iopipe +SET (iopipe_SRCS + ${HDF5_PERFORM_SOURCE_DIR}/iopipe.c +) +ADD_EXECUTABLE (iopipe ${iopipe_SRCS}) +H5_NAMING (iopipe) +IF (WIN32) + IF (MSVC) + IF (NOT BUILD_SHARED_LIBS) + SET_TARGET_PROPERTIES (iopipe + PROPERTIES + LINK_FLAGS "/NODEFAULTLIB:MSVCRT" + ) + ENDIF (NOT BUILD_SHARED_LIBS) + ENDIF (MSVC) +ENDIF (WIN32) +TARGET_LINK_LIBRARIES (iopipe ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET}) + +ADD_TEST (NAME iopipe COMMAND $<TARGET_FILE:iopipe>) + +#-- Adding test for overhead +SET (overhead_SRCS + ${HDF5_PERFORM_SOURCE_DIR}/overhead.c +) +ADD_EXECUTABLE (overhead ${overhead_SRCS}) +H5_NAMING (overhead) +IF (WIN32) + IF (MSVC) + IF (NOT BUILD_SHARED_LIBS) + SET_TARGET_PROPERTIES (overhead + PROPERTIES + LINK_FLAGS "/NODEFAULTLIB:MSVCRT" + ) + ENDIF (NOT BUILD_SHARED_LIBS) + ENDIF (MSVC) +ENDIF (WIN32) +TARGET_LINK_LIBRARIES (overhead ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET}) + +ADD_TEST (NAME overhead COMMAND $<TARGET_FILE:overhead>) + +#-- Adding test for perf_meta +SET (perf_meta_SRCS + ${HDF5_PERFORM_SOURCE_DIR}/perf_meta.c +) +ADD_EXECUTABLE (perf_meta ${perf_meta_SRCS}) +H5_NAMING (perf_meta) +IF (WIN32) + IF (MSVC) + IF (NOT BUILD_SHARED_LIBS) + SET_TARGET_PROPERTIES (perf_meta + PROPERTIES + LINK_FLAGS "/NODEFAULTLIB:MSVCRT" + ) + ENDIF (NOT BUILD_SHARED_LIBS) + ENDIF (MSVC) +ENDIF (WIN32) +TARGET_LINK_LIBRARIES (perf_meta ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET}) + +ADD_TEST (NAME perf_meta COMMAND $<TARGET_FILE:perf_meta>) + +#-- Adding test for zip_perf +SET (zip_perf_SRCS + ${HDF5_PERFORM_SOURCE_DIR}/zip_perf.c +) +ADD_EXECUTABLE (zip_perf ${zip_perf_SRCS}) +H5_NAMING (zip_perf) +IF (WIN32) + IF (MSVC) + IF (NOT BUILD_SHARED_LIBS) + SET_TARGET_PROPERTIES (zip_perf + PROPERTIES + LINK_FLAGS "/NODEFAULTLIB:MSVCRT" + ) + ENDIF (NOT BUILD_SHARED_LIBS) + ENDIF (MSVC) +ENDIF (WIN32) +TARGET_LINK_LIBRARIES (zip_perf ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) + +ADD_TEST (NAME zip_perf COMMAND $<TARGET_FILE:zip_perf> "-h") diff --git a/perform/Makefile.in b/perform/Makefile.in index 5d5df32..f788e72 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -236,12 +236,12 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTRUMENT = @INSTRUMENT@ INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@ +LARGEFILE = @LARGEFILE@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -LINUX_LFS = @LINUX_LFS@ LIPO = @LIPO@ LL_PATH = @LL_PATH@ LN_S = @LN_S@ diff --git a/perform/benchpar.c b/perform/benchpar.c index 3ebbe6b..035e9d6 100644 --- a/perform/benchpar.c +++ b/perform/benchpar.c @@ -167,9 +167,9 @@ int main(int argc, char *argv[]) int curr_arg; /* Current command line argument being processed */ int rank; /* Number of dimensions of the dataset */ hsize_t dim_size; /* Dimension size of each dimension */ - hsize_t *dims; /* Pointer to array of dimensions */ - hssize_t *start; /* Pointer to array of starting locations for hyperslab selection */ - hsize_t *count; /* Pointer to array of counts for hyperslab selection */ + hsize_t dims[H5S_MAX_RANK]; /* Pointer to array of dimensions */ + hsize_t start[H5S_MAX_RANK]; /* Pointer to array of starting locations for hyperslab selection */ + hsize_t count[H5S_MAX_RANK]; /* Pointer to array of counts for hyperslab selection */ unsigned slice_dim; /* Dimension to slice up */ char *file_name=NULL; /* Name of file to put data into */ hid_t fcpl; /* HDF5 File creation property list ID */ @@ -365,8 +365,6 @@ int main(int argc, char *argv[]) assert(ret>=0); /* Create dataspace for dataset on disk */ - dims=malloc(sizeof(hsize_t)*rank); - assert(dims); for(i=0; i<rank; i++) dims[i]=dim_size; @@ -394,10 +392,6 @@ int main(int argc, char *argv[]) assert(ret>=0); /* Select hyperslab for file dataspace */ - start=malloc(sizeof(hssize_t)*rank); - assert(start); - count=malloc(sizeof(hsize_t)*rank); - assert(count); for(i=0; i<rank; i++) { start[i]=0; count[i]=dim_size; @@ -494,12 +488,6 @@ done: free(file_name); if(buf) free(buf); - if(dims) - free(dims); - if(start) - free(start); - if(count) - free(count); /* MPI termination */ MPI_Finalize(); diff --git a/perform/iopipe.c b/perform/iopipe.c index 0667995..77d4fc8 100644 --- a/perform/iopipe.c +++ b/perform/iopipe.c @@ -21,13 +21,6 @@ /* See H5private.h for how to include headers */ #include "hdf5.h" -#ifdef H5_HAVE_WINSOCK_H -#include <Winsock.h> -#endif - -/*Winsock.h includes windows.h, due to the different value of -WINVER, windows.h should be put before H5private.h. Kent yang 6/21/2001*/ - #if defined (__MWERKS__) #ifdef H5_HAVE_SYS_TIMEB #undef H5_HAVE_SYS_TIMEB diff --git a/perform/sio_perf.h b/perform/sio_perf.h index bd05cfe..2417b6f 100644 --- a/perform/sio_perf.h +++ b/perform/sio_perf.h @@ -18,6 +18,7 @@ #include "sio_timer.h" #ifndef STANDALONE #include "H5private.h" +#include "h5test.h" #include "h5tools_utils.h" #else #include "sio_standalone.h" diff --git a/perform/sio_timer.h b/perform/sio_timer.h index 943ce28..82f053d 100644 --- a/perform/sio_timer.h +++ b/perform/sio_timer.h @@ -27,7 +27,7 @@ #endif #ifdef _WIN32 -# include <winsock.h> +# include <winsock2.h> #endif /* _WIN32 */ /* The different types of timers we can have */ |