summaryrefslogtreecommitdiffstats
path: root/tools/perform
diff options
context:
space:
mode:
Diffstat (limited to 'tools/perform')
-rw-r--r--tools/perform/chunk.c6
-rw-r--r--tools/perform/overhead.c2
-rw-r--r--tools/perform/sio_engine.c2
-rw-r--r--tools/perform/sio_perf.c20
-rw-r--r--tools/perform/sio_standalone.h11
-rw-r--r--tools/perform/zip_perf.c9
6 files changed, 17 insertions, 33 deletions
diff --git a/tools/perform/chunk.c b/tools/perform/chunk.c
index 74bcc46..0ea16e8 100644
--- a/tools/perform/chunk.c
+++ b/tools/perform/chunk.c
@@ -163,7 +163,7 @@ create_dataset (void)
assert(dset>=0);
/* The data */
- buf = calloc(1, SQUARE (DS_SIZE*CH_SIZE));
+ buf = (signed char *)calloc(1, SQUARE (DS_SIZE*CH_SIZE));
H5Dwrite(dset, H5T_NATIVE_SCHAR, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf);
free(buf);
@@ -194,7 +194,7 @@ static double
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)));
+ signed char *buf = (signed char *)calloc (1, (size_t)(SQUARE(io_size)));
hsize_t i, j, hs_size[2];
hsize_t hs_offset[2];
int mdc_nelmts;
@@ -273,7 +273,7 @@ test_diag (int op, size_t cache_size, size_t io_size, size_t offset)
hsize_t i, hs_size[2];
hsize_t nio = 0;
hsize_t hs_offset[2];
- signed char *buf = calloc (1, (size_t)(SQUARE (io_size)));
+ signed char *buf = (signed char *)calloc(1, (size_t)(SQUARE (io_size)));
int mdc_nelmts;
size_t rdcc_nelmts;
double w0;
diff --git a/tools/perform/overhead.c b/tools/perform/overhead.c
index 0288ffa..feabd3a 100644
--- a/tools/perform/overhead.c
+++ b/tools/perform/overhead.c
@@ -224,7 +224,7 @@ test(fill_t fill_style, const double splits[],
if ((fd=HDopen(FILE_NAME_1, O_RDONLY, 0666)) < 0) goto error;
if(FILL_RANDOM==fill_style)
- had = calloc((size_t)cur_size[0], sizeof(int));
+ had = (int *)calloc((size_t)cur_size[0], sizeof(int));
for (i=1; i<=cur_size[0]; i++) {
diff --git a/tools/perform/sio_engine.c b/tools/perform/sio_engine.c
index 3b28ea7..5622810 100644
--- a/tools/perform/sio_engine.c
+++ b/tools/perform/sio_engine.c
@@ -181,7 +181,7 @@ do_sio(parameters param)
}
/* Allocate transfer buffer */
- if ((buffer = malloc(linear_buf_size)) == NULL){
+ if ((buffer = (char *)malloc(linear_buf_size)) == NULL){
HDfprintf(stderr, "malloc for transfer buffer size (%zu) failed\n", linear_buf_size);
GOTOERROR(FAIL);
}
diff --git a/tools/perform/sio_perf.c b/tools/perform/sio_perf.c
index 7d75a2d..34d8552 100644
--- a/tools/perform/sio_perf.c
+++ b/tools/perform/sio_perf.c
@@ -481,16 +481,16 @@ run_test(iotype iot, parameters parms, struct options *opts)
/* allocate space for tables minmax and that it is sufficient */
/* to initialize all elements to zeros by calloc. */
- write_sys_mm_table = calloc((size_t)parms.num_iters , sizeof(minmax));
- write_mm_table = calloc((size_t)parms.num_iters , sizeof(minmax));
- write_gross_mm_table = calloc((size_t)parms.num_iters , sizeof(minmax));
- write_raw_mm_table = calloc((size_t)parms.num_iters , sizeof(minmax));
+ write_sys_mm_table = (minmax *)calloc((size_t)parms.num_iters , sizeof(minmax));
+ write_mm_table = (minmax *)calloc((size_t)parms.num_iters , sizeof(minmax));
+ write_gross_mm_table = (minmax *)calloc((size_t)parms.num_iters , sizeof(minmax));
+ write_raw_mm_table = (minmax *)calloc((size_t)parms.num_iters , sizeof(minmax));
if (!parms.h5_write_only) {
- read_sys_mm_table = calloc((size_t)parms.num_iters , sizeof(minmax));
- read_mm_table = calloc((size_t)parms.num_iters , sizeof(minmax));
- read_gross_mm_table = calloc((size_t)parms.num_iters , sizeof(minmax));
- read_raw_mm_table = calloc((size_t)parms.num_iters , sizeof(minmax));
+ read_sys_mm_table = (minmax *)calloc((size_t)parms.num_iters , sizeof(minmax));
+ read_mm_table = (minmax *)calloc((size_t)parms.num_iters , sizeof(minmax));
+ read_gross_mm_table = (minmax *)calloc((size_t)parms.num_iters , sizeof(minmax));
+ read_raw_mm_table = (minmax *)calloc((size_t)parms.num_iters , sizeof(minmax));
}
/* Do IO iteration times, collecting statistics each time */
@@ -1443,6 +1443,10 @@ void debug_start_stop_time(io_time_t *pt, timer_type t, int start_stop)
case HDF5_RAW_READ_FIXED_DIMS:
msg = "Raw Read";
break;
+ case HDF5_FILE_READ_OPEN:
+ case HDF5_FILE_READ_CLOSE:
+ case HDF5_FILE_WRITE_OPEN:
+ case HDF5_FILE_WRITE_CLOSE:
default:
msg = "Unknown Timer";
break;
diff --git a/tools/perform/sio_standalone.h b/tools/perform/sio_standalone.h
index 4eb1ded..8f52eba 100644
--- a/tools/perform/sio_standalone.h
+++ b/tools/perform/sio_standalone.h
@@ -322,18 +322,7 @@ H5_DLL int HDrand(void);
#define HDread(F,M,Z) read(F,M,Z)
#define HDreaddir(D) readdir(D)
#define HDrealloc(M,Z) realloc(M,Z)
-#ifdef H5_VMS
-#ifdef __cplusplus
-extern "C" {
-#endif
-int HDremove_all(const char * fname);
-#ifdef __cplusplus
-}
-#endif
-#define HDremove(S) HDremove_all(S)
-#else
#define HDremove(S) remove(S)
-#endif /*H5_VMS*/
#define HDrename(OLD,NEW) rename(OLD,NEW)
#define HDrewind(F) rewind(F)
#define HDrewinddir(D) rewinddir(D)
diff --git a/tools/perform/zip_perf.c b/tools/perform/zip_perf.c
index f73ba40..d025602 100644
--- a/tools/perform/zip_perf.c
+++ b/tools/perform/zip_perf.c
@@ -30,15 +30,6 @@
#include <zlib.h>
-#ifdef VMS
-# define unlink delete
-#endif /* VMS */
-
-#ifdef RISCOS
-# define unlink remove
-# define fileno(file) file->__file
-#endif /* RISCOS */
-
#define ONE_KB 1024
#define ONE_MB (ONE_KB * ONE_KB)
#define ONE_GB (ONE_MB * ONE_KB)