summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2018-02-14 20:23:31 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2018-02-14 20:23:31 (GMT)
commit8ad35726eab12d8ca27b65cf62e5bddbcf86c4c0 (patch)
treed482d9e6e5bb06e696ccd5706583b87a1f4d52a0 /tools
parent23cf3a42989e6fd4c258e4cc8d58f0cf9a9336ce (diff)
parente09ccc4a2168e79b9f7500b8ec68ed5f829c8604 (diff)
downloadhdf5-8ad35726eab12d8ca27b65cf62e5bddbcf86c4c0.zip
hdf5-8ad35726eab12d8ca27b65cf62e5bddbcf86c4c0.tar.gz
hdf5-8ad35726eab12d8ca27b65cf62e5bddbcf86c4c0.tar.bz2
Merge pull request #895 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'e09ccc4a2168e79b9f7500b8ec68ed5f829c8604': More includes cleanup Cleanup overuse of include files
Diffstat (limited to 'tools')
-rw-r--r--tools/test/perform/pio_perf.h25
-rw-r--r--tools/test/perform/sio_perf.h1
2 files changed, 12 insertions, 14 deletions
diff --git a/tools/test/perform/pio_perf.h b/tools/test/perform/pio_perf.h
index b595c90..7605f20 100644
--- a/tools/test/perform/pio_perf.h
+++ b/tools/test/perform/pio_perf.h
@@ -15,7 +15,6 @@
#include "io_timer.h"
#ifndef STANDALONE
-#include "H5private.h"
#include "h5test.h"
#include "h5tools.h"
#include "h5tools_utils.h"
@@ -36,22 +35,22 @@ typedef enum iotype_ {
} iotype;
typedef struct parameters_ {
- iotype io_type; /* The type of IO test to perform */
- int num_procs; /* Maximum number of processes to use */
- long num_files; /* Number of files to create */
- long num_dsets; /* Number of datasets to create */
- off_t num_bytes; /* Number of bytes in each dset */
+ iotype io_type; /* The type of IO test to perform */
+ int num_procs; /* Maximum number of processes to use */
+ long num_files; /* Number of files to create */
+ long num_dsets; /* Number of datasets to create */
+ off_t num_bytes; /* Number of bytes in each dset */
int num_iters; /* Number of times to loop doing the IO */
- size_t buf_size; /* Buffer size */
- size_t blk_size; /* Block size */
+ size_t buf_size; /* Buffer size */
+ size_t blk_size; /* Block size */
unsigned interleaved; /* Interleaved vs. contiguous blocks */
unsigned collective; /* Collective vs. independent I/O */
unsigned dim2d; /* 1D vs. 2D */
- hsize_t h5_align; /* HDF5 object alignment */
- hsize_t h5_thresh; /* HDF5 object alignment threshold */
- int h5_use_chunks; /* Make HDF5 dataset chunked */
- int h5_write_only; /* Perform the write tests only */
- int verify; /* Verify data correctness */
+ hsize_t h5_align; /* HDF5 object alignment */
+ hsize_t h5_thresh; /* HDF5 object alignment threshold */
+ int h5_use_chunks; /* Make HDF5 dataset chunked */
+ int h5_write_only; /* Perform the write tests only */
+ int verify; /* Verify data correctness */
} parameters;
typedef struct results_ {
diff --git a/tools/test/perform/sio_perf.h b/tools/test/perform/sio_perf.h
index 366b791..83caf54 100644
--- a/tools/test/perform/sio_perf.h
+++ b/tools/test/perform/sio_perf.h
@@ -15,7 +15,6 @@
#include "io_timer.h"
#ifndef STANDALONE
-#include "H5private.h"
#include "h5test.h"
#include "h5tools.h"
#include "h5tools_utils.h"