diff options
Diffstat (limited to 'perform')
| -rw-r--r-- | perform/chunk.c | 4 | ||||
| -rw-r--r-- | perform/iopipe.c | 2 | ||||
| -rw-r--r-- | perform/overhead.c | 2 | ||||
| -rw-r--r-- | perform/perf_meta.c | 5 | ||||
| -rw-r--r-- | perform/pio_engine.c | 4 | ||||
| -rw-r--r-- | perform/zip_perf.c | 2 |
6 files changed, 8 insertions, 11 deletions
diff --git a/perform/chunk.c b/perform/chunk.c index 7e75762..4150b49 100644 --- a/perform/chunk.c +++ b/perform/chunk.c @@ -195,7 +195,7 @@ test_rowmaj (int op, size_t cache_size, size_t io_size) hid_t file, dset, mem_space, file_space; signed char *buf = calloc (1, (size_t)(SQUARE(io_size))); hsize_t i, j, hs_size[2]; - hssize_t hs_offset[2]; + hsize_t hs_offset[2]; int mdc_nelmts; size_t rdcc_nelmts; double w0; @@ -271,7 +271,7 @@ test_diag (int op, size_t cache_size, size_t io_size, size_t offset) hid_t file, dset, mem_space, file_space; hsize_t i, hs_size[2]; hsize_t nio = 0; - hssize_t hs_offset[2]; + hsize_t hs_offset[2]; signed char *buf = calloc (1, (size_t)(SQUARE (io_size))); int mdc_nelmts; size_t rdcc_nelmts; diff --git a/perform/iopipe.c b/perform/iopipe.c index aa1ac77..92c85c3 100644 --- a/perform/iopipe.c +++ b/perform/iopipe.c @@ -203,7 +203,7 @@ main (void) int i, fd; hssize_t n; off_t offset; - hssize_t start[2]; + hsize_t start[2]; hsize_t count[2]; diff --git a/perform/overhead.c b/perform/overhead.c index 915d468..d9715e7 100644 --- a/perform/overhead.c +++ b/perform/overhead.c @@ -195,7 +195,7 @@ test(fill_t fill_style, const double splits[], hsize_t ch_size[1] = {1}; /*chunk size */ hsize_t cur_size[1] = {1000}; /*current dataset size */ hsize_t max_size[1] = {H5S_UNLIMITED}; /*maximum dataset size */ - hssize_t hs_start[1]; /*hyperslab start offset*/ + hsize_t hs_start[1]; /*hyperslab start offset*/ hsize_t hs_count[1] = {1}; /*hyperslab nelmts */ int fd = (-1); /*h5 file direct */ static int *had = NULL; /*for random filling */ diff --git a/perform/perf_meta.c b/perform/perf_meta.c index fc9872d..e157c78 100644 --- a/perform/perf_meta.c +++ b/perform/perf_meta.c @@ -170,10 +170,8 @@ parse_options(int argc, char **argv) } /*while*/ /* Check valid values */ +#ifndef H5_HAVE_PARALLEL if(facc_type == FACC_MPIO || facc_type == FACC_MPIPOSIX) -#ifdef H5_HAVE_PARALLEL - ; -#else { nerrors++; return(1); @@ -852,3 +850,4 @@ main(int argc, char **argv) return 1; } + diff --git a/perform/pio_engine.c b/perform/pio_engine.c index b4dd5b8..153f823 100644 --- a/perform/pio_engine.c +++ b/perform/pio_engine.c @@ -520,7 +520,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets, hsize_t h5block[1]; /*dataspace selection */ hsize_t h5stride[1]; hsize_t h5count[1]; - hssize_t h5start[1]; + hsize_t h5start[1]; hssize_t h5offset[1]; /* Selection offset within dataspace */ hid_t h5dcpl = -1; /* Dataset creation property list */ hid_t h5dxpl = -1; /* Dataset transfer property list */ @@ -1001,7 +1001,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets, hsize_t h5block[1]; /*dataspace selection */ hsize_t h5stride[1]; hsize_t h5count[1]; - hssize_t h5start[1]; + hsize_t h5start[1]; hssize_t h5offset[1]; /* Selection offset within dataspace */ hid_t h5dxpl = -1; /* Dataset transfer property list */ diff --git a/perform/zip_perf.c b/perform/zip_perf.c index 37f264a..321d6e6 100644 --- a/perform/zip_perf.c +++ b/perform/zip_perf.c @@ -12,8 +12,6 @@ * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -/* @(#) $Id$ */ - /* =========================================================================== * Usage: zip_perf [-d] [-f] [-h] [-1 to -9] [files...] * -d : decompress |