diff options
author | Albert Cheng <acheng@hdfgroup.org> | 2002-05-21 18:49:44 (GMT) |
---|---|---|
committer | Albert Cheng <acheng@hdfgroup.org> | 2002-05-21 18:49:44 (GMT) |
commit | c365ae137377312931605095a53f964410d47f61 (patch) | |
tree | f5804ede4d66c5f25caf22062715a7ba3c0e2994 /perform | |
parent | 03ab48c9c306fee878c4f3a97f858f90c078bfdf (diff) | |
download | hdf5-c365ae137377312931605095a53f964410d47f61.zip hdf5-c365ae137377312931605095a53f964410d47f61.tar.gz hdf5-c365ae137377312931605095a53f964410d47f61.tar.bz2 |
[svn-r5446] Purpose:
Feature
Description:
moved the routines of setting up and dumping MPI-info object to
test library so that it is avaiable for all tests too.
Platforms tested:
modi4(pp), eirene (serial)
Diffstat (limited to 'perform')
-rw-r--r-- | perform/pio_engine.c | 17 | ||||
-rw-r--r-- | perform/pio_perf.c | 52 |
2 files changed, 2 insertions, 67 deletions
diff --git a/perform/pio_engine.c b/perform/pio_engine.c index bf2d30c..3c6adf0 100644 --- a/perform/pio_engine.c +++ b/perform/pio_engine.c @@ -146,21 +146,7 @@ do_pio(parameters param) /* debug */ if (pio_debug_level>=4) { - if (pio_info_g==MPI_INFO_NULL){ - printf("INFO object is MPI_INFO_NULL\n"); - } - else { - char value[128]; - int flag; - MPI_Info_get(pio_info_g, "IBM_largeblock_io", 127, value, &flag); - printf("after MPI_Info_get, flag=%d\n", flag); - if (flag){ - printf("found IBM_largeblock_io=%s, in info object\n", value); - }else{ - printf("could not find IBM_largeblock_io in info object\n"); - } - - } + h5_dump_info_object(pio_info_g); } /* IO type */ @@ -1103,7 +1089,6 @@ do_cleanupfile(iotype iot, char *fname) } } - #ifndef TIME_MPI #define TIME_MPI #endif diff --git a/perform/pio_perf.c b/perform/pio_perf.c index 81ba8da..0f6cec6 100644 --- a/perform/pio_perf.c +++ b/perform/pio_perf.c @@ -284,7 +284,7 @@ main(int argc, char **argv) pio_comm_g = MPI_COMM_WORLD; - parse_environment(); + h5_set_info_object(); opts = parse_command_line(argc, argv); if (!opts) { @@ -1044,56 +1044,6 @@ usage(const char *prog) } } -/* - * Function: parse_environment - * Purpose: Process all environment variables setting. - * Return: 0 if all is fine; otherwise non-zero. - * Programmer: Albert Cheng, 15 May 2002. - * Modifications: - */ -static int -parse_environment(void) -{ - char *envp; /* environment pointer */ - char *envendp; /* end of environment string */ - char *namep, *valp; /* name, value pointers */ - int mpi_err; - int ret_value=0; - - /* handle any MPI INFO hints via $HDF5_MPI_INFO */ - if ((envp = getenv("HDF5_MPI_INFO")) != NULL){ - envp = HDstrdup(envp); - envendp = HDstrchr(envp, NULL); /* remember end of string */ - - /* create an INFO object if not created yet */ - if (pio_info_g==MPI_INFO_NULL) - MPI_Info_create (&pio_info_g); - - /* parse only one setting. Need to extend it to handle multiple */ - /* settings. LATER */ - namep=envp; - valp=HDstrchr(namep, '='); - if (valp != NULL){ - /* change '=' to NULL, move valp down one */ - *valp++ = NULL; - if (MPI_SUCCESS!=MPI_Info_set(pio_info_g, namep, valp)){ - printf("MPI_Info_set failed\n"); - ret_value = -1; - }else{ - /* will not print because debug option is not parsed yet? */ - if (pio_debug_level>=4){ - printf("MPI_Info_set with %s=%s.\n", namep, valp); - } - } - - } - } - - if (envp) - HDfree(envp); - return(ret_value); -} - #else /* H5_HAVE_PARALLEL */ /* |