summaryrefslogtreecommitdiffstats
path: root/tools/src/h5perf
diff options
context:
space:
mode:
Diffstat (limited to 'tools/src/h5perf')
-rw-r--r--tools/src/h5perf/pio_engine.c30
-rw-r--r--tools/src/h5perf/pio_perf.c50
-rw-r--r--tools/src/h5perf/sio_engine.c55
-rw-r--r--tools/src/h5perf/sio_perf.c44
4 files changed, 90 insertions, 89 deletions
diff --git a/tools/src/h5perf/pio_engine.c b/tools/src/h5perf/pio_engine.c
index 8830c82..fc2f0c7 100644
--- a/tools/src/h5perf/pio_engine.c
+++ b/tools/src/h5perf/pio_engine.c
@@ -278,7 +278,7 @@ do_pio(parameters param)
/* Open file for write */
char base_name[256];
- HDsnprintf(base_name, sizeof(base_name), "#pio_tmp_%lu", nf);
+ snprintf(base_name, sizeof(base_name), "#pio_tmp_%lu", nf);
pio_create_filename(iot, base_name, fname, FILENAME_MAX);
if (pio_debug_level > 0)
fprintf(output, "rank %d: data filename=%s\n", pio_mpi_rank_g, fname);
@@ -402,7 +402,7 @@ pio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
}
/* First use the environment variable and then try the constant */
- prefix = HDgetenv("HDF5_PARAPREFIX");
+ prefix = getenv("HDF5_PARAPREFIX");
#ifdef HDF5_PARAPREFIX
if (!prefix)
@@ -416,8 +416,8 @@ pio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
* directory instead. */
char *user, *login, *subdir;
- user = HDgetenv("USER");
- login = HDgetenv("LOGIN");
+ user = getenv("USER");
+ login = getenv("LOGIN");
subdir = (user ? user : login);
if (subdir) {
@@ -431,11 +431,11 @@ pio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
}
else {
/* We didn't append the prefix yet */
- HDstrncpy(fullname, prefix, size);
+ strncpy(fullname, prefix, size);
fullname[size - 1] = '\0';
}
- if ((HDstrlen(fullname) + HDstrlen(base_name) + 1) < size) {
+ if ((strlen(fullname) + strlen(base_name) + 1) < size) {
/* Append the base_name with a slash first. Multiple slashes are
* handled below. */
h5_stat_t buf;
@@ -445,31 +445,31 @@ pio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
if (HDmkdir(fullname, (mode_t)0755) < 0 && errno != EEXIST) {
/* We couldn't make the "/tmp/${USER,LOGIN}" subdirectory.
* Default to PREFIX's original prefix value. */
- HDstrcpy(fullname, prefix);
+ strcpy(fullname, prefix);
}
- HDstrcat(fullname, "/");
- HDstrcat(fullname, base_name);
+ strcat(fullname, "/");
+ strcat(fullname, base_name);
}
else {
/* Buffer is too small */
return NULL;
}
}
- else if (HDstrlen(base_name) >= size) {
+ else if (strlen(base_name) >= size) {
/* Buffer is too small */
return NULL;
}
else {
- HDstrcpy(fullname, base_name);
+ strcpy(fullname, base_name);
}
/* Append a suffix */
if (suffix) {
- if (HDstrlen(fullname) + HDstrlen(suffix) >= size)
+ if (strlen(fullname) + strlen(suffix) >= size)
return NULL;
- HDstrcat(fullname, suffix);
+ strcat(fullname, suffix);
}
/* Remove any double slashes in the filename */
@@ -887,7 +887,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nby
} /* end if */
} /* end else */
- HDsnprintf(dname, sizeof(dname), "Dataset_%ld", ndset);
+ snprintf(dname, sizeof(dname), "Dataset_%ld", ndset);
h5ds_id = H5DCREATE(fd->h5fd, dname, ELMT_H5_TYPE, h5dset_space_id, h5dcpl);
if (h5ds_id < 0) {
@@ -1862,7 +1862,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nbyt
break;
case PHDF5:
- HDsnprintf(dname, sizeof(dname), "Dataset_%ld", ndset);
+ snprintf(dname, sizeof(dname), "Dataset_%ld", ndset);
h5ds_id = H5DOPEN(fd->h5fd, dname);
if (h5ds_id < 0) {
fprintf(stderr, "HDF5 Dataset open failed\n");
diff --git a/tools/src/h5perf/pio_perf.c b/tools/src/h5perf/pio_perf.c
index 37e6aeb..e72de32 100644
--- a/tools/src/h5perf/pio_perf.c
+++ b/tools/src/h5perf/pio_perf.c
@@ -83,12 +83,12 @@
/* report 0.0 in case t is zero too */
#define MB_PER_SEC(bytes, t) (H5_DBL_ABS_EQUAL((t), 0.0) ? 0.0 : ((((double)bytes) / ONE_MB) / (t)))
-#ifndef TRUE
-#define TRUE 1
-#endif /* TRUE */
-#ifndef FALSE
-#define FALSE (!TRUE)
-#endif /* FALSE */
+#ifndef true
+#define true 1
+#endif /* true */
+#ifndef false
+#define false (!true)
+#endif /* false */
/* global variables */
FILE *output; /* output file */
@@ -736,10 +736,10 @@ h5_set_info_object(void)
int ret_value = 0;
/* handle any MPI INFO hints via $HDF5_MPI_INFO */
- if ((envp = HDgetenv("HDF5_MPI_INFO")) != NULL) {
+ if ((envp = getenv("HDF5_MPI_INFO")) != NULL) {
char *next, *valp;
- valp = envp = next = HDstrdup(envp);
+ valp = envp = next = strdup(envp);
if (!valp)
return 0;
@@ -764,7 +764,7 @@ h5_set_info_object(void)
if (*next == ';')
++next;
- namep = HDstrncpy(key_val, valp, len);
+ namep = strncpy(key_val, valp, len);
/* pass up any beginning whitespaces */
while (*namep && (*namep == ' ' || *namep == '\t'))
@@ -774,13 +774,13 @@ h5_set_info_object(void)
continue; /* was all white space, so move to next k/v pair */
/* eat up any ending white spaces */
- endp = &namep[HDstrlen(namep) - 1];
+ endp = &namep[strlen(namep) - 1];
while (endp && (*endp == ' ' || *endp == '\t'))
*endp-- = '\0';
/* find the '=' */
- valp = HDstrchr(namep, '=');
+ valp = strchr(namep, '=');
if (valp != NULL) { /* it's a valid key/value pairing */
char *tmp_val = valp + 1;
@@ -1049,7 +1049,7 @@ output_report(const char *fmt, ...)
va_start(ap, fmt);
H5_GCC_CLANG_DIAG_OFF("format-nonliteral")
- HDvfprintf(output, fmt, ap);
+ vfprintf(output, fmt, ap);
H5_GCC_CLANG_DIAG_ON("format-nonliteral")
va_end(ap);
}
@@ -1072,7 +1072,7 @@ print_indent(int indent)
indent *= TAB_SPACE;
for (; indent > 0; --indent)
- HDfputc(' ', output);
+ fputc(' ', output);
}
}
@@ -1215,7 +1215,7 @@ report_parameters(struct options *opts)
fprintf(output, "Contiguous\n");
{
- char *prefix = HDgetenv("HDF5_PARAPREFIX");
+ char *prefix = getenv("HDF5_PARAPREFIX");
fprintf(output, "rank %d: Env HDF5_PARAPREFIX=%s\n", rank, (prefix ? prefix : "not set"));
}
@@ -1255,13 +1255,13 @@ parse_command_line(int argc, const char *const *argv)
cl_opts->interleaved = 0; /* Default to contiguous blocks in dataset */
cl_opts->collective = 0; /* Default to independent I/O access */
cl_opts->dim2d = 0; /* Default to 1D */
- cl_opts->print_times = FALSE; /* Printing times is off by default */
- cl_opts->print_raw = FALSE; /* Printing raw data throughput is off by default */
+ cl_opts->print_times = false; /* Printing times is off by default */
+ cl_opts->print_raw = false; /* Printing raw data throughput is off by default */
cl_opts->h5_alignment = 1; /* No alignment for HDF5 objects by default */
cl_opts->h5_threshold = 1; /* No threshold for aligning HDF5 objects by default */
- cl_opts->h5_use_chunks = FALSE; /* Don't chunk the HDF5 dataset by default */
- cl_opts->h5_write_only = FALSE; /* Do both read and write by default */
- cl_opts->verify = FALSE; /* No Verify data correctness by default */
+ cl_opts->h5_use_chunks = false; /* Don't chunk the HDF5 dataset by default */
+ cl_opts->h5_write_only = false; /* Do both read and write by default */
+ cl_opts->verify = false; /* No Verify data correctness by default */
while ((opt = H5_get_option(argc, argv, s_opts, l_opts)) != EOF) {
switch ((char)opt) {
@@ -1313,7 +1313,7 @@ parse_command_line(int argc, const char *const *argv)
break;
case 'c':
/* Turn on chunked HDF5 dataset creation */
- cl_opts->h5_use_chunks = TRUE;
+ cl_opts->h5_use_chunks = true;
break;
case 'C':
cl_opts->collective = 1;
@@ -1334,7 +1334,7 @@ parse_command_line(int argc, const char *const *argv)
if (isalnum(*end) && i < 10)
buf[i++] = *end;
- if (HDstrlen(buf) > 1 || isdigit(buf[0])) {
+ if (strlen(buf) > 1 || isdigit(buf[0])) {
size_t j;
for (j = 0; j < 10 && buf[j] != '\0'; ++j)
@@ -1354,15 +1354,15 @@ parse_command_line(int argc, const char *const *argv)
switch (*buf) {
case 'r':
/* Turn on raw data throughput info */
- cl_opts->print_raw = TRUE;
+ cl_opts->print_raw = true;
break;
case 't':
/* Turn on time printing */
- cl_opts->print_times = TRUE;
+ cl_opts->print_times = true;
break;
case 'v':
/* Turn on verify data correctness*/
- cl_opts->verify = TRUE;
+ cl_opts->verify = true;
break;
default:
fprintf(stderr, "pio_perf: invalid --debug option %s\n", buf);
@@ -1406,7 +1406,7 @@ parse_command_line(int argc, const char *const *argv)
cl_opts->h5_threshold = parse_size_directive(H5_optarg);
break;
case 'w':
- cl_opts->h5_write_only = TRUE;
+ cl_opts->h5_write_only = true;
break;
case 'x':
cl_opts->min_xfer_size = (size_t)parse_size_directive(H5_optarg);
diff --git a/tools/src/h5perf/sio_engine.c b/tools/src/h5perf/sio_engine.c
index 1f73a62..2363f6a 100644
--- a/tools/src/h5perf/sio_engine.c
+++ b/tools/src/h5perf/sio_engine.c
@@ -139,9 +139,7 @@ do_sio(parameters param, results *res)
/* IO type */
iot = param.io_type;
- if (NULL == (fname = calloc(FILENAME_MAX, sizeof(char))))
- GOTOERROR(FAIL);
-
+ /* MUST initialize fd early since we check its file IDs in cleanup code */
switch (iot) {
case POSIXIO:
fd.posixfd = -1;
@@ -157,6 +155,9 @@ do_sio(parameters param, results *res)
GOTOERROR(FAIL);
}
+ if (NULL == (fname = calloc(FILENAME_MAX, sizeof(char))))
+ GOTOERROR(FAIL);
+
linear_buf_size = 1;
for (i = 0; i < param.rank; i++) {
@@ -197,7 +198,7 @@ do_sio(parameters param, results *res)
*/
/* Open file for write */
- HDstrcpy(base_name, "#sio_tmp");
+ strcpy(base_name, "#sio_tmp");
sio_create_filename(iot, base_name, fname, FILENAME_MAX, &param);
if (sio_debug_level > 0)
@@ -310,7 +311,7 @@ sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
}
/* First use the environment variable and then try the constant */
- prefix = HDgetenv("HDF5_PREFIX");
+ prefix = getenv("HDF5_PREFIX");
#ifdef HDF5_PREFIX
if (!prefix)
@@ -324,8 +325,8 @@ sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
* directory instead. */
char *user, *login, *subdir;
- user = HDgetenv("USER");
- login = HDgetenv("LOGIN");
+ user = getenv("USER");
+ login = getenv("LOGIN");
subdir = (user ? user : login);
if (subdir) {
@@ -339,11 +340,11 @@ sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
}
else {
/* We didn't append the prefix yet */
- HDstrncpy(fullname, prefix, size);
+ strncpy(fullname, prefix, size);
fullname[size - 1] = '\0';
}
- if ((HDstrlen(fullname) + HDstrlen(base_name) + 1) < size) {
+ if ((strlen(fullname) + strlen(base_name) + 1) < size) {
/* Append the base_name with a slash first. Multiple slashes are
* handled below. */
h5_stat_t buf;
@@ -353,11 +354,11 @@ sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
if (HDmkdir(fullname, 0755) < 0 && errno != EEXIST) {
/* We couldn't make the "/tmp/${USER,LOGIN}" subdirectory.
* Default to PREFIX's original prefix value. */
- HDstrcpy(fullname, prefix);
+ strcpy(fullname, prefix);
}
- HDstrcat(fullname, "/");
- HDstrcat(fullname, base_name);
+ strcat(fullname, "/");
+ strcat(fullname, base_name);
}
else {
/* Buffer is too small */
@@ -369,15 +370,15 @@ sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
return NULL;
}
else {
- HDstrcpy(fullname, base_name);
+ strcpy(fullname, base_name);
}
/* Append a suffix */
if (suffix) {
- if (HDstrlen(fullname) + HDstrlen(suffix) >= size)
+ if (strlen(fullname) + strlen(suffix) >= size)
return NULL;
- HDstrcat(fullname, suffix);
+ strcat(fullname, suffix);
}
/* Remove any double slashes in the filename */
@@ -513,7 +514,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
} /* end if */
} /* end if */
- HDsnprintf(dname, sizeof(dname), "Dataset_%ld", (unsigned long)parms->num_bytes);
+ snprintf(dname, sizeof(dname), "Dataset_%ld", (unsigned long)parms->num_bytes);
h5ds_id =
H5Dcreate2(fd->h5fd, dname, ELMT_H5_TYPE, h5dset_space_id, H5P_DEFAULT, h5dcpl, H5P_DEFAULT);
@@ -836,7 +837,7 @@ do_read(results *res, file_descr *fd, parameters *parms, void *buffer)
break;
case HDF5:
- HDsnprintf(dname, sizeof(dname), "Dataset_%ld", (long)parms->num_bytes);
+ snprintf(dname, sizeof(dname), "Dataset_%ld", (long)parms->num_bytes);
h5ds_id = H5Dopen2(fd->h5fd, dname, H5P_DEFAULT);
if (h5ds_id < 0) {
fprintf(stderr, "HDF5 Dataset open failed\n");
@@ -1129,7 +1130,7 @@ set_vfd(parameters *param)
}
else if (vfd == core) {
/* In-core temporary file with 1MB increment */
- if (H5Pset_fapl_core(my_fapl, (size_t)1024 * 1024, TRUE) < 0)
+ if (H5Pset_fapl_core(my_fapl, (size_t)1024 * 1024, true) < 0)
return -1;
}
else if (vfd == split) {
@@ -1153,18 +1154,18 @@ set_vfd(parameters *param)
memset(memb_name, 0, sizeof memb_name);
memset(memb_addr, 0, sizeof memb_addr);
- assert(HDstrlen(multi_letters) == H5FD_MEM_NTYPES);
+ assert(strlen(multi_letters) == H5FD_MEM_NTYPES);
if (NULL == (sv = calloc(1, sizeof(*sv))))
return -1;
for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) {
memb_fapl[mt] = H5P_DEFAULT;
- HDsnprintf(sv->arr[mt], 1024, "%%s-%c.h5", multi_letters[mt]);
+ snprintf(sv->arr[mt], 1024, "%%s-%c.h5", multi_letters[mt]);
memb_name[mt] = sv->arr[mt];
memb_addr[mt] = (haddr_t)MAX(mt - 1, 0) * (HADDR_MAX / 10);
}
- if (H5Pset_fapl_multi(my_fapl, memb_map, memb_fapl, memb_name, memb_addr, FALSE) < 0) {
+ if (H5Pset_fapl_multi(my_fapl, memb_map, memb_fapl, memb_name, memb_addr, false) < 0) {
free(sv);
return -1;
}
@@ -1175,7 +1176,7 @@ set_vfd(parameters *param)
hsize_t fam_size = 1 * 1024 * 1024; /*100 MB*/
/* Family of files, each 1MB and using the default driver */
- /* if ((val=HDstrtok(NULL, " \t\n\r")))
+ /* if ((val=strtok(NULL, " \t\n\r")))
fam_size = (hsize_t)(strtod(val, NULL) * 1024*1024); */
if (H5Pset_fapl_family(my_fapl, fam_size, H5P_DEFAULT) < 0)
return -1;
@@ -1259,7 +1260,7 @@ do_cleanupfile(iotype iot, char *filename)
goto done;
if (clean_file_g == -1)
- clean_file_g = (HDgetenv(HDF5_NOCLEANUP) == NULL) ? 1 : 0;
+ clean_file_g = (getenv(HDF5_NOCLEANUP) == NULL) ? 1 : 0;
if (clean_file_g) {
@@ -1274,7 +1275,7 @@ do_cleanupfile(iotype iot, char *filename)
if (driver == H5FD_FAMILY) {
for (j = 0; /*void*/; j++) {
H5_GCC_CLANG_DIAG_OFF("format-nonliteral")
- HDsnprintf(temp, temp_sz, filename, j);
+ snprintf(temp, temp_sz, filename, j);
H5_GCC_CLANG_DIAG_ON("format-nonliteral")
if (HDaccess(temp, F_OK) < 0)
@@ -1284,7 +1285,7 @@ do_cleanupfile(iotype iot, char *filename)
}
}
else if (driver == H5FD_CORE) {
- hbool_t backing; /* Whether the core file has backing store */
+ bool backing; /* Whether the core file has backing store */
H5Pget_fapl_core(fapl, NULL, &backing);
@@ -1294,10 +1295,10 @@ do_cleanupfile(iotype iot, char *filename)
}
else if (driver == H5FD_MULTI) {
H5FD_mem_t mt;
- assert(HDstrlen(multi_letters) == H5FD_MEM_NTYPES);
+ assert(strlen(multi_letters) == H5FD_MEM_NTYPES);
for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) {
- HDsnprintf(temp, temp_sz, "%s-%c.h5", filename, multi_letters[mt]);
+ snprintf(temp, temp_sz, "%s-%c.h5", filename, multi_letters[mt]);
HDremove(temp); /*don't care if it fails*/
}
}
diff --git a/tools/src/h5perf/sio_perf.c b/tools/src/h5perf/sio_perf.c
index 5ffad71..ad536ba 100644
--- a/tools/src/h5perf/sio_perf.c
+++ b/tools/src/h5perf/sio_perf.c
@@ -67,12 +67,12 @@
/* report 0.0 in case t is zero too */
#define MB_PER_SEC(bytes, t) (H5_DBL_ABS_EQUAL(t, 0.0) ? 0.0 : ((((double)(bytes)) / (double)ONE_MB) / (t)))
-#ifndef TRUE
-#define TRUE 1
-#endif /* TRUE */
-#ifndef FALSE
-#define FALSE (!TRUE)
-#endif /* FALSE */
+#ifndef true
+#define true 1
+#endif /* true */
+#ifndef false
+#define false (!true)
+#endif /* false */
/* global variables */
FILE *output; /* output file */
@@ -203,7 +203,7 @@ main(int argc, char *argv[])
if (opts->output_file) {
if ((output = fopen(opts->output_file, "w")) == NULL) {
fprintf(stderr, "%s: cannot open output file\n", progname);
- HDperror(opts->output_file);
+ perror(opts->output_file);
goto finish;
}
}
@@ -627,7 +627,7 @@ output_report(const char *fmt, ...)
va_start(ap, fmt);
H5_GCC_CLANG_DIAG_OFF("format-nonliteral")
- HDvfprintf(output, fmt, ap);
+ vfprintf(output, fmt, ap);
H5_GCC_CLANG_DIAG_ON("format-nonliteral")
va_end(ap);
}
@@ -644,7 +644,7 @@ print_indent(int indent)
indent *= TAB_SPACE;
for (; indent > 0; --indent)
- HDfputc(' ', output);
+ fputc(' ', output);
}
static void
@@ -777,7 +777,7 @@ report_parameters(struct options *opts)
}
{
- char *prefix = HDgetenv("HDF5_PREFIX");
+ char *prefix = getenv("HDF5_PREFIX");
fprintf(output, "Env HDF5_PREFIX=%s\n", (prefix ? prefix : "not set"));
}
@@ -824,14 +824,14 @@ parse_command_line(int argc, const char *const *argv)
cl_opts->vfd = sec2;
- cl_opts->print_times = FALSE; /* Printing times is off by default */
- cl_opts->print_raw = FALSE; /* Printing raw data throughput is off by default */
+ cl_opts->print_times = false; /* Printing times is off by default */
+ cl_opts->print_raw = false; /* Printing raw data throughput is off by default */
cl_opts->h5_alignment = 1; /* No alignment for HDF5 objects by default */
cl_opts->h5_threshold = 1; /* No threshold for aligning HDF5 objects by default */
- cl_opts->h5_use_chunks = FALSE; /* Don't chunk the HDF5 dataset by default */
- cl_opts->h5_write_only = FALSE; /* Do both read and write by default */
- cl_opts->h5_extendable = FALSE; /* Use extendable dataset */
- cl_opts->verify = FALSE; /* No Verify data correctness by default */
+ cl_opts->h5_use_chunks = false; /* Don't chunk the HDF5 dataset by default */
+ cl_opts->h5_write_only = false; /* Do both read and write by default */
+ cl_opts->h5_extendable = false; /* Use extendable dataset */
+ cl_opts->verify = false; /* No Verify data correctness by default */
while ((opt = H5_get_option(argc, argv, s_opts, l_opts)) != EOF) {
switch ((char)opt) {
@@ -921,7 +921,7 @@ parse_command_line(int argc, const char *const *argv)
if (isalnum(*end) && i < 10)
buf[i++] = *end;
- if (HDstrlen(buf) > 1 || isdigit(buf[0])) {
+ if (strlen(buf) > 1 || isdigit(buf[0])) {
size_t j;
for (j = 0; j < 10 && buf[j] != '\0'; ++j)
@@ -941,15 +941,15 @@ parse_command_line(int argc, const char *const *argv)
switch (*buf) {
case 'r':
/* Turn on raw data throughput info */
- cl_opts->print_raw = TRUE;
+ cl_opts->print_raw = true;
break;
case 't':
/* Turn on time printing */
- cl_opts->print_times = TRUE;
+ cl_opts->print_times = true;
break;
case 'v':
/* Turn on verify data correctness*/
- cl_opts->verify = TRUE;
+ cl_opts->verify = true;
break;
default:
fprintf(stderr, "sio_perf: invalid --debug option %s\n", buf);
@@ -1029,10 +1029,10 @@ parse_command_line(int argc, const char *const *argv)
}
break;
case 'w':
- cl_opts->h5_write_only = TRUE;
+ cl_opts->h5_write_only = true;
break;
case 't':
- cl_opts->h5_extendable = TRUE;
+ cl_opts->h5_extendable = true;
break;
case 'x': {
const char *end = H5_optarg;
generated by cgit v0.12 at 2024-10-04 02:57:25 (GMT)