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.c24
-rw-r--r--tools/src/h5perf/pio_perf.c14
-rw-r--r--tools/src/h5perf/sio_engine.c34
-rw-r--r--tools/src/h5perf/sio_perf.c8
4 files changed, 40 insertions, 40 deletions
diff --git a/tools/src/h5perf/pio_engine.c b/tools/src/h5perf/pio_engine.c
index 8830c82..c2131ac 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);
@@ -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 f2b561c..232ac93 100644
--- a/tools/src/h5perf/pio_perf.c
+++ b/tools/src/h5perf/pio_perf.c
@@ -739,7 +739,7 @@ h5_set_info_object(void)
if ((envp = HDgetenv("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);
}
}
@@ -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)
diff --git a/tools/src/h5perf/sio_engine.c b/tools/src/h5perf/sio_engine.c
index 5c2b504..28f4eed 100644
--- a/tools/src/h5perf/sio_engine.c
+++ b/tools/src/h5perf/sio_engine.c
@@ -197,7 +197,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)
@@ -339,11 +339,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 +353,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 +369,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 +513,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 +836,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");
@@ -1153,13 +1153,13 @@ 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);
}
@@ -1175,7 +1175,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;
@@ -1274,7 +1274,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)
@@ -1294,10 +1294,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 bab8d97..ca3d5c0 100644
--- a/tools/src/h5perf/sio_perf.c
+++ b/tools/src/h5perf/sio_perf.c
@@ -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
@@ -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)
generated by cgit v0.12 at 2024-07-08 10:25:43 (GMT)