[mpich2-commits] r6739 - in mpich2/trunk/src/mpi/romio/adio: ad_bgl ad_gridftp ad_lustre ad_nfs ad_panfs ad_pfs ad_piofs ad_pvfs ad_pvfs2 ad_xfs common include
goodell at mcs.anl.gov
goodell at mcs.anl.gov
Tue May 25 13:59:13 CDT 2010
Author: goodell
Date: 2010-05-25 13:59:13 -0500 (Tue, 25 May 2010)
New Revision: 6739
Modified:
mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_hints.c
mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_read.c
mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_wrcoll.c
mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_write.c
mpich2/trunk/src/mpi/romio/adio/ad_gridftp/ad_gridftp_hints.c
mpich2/trunk/src/mpi/romio/adio/ad_gridftp/ad_gridftp_open.c
mpich2/trunk/src/mpi/romio/adio/ad_lustre/ad_lustre_hints.c
mpich2/trunk/src/mpi/romio/adio/ad_lustre/ad_lustre_open.c
mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_read.c
mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_write.c
mpich2/trunk/src/mpi/romio/adio/ad_panfs/ad_panfs_hints.c
mpich2/trunk/src/mpi/romio/adio/ad_panfs/ad_panfs_open.c
mpich2/trunk/src/mpi/romio/adio/ad_pfs/ad_pfs_hints.c
mpich2/trunk/src/mpi/romio/adio/ad_pfs/ad_pfs_open.c
mpich2/trunk/src/mpi/romio/adio/ad_piofs/ad_piofs_hints.c
mpich2/trunk/src/mpi/romio/adio/ad_piofs/ad_piofs_open.c
mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_hints.c
mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_open.c
mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_hints.c
mpich2/trunk/src/mpi/romio/adio/ad_xfs/ad_xfs_hints.c
mpich2/trunk/src/mpi/romio/adio/common/ad_aggregate_new.c
mpich2/trunk/src/mpi/romio/adio/common/ad_hints.c
mpich2/trunk/src/mpi/romio/adio/common/ad_open.c
mpich2/trunk/src/mpi/romio/adio/common/ad_read_str.c
mpich2/trunk/src/mpi/romio/adio/common/ad_write_coll.c
mpich2/trunk/src/mpi/romio/adio/common/cb_config_list.c
mpich2/trunk/src/mpi/romio/adio/common/system_hints.c
mpich2/trunk/src/mpi/romio/adio/include/adioi.h
Log:
avoid MPI_Info key/val const-correctness warnings in ROMIO
Many of the key (and for MPI_Info_set, value) arguments are string
literals, which elicit warnings about "discards qualifier" because the
MPI_Info interface is not itself const-correct. This commit adds
ADIOI_Info_ helper macros that cast away the const qualifier and
converts most uses of MPI_Info_ functions to use the new macros.
Reviewed by robl at .
Modified: mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_hints.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_hints.c 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_hints.c 2010-05-25 18:59:13 UTC (rev 6739)
@@ -61,15 +61,15 @@
did_anything = 1;
/* buffer size for collective I/O */
- MPI_Info_set(info, "cb_buffer_size", ADIOI_BGL_CB_BUFFER_SIZE_DFLT);
+ ADIOI_Info_set(info, "cb_buffer_size", ADIOI_BGL_CB_BUFFER_SIZE_DFLT);
fd->hints->cb_buffer_size = atoi(ADIOI_BGL_CB_BUFFER_SIZE_DFLT);
/* default is to let romio automatically decide when to use
* collective buffering
*/
- MPI_Info_set(info, "romio_cb_read", "enable");
+ ADIOI_Info_set(info, "romio_cb_read", "enable");
fd->hints->cb_read = ADIOI_HINT_ENABLE;
- MPI_Info_set(info, "romio_cb_write", "enable");
+ ADIOI_Info_set(info, "romio_cb_write", "enable");
fd->hints->cb_write = ADIOI_HINT_ENABLE;
if ( fd->hints->cb_config_list != NULL ) ADIOI_Free (fd->hints->cb_config_list);
@@ -79,53 +79,53 @@
MPI_Comm_size(fd->comm, &nprocs);
nprocs_is_valid = 1;
ADIOI_Snprintf(value, MPI_MAX_INFO_VAL+1, "%d", nprocs);
- MPI_Info_set(info, "cb_nodes", value);
+ ADIOI_Info_set(info, "cb_nodes", value);
fd->hints->cb_nodes = -1;
/* hint indicating that no indep. I/O will be performed on this file */
- MPI_Info_set(info, "romio_no_indep_rw", "false");
+ ADIOI_Info_set(info, "romio_no_indep_rw", "false");
fd->hints->no_indep_rw = 0;
/* bgl is not implementing file realms (ADIOI_IOStridedColl),
initialize to disabled it. */
/* hint instructing the use of persistent file realms */
- MPI_Info_set(info, "romio_cb_pfr", "disable");
+ ADIOI_Info_set(info, "romio_cb_pfr", "disable");
fd->hints->cb_pfr = ADIOI_HINT_DISABLE;
/* hint guiding the assignment of persistent file realms */
- MPI_Info_set(info, "romio_cb_fr_types", "aar");
+ ADIOI_Info_set(info, "romio_cb_fr_types", "aar");
fd->hints->cb_fr_type = ADIOI_FR_AAR;
/* hint to align file realms with a certain byte value */
- MPI_Info_set(info, "romio_cb_fr_alignment", "1");
+ ADIOI_Info_set(info, "romio_cb_fr_alignment", "1");
fd->hints->cb_fr_alignment = 1;
/* hint to set a threshold percentage for a datatype's size/extent at
* which data sieving should be done in collective I/O */
- MPI_Info_set(info, "romio_cb_ds_threshold", "0");
+ ADIOI_Info_set(info, "romio_cb_ds_threshold", "0");
fd->hints->cb_ds_threshold = 0;
/* hint to switch between point-to-point or all-to-all for two-phase */
- MPI_Info_set(info, "romio_cb_alltoall", "automatic");
+ ADIOI_Info_set(info, "romio_cb_alltoall", "automatic");
fd->hints->cb_alltoall = ADIOI_HINT_AUTO;
/* deferred_open derived from no_indep_rw and cb_{read,write} */
fd->hints->deferred_open = 0;
/* buffer size for data sieving in independent reads */
- MPI_Info_set(info, "ind_rd_buffer_size", ADIOI_BGL_IND_RD_BUFFER_SIZE_DFLT);
+ ADIOI_Info_set(info, "ind_rd_buffer_size", ADIOI_BGL_IND_RD_BUFFER_SIZE_DFLT);
fd->hints->ind_rd_buffer_size = atoi(ADIOI_BGL_IND_RD_BUFFER_SIZE_DFLT);
/* buffer size for data sieving in independent writes */
- MPI_Info_set(info, "ind_wr_buffer_size", ADIOI_BGL_IND_WR_BUFFER_SIZE_DFLT);
+ ADIOI_Info_set(info, "ind_wr_buffer_size", ADIOI_BGL_IND_WR_BUFFER_SIZE_DFLT);
fd->hints->ind_wr_buffer_size = atoi(ADIOI_BGL_IND_WR_BUFFER_SIZE_DFLT);
if(fd->file_system == ADIO_UFS)
{
/* default for ufs/pvfs is to disable data sieving */
- MPI_Info_set(info, "romio_ds_read", "disable");
+ ADIOI_Info_set(info, "romio_ds_read", "disable");
fd->hints->ds_read = ADIOI_HINT_DISABLE;
- MPI_Info_set(info, "romio_ds_write", "disable");
+ ADIOI_Info_set(info, "romio_ds_write", "disable");
fd->hints->ds_write = ADIOI_HINT_DISABLE;
}
else
@@ -133,9 +133,9 @@
/* default is to let romio automatically decide when to use data
* sieving
*/
- MPI_Info_set(info, "romio_ds_read", "automatic");
+ ADIOI_Info_set(info, "romio_ds_read", "automatic");
fd->hints->ds_read = ADIOI_HINT_AUTO;
- MPI_Info_set(info, "romio_ds_write", "automatic");
+ ADIOI_Info_set(info, "romio_ds_write", "automatic");
fd->hints->ds_write = ADIOI_HINT_AUTO;
}
@@ -149,7 +149,7 @@
/* add in user's info if supplied */
if (users_info != MPI_INFO_NULL) {
- MPI_Info_get(users_info, "cb_buffer_size", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "cb_buffer_size", MPI_MAX_INFO_VAL,
value, &flag);
if (flag && ((intval=atoi(value)) > 0)) {
tmp_val = intval;
@@ -164,7 +164,7 @@
}
/* --END ERROR HANDLING-- */
- MPI_Info_set(info, "cb_buffer_size", value);
+ ADIOI_Info_set(info, "cb_buffer_size", value);
fd->hints->cb_buffer_size = intval;
}
@@ -172,7 +172,7 @@
/* bgl is not implementing file realms (ADIOI_IOStridedColl) ... */
/* aligning file realms to certain sizes (e.g. stripe sizes)
* may benefit I/O performance */
- MPI_Info_get(users_info, "romio_cb_fr_alignment", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "romio_cb_fr_alignment", MPI_MAX_INFO_VAL,
value, &flag);
if (flag && ((intval=atoi(value)) > 0)) {
tmp_val = intval;
@@ -187,7 +187,7 @@
}
/* --END ERROR HANDLING-- */
- MPI_Info_set(info, "romio_cb_fr_alignment", value);
+ ADIOI_Info_set(info, "romio_cb_fr_alignment", value);
fd->hints->cb_fr_alignment = intval;
}
@@ -195,7 +195,7 @@
/* for collective I/O, try to be smarter about when to do data sieving
* using a specific threshold for the datatype size/extent
* (percentage 0-100%) */
- MPI_Info_get(users_info, "romio_cb_ds_threshold", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "romio_cb_ds_threshold", MPI_MAX_INFO_VAL,
value, &flag);
if (flag && ((intval=atoi(value)) > 0)) {
tmp_val = intval;
@@ -210,24 +210,24 @@
}
/* --END ERROR HANDLING-- */
- MPI_Info_set(info, "romio_cb_ds_threshold", value);
+ ADIOI_Info_set(info, "romio_cb_ds_threshold", value);
fd->hints->cb_ds_threshold = intval;
}
- MPI_Info_get(users_info, "romio_cb_alltoall", MPI_MAX_INFO_VAL, value,
+ ADIOI_Info_get(users_info, "romio_cb_alltoall", MPI_MAX_INFO_VAL, value,
&flag);
if (flag) {
if (!strcmp(value, "enable") || !strcmp(value, "ENABLE")) {
- MPI_Info_set(info, "romio_cb_alltoall", value);
+ ADIOI_Info_set(info, "romio_cb_alltoall", value);
fd->hints->cb_read = ADIOI_HINT_ENABLE;
}
else if (!strcmp(value, "disable") || !strcmp(value, "DISABLE")) {
- MPI_Info_set(info, "romio_cb_alltoall", value);
+ ADIOI_Info_set(info, "romio_cb_alltoall", value);
fd->hints->cb_read = ADIOI_HINT_DISABLE;
}
else if (!strcmp(value, "automatic") || !strcmp(value, "AUTOMATIC"))
{
- MPI_Info_set(info, "romio_cb_alltoall", value);
+ ADIOI_Info_set(info, "romio_cb_alltoall", value);
fd->hints->cb_read = ADIOI_HINT_AUTO;
}
@@ -247,23 +247,23 @@
/* new hints for enabling/disabling coll. buffering on
* reads/writes
*/
- MPI_Info_get(users_info, "romio_cb_read", MPI_MAX_INFO_VAL, value,
+ ADIOI_Info_get(users_info, "romio_cb_read", MPI_MAX_INFO_VAL, value,
&flag);
if (flag) {
if (!strcmp(value, "enable") || !strcmp(value, "ENABLE")) {
- MPI_Info_set(info, "romio_cb_read", value);
+ ADIOI_Info_set(info, "romio_cb_read", value);
fd->hints->cb_read = ADIOI_HINT_ENABLE;
}
else if (!strcmp(value, "disable") || !strcmp(value, "DISABLE")) {
/* romio_cb_read overrides no_indep_rw */
- MPI_Info_set(info, "romio_cb_read", value);
- MPI_Info_set(info, "romio_no_indep_rw", "false");
+ ADIOI_Info_set(info, "romio_cb_read", value);
+ ADIOI_Info_set(info, "romio_no_indep_rw", "false");
fd->hints->cb_read = ADIOI_HINT_DISABLE;
fd->hints->no_indep_rw = ADIOI_HINT_DISABLE;
}
else if (!strcmp(value, "automatic") || !strcmp(value, "AUTOMATIC"))
{
- MPI_Info_set(info, "romio_cb_read", value);
+ ADIOI_Info_set(info, "romio_cb_read", value);
fd->hints->cb_read = ADIOI_HINT_AUTO;
}
@@ -279,25 +279,25 @@
}
/* --END ERROR HANDLING-- */
}
- MPI_Info_get(users_info, "romio_cb_write", MPI_MAX_INFO_VAL, value,
+ ADIOI_Info_get(users_info, "romio_cb_write", MPI_MAX_INFO_VAL, value,
&flag);
if (flag) {
if (!strcmp(value, "enable") || !strcmp(value, "ENABLE")) {
- MPI_Info_set(info, "romio_cb_write", value);
+ ADIOI_Info_set(info, "romio_cb_write", value);
fd->hints->cb_write = ADIOI_HINT_ENABLE;
}
else if (!strcmp(value, "disable") || !strcmp(value, "DISABLE"))
{
/* romio_cb_write overrides no_indep_rw, too */
- MPI_Info_set(info, "romio_cb_write", value);
- MPI_Info_set(info, "romio_no_indep_rw", "false");
+ ADIOI_Info_set(info, "romio_cb_write", value);
+ ADIOI_Info_set(info, "romio_no_indep_rw", "false");
fd->hints->cb_write = ADIOI_HINT_DISABLE;
fd->hints->no_indep_rw = ADIOI_HINT_DISABLE;
}
else if (!strcmp(value, "automatic") ||
!strcmp(value, "AUTOMATIC"))
{
- MPI_Info_set(info, "romio_cb_write", value);
+ ADIOI_Info_set(info, "romio_cb_write", value);
fd->hints->cb_write = ADIOI_HINT_AUTO;
}
@@ -318,20 +318,20 @@
/* bgl is not implementing file realms (ADIOI_IOStridedColl) ... */
/* enable/disable persistent file realms for collective I/O */
/* may want to check for no_indep_rdwr hint as well */
- MPI_Info_get(users_info, "romio_cb_pfr", MPI_MAX_INFO_VAL, value,
+ ADIOI_Info_get(users_info, "romio_cb_pfr", MPI_MAX_INFO_VAL, value,
&flag);
if (flag) {
if (!strcmp(value, "enable") || !strcmp(value, "ENABLE")) {
- MPI_Info_set(info, "romio_cb_pfr", value);
+ ADIOI_Info_set(info, "romio_cb_pfr", value);
fd->hints->cb_pfr = ADIOI_HINT_ENABLE;
}
else if (!strcmp(value, "disable") || !strcmp(value, "DISABLE")) {
- MPI_Info_set(info, "romio_cb_pfr", value);
+ ADIOI_Info_set(info, "romio_cb_pfr", value);
fd->hints->cb_pfr = ADIOI_HINT_DISABLE;
}
else if (!strcmp(value, "automatic") || !strcmp(value, "AUTOMATIC"))
{
- MPI_Info_set(info, "romio_cb_pfr", value);
+ ADIOI_Info_set(info, "romio_cb_pfr", value);
fd->hints->cb_pfr = ADIOI_HINT_AUTO;
}
@@ -351,7 +351,7 @@
/* file realm assignment types ADIOI_FR_AAR(0),
ADIOI_FR_FSZ(-1), ADIOI_FR_USR_REALMS(-2), all others specify
a regular fr size in bytes. probably not the best way... */
- MPI_Info_get(users_info, "romio_cb_fr_type", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "romio_cb_fr_type", MPI_MAX_INFO_VAL,
value, &flag);
if (flag && ((intval=atoi(value)) >= -2)) {
tmp_val = intval;
@@ -366,29 +366,29 @@
}
/* --END ERROR HANDLING-- */
- MPI_Info_set(info, "romio_cb_fr_type", value);
+ ADIOI_Info_set(info, "romio_cb_fr_type", value);
fd->hints->cb_fr_type = intval;
}
#endif
/* new hint for specifying no indep. read/write will be performed */
- MPI_Info_get(users_info, "romio_no_indep_rw", MPI_MAX_INFO_VAL, value,
+ ADIOI_Info_get(users_info, "romio_no_indep_rw", MPI_MAX_INFO_VAL, value,
&flag);
if (flag) {
if (!strcmp(value, "true") || !strcmp(value, "TRUE")) {
/* if 'no_indep_rw' set, also hint that we will do
* collective buffering: if we aren't doing independent io,
* then we have to do collective */
- MPI_Info_set(info, "romio_no_indep_rw", value);
- MPI_Info_set(info, "romio_cb_write", "enable");
- MPI_Info_set(info, "romio_cb_read", "enable");
+ ADIOI_Info_set(info, "romio_no_indep_rw", value);
+ ADIOI_Info_set(info, "romio_cb_write", "enable");
+ ADIOI_Info_set(info, "romio_cb_read", "enable");
fd->hints->no_indep_rw = 1;
fd->hints->cb_read = 1;
fd->hints->cb_write = 1;
tmp_val = 1;
}
else if (!strcmp(value, "false") || !strcmp(value, "FALSE")) {
- MPI_Info_set(info, "romio_no_indep_rw", value);
+ ADIOI_Info_set(info, "romio_no_indep_rw", value);
fd->hints->no_indep_rw = 0;
tmp_val = 0;
}
@@ -410,80 +410,80 @@
/* new hints for enabling/disabling data sieving on
* reads/writes
*/
- MPI_Info_get(users_info, "romio_ds_read", MPI_MAX_INFO_VAL, value,
+ ADIOI_Info_get(users_info, "romio_ds_read", MPI_MAX_INFO_VAL, value,
&flag);
if (flag) {
if (!strcmp(value, "enable") || !strcmp(value, "ENABLE")) {
- MPI_Info_set(info, "romio_ds_read", value);
+ ADIOI_Info_set(info, "romio_ds_read", value);
fd->hints->ds_read = ADIOI_HINT_ENABLE;
}
else if (!strcmp(value, "disable") || !strcmp(value, "DISABLE")) {
- MPI_Info_set(info, "romio_ds_read", value);
+ ADIOI_Info_set(info, "romio_ds_read", value);
fd->hints->ds_read = ADIOI_HINT_DISABLE;
}
else if (!strcmp(value, "automatic") || !strcmp(value, "AUTOMATIC"))
{
- MPI_Info_set(info, "romio_ds_read", value);
+ ADIOI_Info_set(info, "romio_ds_read", value);
fd->hints->ds_read = ADIOI_HINT_AUTO;
}
/* otherwise ignore */
}
- MPI_Info_get(users_info, "romio_ds_write", MPI_MAX_INFO_VAL, value,
+ ADIOI_Info_get(users_info, "romio_ds_write", MPI_MAX_INFO_VAL, value,
&flag);
if (flag) {
if (!strcmp(value, "enable") || !strcmp(value, "ENABLE")) {
- MPI_Info_set(info, "romio_ds_write", value);
+ ADIOI_Info_set(info, "romio_ds_write", value);
fd->hints->ds_write = ADIOI_HINT_ENABLE;
}
else if (!strcmp(value, "disable") || !strcmp(value, "DISABLE")) {
- MPI_Info_set(info, "romio_ds_write", value);
+ ADIOI_Info_set(info, "romio_ds_write", value);
fd->hints->ds_write = ADIOI_HINT_DISABLE;
}
else if (!strcmp(value, "automatic") || !strcmp(value, "AUTOMATIC"))
{
- MPI_Info_set(info, "romio_ds_write", value);
+ ADIOI_Info_set(info, "romio_ds_write", value);
fd->hints->ds_write = ADIOI_HINT_AUTO;
}
/* otherwise ignore */
}
- MPI_Info_get(users_info, "ind_wr_buffer_size", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "ind_wr_buffer_size", MPI_MAX_INFO_VAL,
value, &flag);
if (flag && ((intval = atoi(value)) > 0)) {
- MPI_Info_set(info, "ind_wr_buffer_size", value);
+ ADIOI_Info_set(info, "ind_wr_buffer_size", value);
fd->hints->ind_wr_buffer_size = intval;
}
- MPI_Info_get(users_info, "ind_rd_buffer_size", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "ind_rd_buffer_size", MPI_MAX_INFO_VAL,
value, &flag);
if (flag && ((intval = atoi(value)) > 0)) {
- MPI_Info_set(info, "ind_rd_buffer_size", value);
+ ADIOI_Info_set(info, "ind_rd_buffer_size", value);
fd->hints->ind_rd_buffer_size = intval;
}
memset( value, 0, MPI_MAX_INFO_VAL+1 );
- MPI_Info_get(users_info, "romio_min_fdomain_size", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "romio_min_fdomain_size", MPI_MAX_INFO_VAL,
value, &flag);
if ( flag && ((intval = atoi(value)) > 0) ) {
- MPI_Info_set(info, "romio_min_fdomain_size", value);
+ ADIOI_Info_set(info, "romio_min_fdomain_size", value);
fd->hints->min_fdomain_size = intval;
}
/* Now we use striping unit in common code so we should
process hints for it. */
- MPI_Info_get(users_info, "striping_unit", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "striping_unit", MPI_MAX_INFO_VAL,
value, &flag);
if ( flag && ((intval = atoi(value)) > 0) ) {
- MPI_Info_set(info, "striping_unit", value);
+ ADIOI_Info_set(info, "striping_unit", value);
fd->hints->striping_unit = intval;
}
memset( value, 0, MPI_MAX_INFO_VAL+1 );
- MPI_Info_get(users_info, ADIOI_BGL_NAGG_IN_PSET_HINT_NAME, MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, ADIOI_BGL_NAGG_IN_PSET_HINT_NAME, MPI_MAX_INFO_VAL,
value, &flag);
if (flag && ((intval = atoi(value)) > 0)) {
did_anything = 1;
- MPI_Info_set(info, ADIOI_BGL_NAGG_IN_PSET_HINT_NAME, value);
+ ADIOI_Info_set(info, ADIOI_BGL_NAGG_IN_PSET_HINT_NAME, value);
fd->hints->cb_nodes = intval;
}
}
@@ -495,7 +495,7 @@
/* ignore defered open hints and do not enable it for bluegene: need all
* processors in the open path so we can stat-and-broadcast the blocksize
*/
- MPI_Info_set(info, "romio_no_indep_rw", "false");
+ ADIOI_Info_set(info, "romio_no_indep_rw", "false");
fd->hints->no_indep_rw = 0;
fd->hints->deferred_open = 0;
@@ -505,16 +505,16 @@
if (ADIO_Feature(fd, ADIO_DATA_SIEVING_WRITES) == 0) {
/* disable data sieving for fs that do not
support file locking */
- MPI_Info_get(info, "ind_wr_buffer_size", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(info, "ind_wr_buffer_size", MPI_MAX_INFO_VAL,
value, &flag);
if (flag) {
/* get rid of this value if it is set */
- MPI_Info_delete(info, "ind_wr_buffer_size");
+ ADIOI_Info_delete(info, "ind_wr_buffer_size");
}
/* note: leave ind_wr_buffer_size alone; used for other cases
* as well. -- Rob Ross, 04/22/2003
*/
- MPI_Info_set(info, "romio_ds_write", "disable");
+ ADIOI_Info_set(info, "romio_ds_write", "disable");
fd->hints->ds_write = ADIOI_HINT_DISABLE;
}
Modified: mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_read.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_read.c 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_read.c 2010-05-25 18:59:13 UTC (rev 6739)
@@ -218,7 +218,7 @@
/* get max_bufsize from the info object. */
value = (char *) ADIOI_Malloc((MPI_MAX_INFO_VAL+1)*sizeof(char));
- MPI_Info_get(fd->info, "ind_rd_buffer_size", MPI_MAX_INFO_VAL, value,
+ ADIOI_Info_get(fd->info, "ind_rd_buffer_size", MPI_MAX_INFO_VAL, value,
&info_flag);
max_bufsize = atoi(value);
ADIOI_Free(value);
Modified: mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_wrcoll.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_wrcoll.c 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_wrcoll.c 2010-05-25 18:59:13 UTC (rev 6739)
@@ -463,7 +463,7 @@
That gives the no. of communication phases as well. */
value = (char *) ADIOI_Malloc((MPI_MAX_INFO_VAL+1)*sizeof(char));
- MPI_Info_get(fd->info, "cb_buffer_size", MPI_MAX_INFO_VAL, value,
+ ADIOI_Info_get(fd->info, "cb_buffer_size", MPI_MAX_INFO_VAL, value,
&info_flag);
coll_bufsize = atoi(value);
ADIOI_Free(value);
Modified: mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_write.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_write.c 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_write.c 2010-05-25 18:59:13 UTC (rev 6739)
@@ -268,7 +268,7 @@
/* get max_bufsize from the info object. */
value = (char *) ADIOI_Malloc((MPI_MAX_INFO_VAL+1)*sizeof(char));
- MPI_Info_get(fd->info, "ind_wr_buffer_size", MPI_MAX_INFO_VAL, value,
+ ADIOI_Info_get(fd->info, "ind_wr_buffer_size", MPI_MAX_INFO_VAL, value,
&info_flag);
max_bufsize = atoi(value);
ADIOI_Free(value);
Modified: mpich2/trunk/src/mpi/romio/adio/ad_gridftp/ad_gridftp_hints.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_gridftp/ad_gridftp_hints.c 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/ad_gridftp/ad_gridftp_hints.c 2010-05-25 18:59:13 UTC (rev 6739)
@@ -56,8 +56,8 @@
MPI_Info_get_valuelen(users_info,key,&valuelen,&flag);
if (flag)
{
- MPI_Info_get(users_info,key,valuelen,value,&flag);
- if (flag) MPI_Info_set(fd->info,key,value);
+ ADIOI_Info_get(users_info,key,valuelen,value,&flag);
+ if (flag) ADIOI_Info_set(fd->info,key,value);
}
}
}
Modified: mpich2/trunk/src/mpi/romio/adio/ad_gridftp/ad_gridftp_open.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_gridftp/ad_gridftp_open.c 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/ad_gridftp/ad_gridftp_open.c 2010-05-25 18:59:13 UTC (rev 6739)
@@ -136,7 +136,7 @@
oattr[] (eg. parallelism, striping, etc.) goes here */
if ( fd->info!=MPI_INFO_NULL )
{
- MPI_Info_get(fd->info,"ftp_control_mode",MPI_MAX_INFO_VAL,hintval,&keyfound);
+ ADIOI_Info_get(fd->info,"ftp_control_mode",MPI_MAX_INFO_VAL,hintval,&keyfound);
if ( keyfound )
{
if ( ( !strcmp(hintval,"extended") || !strcmp(hintval,"extended_block") ) &&
@@ -153,7 +153,7 @@
globus_err_handler("globus_ftp_client_operationattr_set_mode",myname,result);
}
- MPI_Info_get(fd->info,"parallelism",MPI_MAX_INFO_VAL,hintval,&keyfound);
+ ADIOI_Info_get(fd->info,"parallelism",MPI_MAX_INFO_VAL,hintval,&keyfound);
if ( keyfound )
{
int nftpthreads;
@@ -170,14 +170,14 @@
}
}
- MPI_Info_get(fd->info,"striped_ftp",MPI_MAX_INFO_VAL,hintval,&keyfound);
+ ADIOI_Info_get(fd->info,"striped_ftp",MPI_MAX_INFO_VAL,hintval,&keyfound);
if ( keyfound )
{
/* if set to "true" or "enable", set up round-robin block layout */
if ( !strncmp("true",hintval,4) || !strncmp("TRUE",hintval,4) ||
!strncmp("enable",hintval,4) || !strncmp("ENABLE",hintval,4) )
{
- MPI_Info_get(fd->info,"striping_factor",MPI_MAX_INFO_VAL,hintval,&keyfound);
+ ADIOI_Info_get(fd->info,"striping_factor",MPI_MAX_INFO_VAL,hintval,&keyfound);
if ( keyfound )
{
int striping_factor;
@@ -197,7 +197,7 @@
}
}
- MPI_Info_get(fd->info,"tcp_buffer",MPI_MAX_INFO_VAL,hintval,&keyfound);
+ ADIOI_Info_get(fd->info,"tcp_buffer",MPI_MAX_INFO_VAL,hintval,&keyfound);
if ( keyfound )
{
/* set tcp buffer size */
@@ -214,7 +214,7 @@
}
}
- MPI_Info_get(fd->info,"transfer_type",MPI_MAX_INFO_VAL,hintval,&keyfound);
+ ADIOI_Info_get(fd->info,"transfer_type",MPI_MAX_INFO_VAL,hintval,&keyfound);
if ( keyfound )
{
globus_ftp_control_type_t filetype;
Modified: mpich2/trunk/src/mpi/romio/adio/ad_lustre/ad_lustre_hints.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_lustre/ad_lustre_hints.c 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/ad_lustre/ad_lustre_hints.c 2010-05-25 18:59:13 UTC (rev 6739)
@@ -26,47 +26,47 @@
if necessary. */
MPI_Info_create(&(fd->info));
- MPI_Info_set(fd->info, "direct_read", "false");
- MPI_Info_set(fd->info, "direct_write", "false");
+ ADIOI_Info_set(fd->info, "direct_read", "false");
+ ADIOI_Info_set(fd->info, "direct_write", "false");
fd->direct_read = fd->direct_write = 0;
/* initialize lustre hints */
- MPI_Info_set(fd->info, "romio_lustre_co_ratio", "1");
+ ADIOI_Info_set(fd->info, "romio_lustre_co_ratio", "1");
fd->hints->fs_hints.lustre.co_ratio = 1;
- MPI_Info_set(fd->info, "romio_lustre_coll_threshold", "0");
+ ADIOI_Info_set(fd->info, "romio_lustre_coll_threshold", "0");
fd->hints->fs_hints.lustre.coll_threshold = 0;
- MPI_Info_set(fd->info, "romio_lustre_ds_in_coll", "enable");
+ ADIOI_Info_set(fd->info, "romio_lustre_ds_in_coll", "enable");
fd->hints->fs_hints.lustre.ds_in_coll = ADIOI_HINT_ENABLE;
/* has user specified striping or server buffering parameters
and do they have the same value on all processes? */
if (users_info != MPI_INFO_NULL) {
/* striping information */
- MPI_Info_get(users_info, "striping_unit", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "striping_unit", MPI_MAX_INFO_VAL,
value, &flag);
if (flag)
str_unit=atoi(value);
- MPI_Info_get(users_info, "striping_factor", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "striping_factor", MPI_MAX_INFO_VAL,
value, &flag);
if (flag)
str_factor=atoi(value);
- MPI_Info_get(users_info, "romio_lustre_start_iodevice",
+ ADIOI_Info_get(users_info, "romio_lustre_start_iodevice",
MPI_MAX_INFO_VAL, value, &flag);
if (flag)
start_iodev=atoi(value);
/* direct read and write */
- MPI_Info_get(users_info, "direct_read", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "direct_read", MPI_MAX_INFO_VAL,
value, &flag);
if (flag && (!strcmp(value, "true") || !strcmp(value, "TRUE"))) {
- MPI_Info_set(fd->info, "direct_read", "true");
+ ADIOI_Info_set(fd->info, "direct_read", "true");
fd->direct_read = 1;
}
- MPI_Info_get(users_info, "direct_write", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "direct_write", MPI_MAX_INFO_VAL,
value, &flag);
if (flag && (!strcmp(value, "true") || !strcmp(value, "TRUE"))) {
- MPI_Info_set(fd->info, "direct_write", "true");
+ ADIOI_Info_set(fd->info, "direct_write", "true");
fd->direct_write = 1;
}
}
@@ -138,7 +138,7 @@
if (users_info != MPI_INFO_NULL) {
/* CO: IO Clients/OST,
* to keep the load balancing between clients and OSTs */
- MPI_Info_get(users_info, "romio_lustre_co_ratio", MPI_MAX_INFO_VAL, value,
+ ADIOI_Info_get(users_info, "romio_lustre_co_ratio", MPI_MAX_INFO_VAL, value,
&flag);
if (flag && (int_val = atoi(value)) > 0) {
tmp_val = int_val;
@@ -150,13 +150,13 @@
ADIOI_Free(value);
return;
}
- MPI_Info_set(fd->info, "romio_lustre_co_ratio", value);
+ ADIOI_Info_set(fd->info, "romio_lustre_co_ratio", value);
fd->hints->fs_hints.lustre.co_ratio = atoi(value);
}
/* coll_threshold:
* if the req size is bigger than this, collective IO may not be performed.
*/
- MPI_Info_get(users_info, "romio_lustre_coll_threshold", MPI_MAX_INFO_VAL, value,
+ ADIOI_Info_get(users_info, "romio_lustre_coll_threshold", MPI_MAX_INFO_VAL, value,
&flag);
if (flag && (int_val = atoi(value)) > 0) {
tmp_val = int_val;
@@ -168,11 +168,11 @@
ADIOI_Free(value);
return;
}
- MPI_Info_set(fd->info, "romio_lustre_coll_threshold", value);
+ ADIOI_Info_set(fd->info, "romio_lustre_coll_threshold", value);
fd->hints->fs_hints.lustre.coll_threshold = atoi(value);
}
/* ds_in_coll: disable data sieving in collective IO */
- MPI_Info_get(users_info, "romio_lustre_ds_in_coll", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "romio_lustre_ds_in_coll", MPI_MAX_INFO_VAL,
value, &flag);
if (flag && (!strcmp(value, "disable") ||
!strcmp(value, "DISABLE"))) {
@@ -185,7 +185,7 @@
ADIOI_Free(value);
return;
}
- MPI_Info_set(fd->info, "romio_lustre_ds_in_coll", "disable");
+ ADIOI_Info_set(fd->info, "romio_lustre_ds_in_coll", "disable");
fd->hints->fs_hints.lustre.ds_in_coll = ADIOI_HINT_DISABLE;
}
}
Modified: mpich2/trunk/src/mpi/romio/adio/ad_lustre/ad_lustre_open.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_lustre/ad_lustre_open.c 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/ad_lustre/ad_lustre_open.c 2010-05-25 18:59:13 UTC (rev 6739)
@@ -65,15 +65,15 @@
fd->hints->striping_unit = lum->lmm_stripe_size;
sprintf(value, "%d", lum->lmm_stripe_size);
- MPI_Info_set(fd->info, "striping_unit", value);
+ ADIOI_Info_set(fd->info, "striping_unit", value);
fd->hints->striping_factor = lum->lmm_stripe_count;
sprintf(value, "%d", lum->lmm_stripe_count);
- MPI_Info_set(fd->info, "striping_factor", value);
+ ADIOI_Info_set(fd->info, "striping_factor", value);
fd->hints->fs_hints.lustre.start_iodevice = lum->lmm_stripe_offset;
sprintf(value, "%d", lum->lmm_stripe_offset);
- MPI_Info_set(fd->info, "romio_lustre_start_iodevice", value);
+ ADIOI_Info_set(fd->info, "romio_lustre_start_iodevice", value);
ADIOI_Free(value);
}
Modified: mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_read.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_read.c 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_read.c 2010-05-25 18:59:13 UTC (rev 6739)
@@ -201,7 +201,7 @@
/* get max_bufsize from the info object. */
value = (char *) ADIOI_Malloc((MPI_MAX_INFO_VAL+1)*sizeof(char));
- MPI_Info_get(fd->info, "ind_rd_buffer_size", MPI_MAX_INFO_VAL, value,
+ ADIOI_Info_get(fd->info, "ind_rd_buffer_size", MPI_MAX_INFO_VAL, value,
&info_flag);
max_bufsize = atoi(value);
ADIOI_Free(value);
Modified: mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_write.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_write.c 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_write.c 2010-05-25 18:59:13 UTC (rev 6739)
@@ -304,7 +304,7 @@
/* get max_bufsize from the info object. */
value = (char *) ADIOI_Malloc((MPI_MAX_INFO_VAL+1)*sizeof(char));
- MPI_Info_get(fd->info, "ind_wr_buffer_size", MPI_MAX_INFO_VAL, value,
+ ADIOI_Info_get(fd->info, "ind_wr_buffer_size", MPI_MAX_INFO_VAL, value,
&info_flag);
max_bufsize = atoi(value);
ADIOI_Free(value);
Modified: mpich2/trunk/src/mpi/romio/adio/ad_panfs/ad_panfs_hints.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_panfs/ad_panfs_hints.c 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/ad_panfs/ad_panfs_hints.c 2010-05-25 18:59:13 UTC (rev 6739)
@@ -36,7 +36,7 @@
if (users_info != MPI_INFO_NULL) {
value = (char *) ADIOI_Malloc((MPI_MAX_INFO_VAL+1)*sizeof(char));
- MPI_Info_get(users_info, "panfs_concurrent_write", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "panfs_concurrent_write", MPI_MAX_INFO_VAL,
value, &flag);
if (flag) {
concurrent_write = strtoul(value,NULL,10);
@@ -46,10 +46,10 @@
FPRINTF(stderr, "ADIOI_PANFS_SetInfo: the value for key \"panfs_concurrent_write\" must be the same on all processes\n");
MPI_Abort(MPI_COMM_WORLD, 1);
}
- MPI_Info_set(fd->info, "panfs_concurrent_write", value);
+ ADIOI_Info_set(fd->info, "panfs_concurrent_write", value);
}
- MPI_Info_get(users_info, "panfs_layout_type", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "panfs_layout_type", MPI_MAX_INFO_VAL,
value, &flag);
if (flag) {
layout_type = strtoul(value,NULL,10);
@@ -59,10 +59,10 @@
FPRINTF(stderr, "ADIOI_PANFS_SetInfo: the value for key \"panfs_layout_type\" must be the same on all processes\n");
MPI_Abort(MPI_COMM_WORLD, 1);
}
- MPI_Info_set(fd->info, "panfs_layout_type", value);
+ ADIOI_Info_set(fd->info, "panfs_layout_type", value);
}
- MPI_Info_get(users_info, "panfs_layout_stripe_unit", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "panfs_layout_stripe_unit", MPI_MAX_INFO_VAL,
value, &flag);
if (flag) {
layout_stripe_unit = strtoul(value,NULL,10);
@@ -72,10 +72,10 @@
FPRINTF(stderr, "ADIOI_PANFS_SetInfo: the value for key \"panfs_layout_stripe_unit\" must be the same on all processes\n");
MPI_Abort(MPI_COMM_WORLD, 1);
}
- MPI_Info_set(fd->info, "panfs_layout_stripe_unit", value);
+ ADIOI_Info_set(fd->info, "panfs_layout_stripe_unit", value);
}
- MPI_Info_get(users_info, "panfs_layout_parity_stripe_width", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "panfs_layout_parity_stripe_width", MPI_MAX_INFO_VAL,
value, &flag);
if (flag && (layout_type == PAN_FS_CLIENT_LAYOUT_TYPE__RAID1_5_PARITY_STRIPE)) {
layout_parity_stripe_width = strtoul(value,NULL,10);
@@ -85,10 +85,10 @@
FPRINTF(stderr, "ADIOI_PANFS_SetInfo: the value for key \"panfs_layout_parity_stripe_width\" must be the same on all processes\n");
MPI_Abort(MPI_COMM_WORLD, 1);
}
- MPI_Info_set(fd->info, "panfs_layout_parity_stripe_width", value);
+ ADIOI_Info_set(fd->info, "panfs_layout_parity_stripe_width", value);
}
- MPI_Info_get(users_info, "panfs_layout_parity_stripe_depth", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "panfs_layout_parity_stripe_depth", MPI_MAX_INFO_VAL,
value, &flag);
if (flag && (layout_type == PAN_FS_CLIENT_LAYOUT_TYPE__RAID1_5_PARITY_STRIPE)) {
layout_parity_stripe_depth = strtoul(value,NULL,10);
@@ -98,10 +98,10 @@
FPRINTF(stderr, "ADIOI_PANFS_SetInfo: the value for key \"panfs_layout_parity_stripe_depth\" must be the same on all processes\n");
MPI_Abort(MPI_COMM_WORLD, 1);
}
- MPI_Info_set(fd->info, "panfs_layout_parity_stripe_depth", value);
+ ADIOI_Info_set(fd->info, "panfs_layout_parity_stripe_depth", value);
}
- MPI_Info_get(users_info, "panfs_layout_total_num_comps", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "panfs_layout_total_num_comps", MPI_MAX_INFO_VAL,
value, &flag);
if (flag) {
layout_total_num_comps = strtoul(value,NULL,10);
@@ -111,10 +111,10 @@
FPRINTF(stderr, "ADIOI_PANFS_SetInfo: the value for key \"panfs_layout_total_num_comps\" must be the same on all processes\n");
MPI_Abort(MPI_COMM_WORLD, 1);
}
- MPI_Info_set(fd->info, "panfs_layout_total_num_comps", value);
+ ADIOI_Info_set(fd->info, "panfs_layout_total_num_comps", value);
}
- MPI_Info_get(users_info, "panfs_layout_visit_policy", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "panfs_layout_visit_policy", MPI_MAX_INFO_VAL,
value, &flag);
if (flag && (layout_type == PAN_FS_CLIENT_LAYOUT_TYPE__RAID1_5_PARITY_STRIPE || layout_type == PAN_FS_CLIENT_LAYOUT_TYPE__RAID10)) {
layout_visit_policy = strtoul(value,NULL,10);
@@ -124,7 +124,7 @@
FPRINTF(stderr, "ADIOI_PANFS_SetInfo: the value for key \"panfs_layout_visit_policy\" must be the same on all processes\n");
MPI_Abort(MPI_COMM_WORLD, 1);
}
- MPI_Info_set(fd->info, "panfs_layout_visit_policy", value);
+ ADIOI_Info_set(fd->info, "panfs_layout_visit_policy", value);
}
ADIOI_Free(value);
Modified: mpich2/trunk/src/mpi/romio/adio/ad_panfs/ad_panfs_open.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_panfs/ad_panfs_open.c 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/ad_panfs/ad_panfs_open.c 2010-05-25 18:59:13 UTC (rev 6739)
@@ -39,32 +39,32 @@
*error_code = MPI_SUCCESS;
value = (char *) ADIOI_Malloc((MPI_MAX_INFO_VAL+1)*sizeof(char));
- MPI_Info_get(fd->info, "panfs_layout_type", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(fd->info, "panfs_layout_type", MPI_MAX_INFO_VAL,
value, &flag);
if (flag) {
layout_type = strtoul(value,NULL,10);
}
- MPI_Info_get(fd->info, "panfs_layout_stripe_unit", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(fd->info, "panfs_layout_stripe_unit", MPI_MAX_INFO_VAL,
value, &flag);
if (flag) {
layout_stripe_unit = strtoul(value,NULL,10);
}
- MPI_Info_get(fd->info, "panfs_layout_total_num_comps", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(fd->info, "panfs_layout_total_num_comps", MPI_MAX_INFO_VAL,
value, &flag);
if (flag) {
layout_total_num_comps = strtoul(value,NULL,10);
}
- MPI_Info_get(fd->info, "panfs_layout_parity_stripe_width", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(fd->info, "panfs_layout_parity_stripe_width", MPI_MAX_INFO_VAL,
value, &flag);
if (flag) {
layout_parity_stripe_width = strtoul(value,NULL,10);
}
- MPI_Info_get(fd->info, "panfs_layout_parity_stripe_depth", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(fd->info, "panfs_layout_parity_stripe_depth", MPI_MAX_INFO_VAL,
value, &flag);
if (flag) {
layout_parity_stripe_depth = strtoul(value,NULL,10);
}
- MPI_Info_get(fd->info, "panfs_layout_visit_policy", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(fd->info, "panfs_layout_visit_policy", MPI_MAX_INFO_VAL,
value, &flag);
if (flag) {
layout_visit_policy = strtoul(value,NULL,10);
@@ -266,7 +266,7 @@
amode = amode | O_EXCL;
value = (char *) ADIOI_Malloc((MPI_MAX_INFO_VAL+1)*sizeof(char));
- MPI_Info_get(fd->info, "panfs_concurrent_write", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(fd->info, "panfs_concurrent_write", MPI_MAX_INFO_VAL,
value, &flag);
if (flag) {
unsigned long int concurrent_write = strtoul(value,NULL,10);
@@ -291,41 +291,41 @@
if (rc < 0)
{
/* Error - set layout type to unknown */
- MPI_Info_set(fd->info, "panfs_layout_type", "PAN_FS_CLIENT_LAYOUT_TYPE__INVALID");
+ ADIOI_Info_set(fd->info, "panfs_layout_type", "PAN_FS_CLIENT_LAYOUT_TYPE__INVALID");
}
else
{
ADIOI_Snprintf(temp_buffer,TEMP_BUFFER_SIZE,"%u",file_query_args.layout.agg_type);
- MPI_Info_set(fd->info, "panfs_layout_type", temp_buffer);
+ ADIOI_Info_set(fd->info, "panfs_layout_type", temp_buffer);
if (file_query_args.layout.layout_is_valid == 1)
{
switch (file_query_args.layout.agg_type)
{
case PAN_FS_CLIENT_LAYOUT_TYPE__RAID0:
ADIOI_Snprintf(temp_buffer,TEMP_BUFFER_SIZE,"%u",file_query_args.layout.u.raid0.stripe_unit);
- MPI_Info_set(fd->info, "panfs_layout_stripe_unit", temp_buffer);
+ ADIOI_Info_set(fd->info, "panfs_layout_stripe_unit", temp_buffer);
ADIOI_Snprintf(temp_buffer,TEMP_BUFFER_SIZE,"%u",file_query_args.layout.u.raid0.total_num_comps);
- MPI_Info_set(fd->info, "panfs_layout_total_num_comps", temp_buffer);
+ ADIOI_Info_set(fd->info, "panfs_layout_total_num_comps", temp_buffer);
break;
case PAN_FS_CLIENT_LAYOUT_TYPE__RAID1_5_PARITY_STRIPE:
ADIOI_Snprintf(temp_buffer,TEMP_BUFFER_SIZE,"%u",file_query_args.layout.u.raid1_5_parity_stripe.stripe_unit);
- MPI_Info_set(fd->info, "panfs_layout_stripe_unit", temp_buffer);
+ ADIOI_Info_set(fd->info, "panfs_layout_stripe_unit", temp_buffer);
ADIOI_Snprintf(temp_buffer,TEMP_BUFFER_SIZE,"%u",file_query_args.layout.u.raid1_5_parity_stripe.parity_stripe_width);
- MPI_Info_set(fd->info, "panfs_layout_parity_stripe_width", temp_buffer);
+ ADIOI_Info_set(fd->info, "panfs_layout_parity_stripe_width", temp_buffer);
ADIOI_Snprintf(temp_buffer,TEMP_BUFFER_SIZE,"%u",file_query_args.layout.u.raid1_5_parity_stripe.parity_stripe_depth);
- MPI_Info_set(fd->info, "panfs_layout_parity_stripe_depth", temp_buffer);
+ ADIOI_Info_set(fd->info, "panfs_layout_parity_stripe_depth", temp_buffer);
ADIOI_Snprintf(temp_buffer,TEMP_BUFFER_SIZE,"%u",file_query_args.layout.u.raid1_5_parity_stripe.total_num_comps);
- MPI_Info_set(fd->info, "panfs_layout_total_num_comps", temp_buffer);
+ ADIOI_Info_set(fd->info, "panfs_layout_total_num_comps", temp_buffer);
ADIOI_Snprintf(temp_buffer,TEMP_BUFFER_SIZE,"%u",file_query_args.layout.u.raid1_5_parity_stripe.layout_visit_policy);
- MPI_Info_set(fd->info, "panfs_layout_visit_policy", temp_buffer);
+ ADIOI_Info_set(fd->info, "panfs_layout_visit_policy", temp_buffer);
break;
case PAN_FS_CLIENT_LAYOUT_TYPE__RAID10:
ADIOI_Snprintf(temp_buffer,TEMP_BUFFER_SIZE,"%u",file_query_args.layout.u.raid10.stripe_unit);
- MPI_Info_set(fd->info, "panfs_layout_stripe_unit", temp_buffer);
+ ADIOI_Info_set(fd->info, "panfs_layout_stripe_unit", temp_buffer);
ADIOI_Snprintf(temp_buffer,TEMP_BUFFER_SIZE,"%u",file_query_args.layout.u.raid10.total_num_comps);
- MPI_Info_set(fd->info, "panfs_layout_total_num_comps", temp_buffer);
+ ADIOI_Info_set(fd->info, "panfs_layout_total_num_comps", temp_buffer);
ADIOI_Snprintf(temp_buffer,TEMP_BUFFER_SIZE,"%u",file_query_args.layout.u.raid10.layout_visit_policy);
- MPI_Info_set(fd->info, "panfs_layout_visit_policy", temp_buffer);
+ ADIOI_Info_set(fd->info, "panfs_layout_visit_policy", temp_buffer);
break;
}
}
Modified: mpich2/trunk/src/mpi/romio/adio/ad_pfs/ad_pfs_hints.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_pfs/ad_pfs_hints.c 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/ad_pfs/ad_pfs_hints.c 2010-05-25 18:59:13 UTC (rev 6739)
@@ -24,7 +24,7 @@
if (users_info != MPI_INFO_NULL) {
value = (char *) ADIOI_Malloc((MPI_MAX_INFO_VAL+1)*sizeof(char));
- MPI_Info_get(users_info, "striping_factor", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "striping_factor", MPI_MAX_INFO_VAL,
value, &flag);
if (flag) {
str_factor=atoi(value);
@@ -40,7 +40,7 @@
/* --END ERROR HANDLING-- */
}
- MPI_Info_get(users_info, "striping_unit", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "striping_unit", MPI_MAX_INFO_VAL,
value, &flag);
if (flag) {
str_unit=atoi(value);
@@ -56,7 +56,7 @@
/* --END ERROR HANDLING-- */
}
- MPI_Info_get(users_info, "start_iodevice", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "start_iodevice", MPI_MAX_INFO_VAL,
value, &flag);
if (flag) {
start_iodev=atoi(value);
@@ -119,15 +119,15 @@
If so, mark it as true in fd->info and turn it on in
ADIOI_PFS_Open after the file is opened */
- MPI_Info_get(users_info, "pfs_svr_buf", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "pfs_svr_buf", MPI_MAX_INFO_VAL,
value, &flag);
if (flag && (!strcmp(value, "true")))
- MPI_Info_set(fd->info, "pfs_svr_buf", "true");
- else MPI_Info_set(fd->info, "pfs_svr_buf", "false");
+ ADIOI_Info_set(fd->info, "pfs_svr_buf", "true");
+ else ADIOI_Info_set(fd->info, "pfs_svr_buf", "false");
ADIOI_Free(value);
}
- else MPI_Info_set(fd->info, "pfs_svr_buf", "false");
+ else ADIOI_Info_set(fd->info, "pfs_svr_buf", "false");
/* set the values for collective I/O and data sieving parameters */
ADIOI_GEN_SetInfo(fd, users_info, error_code);
@@ -144,23 +144,23 @@
if (users_info != MPI_INFO_NULL) {
value = (char *) ADIOI_Malloc((MPI_MAX_INFO_VAL+1)*sizeof(char));
- MPI_Info_get(users_info, "pfs_svr_buf", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "pfs_svr_buf", MPI_MAX_INFO_VAL,
value, &flag);
if (flag && (!strcmp(value, "true") || !strcmp(value, "false"))) {
value_in_fd = (char *)
ADIOI_Malloc((MPI_MAX_INFO_VAL+1)*sizeof(char));
- MPI_Info_get(fd->info, "pfs_svr_buf", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(fd->info, "pfs_svr_buf", MPI_MAX_INFO_VAL,
value_in_fd, &flag);
if (strcmp(value, value_in_fd)) {
if (!strcmp(value, "true")) {
err = fcntl(fd->fd_sys, F_PFS_SVR_BUF, TRUE);
if (!err)
- MPI_Info_set(fd->info, "pfs_svr_buf", "true");
+ ADIOI_Info_set(fd->info, "pfs_svr_buf", "true");
}
else {
err = fcntl(fd->fd_sys, F_PFS_SVR_BUF, FALSE);
if (!err)
- MPI_Info_set(fd->info, "pfs_svr_buf", "false");
+ ADIOI_Info_set(fd->info, "pfs_svr_buf", "false");
}
}
ADIOI_Free(value_in_fd);
Modified: mpich2/trunk/src/mpi/romio/adio/ad_pfs/ad_pfs_open.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_pfs/ad_pfs_open.c 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/ad_pfs/ad_pfs_open.c 2010-05-25 18:59:13 UTC (rev 6739)
@@ -49,11 +49,11 @@
to ADIOI_PFS_SetInfo. Turn it on now, since we now have a
valid file descriptor. */
- MPI_Info_get(fd->info, "pfs_svr_buf", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(fd->info, "pfs_svr_buf", MPI_MAX_INFO_VAL,
value, &flag);
if (flag && (!strcmp(value, "true"))) {
err = fcntl(fd->fd_sys, F_PFS_SVR_BUF, TRUE);
- if (err) MPI_Info_set(fd->info, "pfs_svr_buf", "false");
+ if (err) ADIOI_Info_set(fd->info, "pfs_svr_buf", "false");
}
/* get file striping information and set it in info */
@@ -61,13 +61,13 @@
if (!err) {
ADIOI_Snprintf(value, MPI_MAX_INFO_VAL+1, "%d", attr.s_sunitsize);
- MPI_Info_set(fd->info, "striping_unit", value);
+ ADIOI_Info_set(fd->info, "striping_unit", value);
ADIOI_Snprintf(value, MPI_MAX_INFO_VAL+1, "%d", attr.s_sfactor);
- MPI_Info_set(fd->info, "striping_factor", value);
+ ADIOI_Info_set(fd->info, "striping_factor", value);
ADIOI_Snprintf(value, MPI_MAX_INFO_VAL+1, "%d", attr.s_start_sdir);
- MPI_Info_set(fd->info, "start_iodevice", value);
+ ADIOI_Info_set(fd->info, "start_iodevice", value);
}
ADIOI_Free(value);
Modified: mpich2/trunk/src/mpi/romio/adio/ad_piofs/ad_piofs_hints.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_piofs/ad_piofs_hints.c 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/ad_piofs/ad_piofs_hints.c 2010-05-25 18:59:13 UTC (rev 6739)
@@ -25,7 +25,7 @@
if (users_info != MPI_INFO_NULL) {
value = (char *) ADIOI_Malloc((MPI_MAX_INFO_VAL+1)*sizeof(char));
- MPI_Info_get(users_info, "striping_factor", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "striping_factor", MPI_MAX_INFO_VAL,
value, &flag);
if (flag) {
str_factor=atoi(value);
@@ -37,7 +37,7 @@
}
}
- MPI_Info_get(users_info, "striping_unit", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "striping_unit", MPI_MAX_INFO_VAL,
value, &flag);
if (flag) {
str_unit=atoi(value);
@@ -49,7 +49,7 @@
}
}
- MPI_Info_get(users_info, "start_iodevice", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "start_iodevice", MPI_MAX_INFO_VAL,
value, &flag);
if (flag) {
start_iodev=atoi(value);
Modified: mpich2/trunk/src/mpi/romio/adio/ad_piofs/ad_piofs_open.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_piofs/ad_piofs_open.c 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/ad_piofs/ad_piofs_open.c 2010-05-25 18:59:13 UTC (rev 6739)
@@ -49,13 +49,13 @@
if (!err) {
ADIOI_Snprintf(value, MPI_MAX_INFO_VAL+1, "%d", piofs_fstat.st_bsu);
- MPI_Info_set(fd->info, "striping_unit", value);
+ ADIOI_Info_set(fd->info, "striping_unit", value);
ADIOI_Snprintf(value, MPI_MAX_INFO_VAL+1, "%d", piofs_fstat.st_cells);
- MPI_Info_set(fd->info, "striping_factor", value);
+ ADIOI_Info_set(fd->info, "striping_factor", value);
ADIOI_Snprintf(value, MPI_MAX_INFO_VAL+1, "%d", piofs_fstat.st_base_node);
- MPI_Info_set(fd->info, "start_iodevice", value);
+ ADIOI_Info_set(fd->info, "start_iodevice", value);
}
ADIOI_Free(value);
Modified: mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_hints.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_hints.c 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_hints.c 2010-05-25 18:59:13 UTC (rev 6739)
@@ -17,8 +17,8 @@
/* This must be part of the open call. can set striping parameters
if necessary. */
MPI_Info_create(&(fd->info));
- MPI_Info_set(fd->info, "romio_pvfs_listio_read", "disable");
- MPI_Info_set(fd->info, "romio_pvfs_listio_write", "disable");
+ ADIOI_Info_set(fd->info, "romio_pvfs_listio_read", "disable");
+ ADIOI_Info_set(fd->info, "romio_pvfs_listio_write", "disable");
fd->hints->fs_hints.pvfs.listio_read = ADIOI_HINT_DISABLE;
fd->hints->fs_hints.pvfs.listio_write = ADIOI_HINT_DISABLE;
@@ -27,7 +27,7 @@
if (users_info != MPI_INFO_NULL) {
value = (char *) ADIOI_Malloc((MPI_MAX_INFO_VAL+1)*sizeof(char));
- MPI_Info_get(users_info, "striping_factor", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "striping_factor", MPI_MAX_INFO_VAL,
value, &flag);
if (flag) {
str_factor=atoi(value);
@@ -41,10 +41,10 @@
return;
/* --END ERROR HANDLING-- */
}
- else MPI_Info_set(fd->info, "striping_factor", value);
+ else ADIOI_Info_set(fd->info, "striping_factor", value);
}
- MPI_Info_get(users_info, "striping_unit", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "striping_unit", MPI_MAX_INFO_VAL,
value, &flag);
if (flag) {
str_unit=atoi(value);
@@ -58,10 +58,10 @@
return;
/* --END ERROR HANDLING-- */
}
- else MPI_Info_set(fd->info, "striping_unit", value);
+ else ADIOI_Info_set(fd->info, "striping_unit", value);
}
- MPI_Info_get(users_info, "start_iodevice", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "start_iodevice", MPI_MAX_INFO_VAL,
value, &flag);
if (flag) {
start_iodev=atoi(value);
@@ -75,25 +75,25 @@
return;
/* --END ERROR HANDLING-- */
}
- else MPI_Info_set(fd->info, "start_iodevice", value);
+ else ADIOI_Info_set(fd->info, "start_iodevice", value);
}
- MPI_Info_get(users_info, "romio_pvfs_listio_read",
+ ADIOI_Info_get(users_info, "romio_pvfs_listio_read",
MPI_MAX_INFO_VAL,
value, &flag);
if (flag) {
if ( !strcmp(value, "enable") || !strcmp(value, "ENABLE"))
{
- MPI_Info_set(fd->info, "romio_pvfs_listio_read", value);
+ ADIOI_Info_set(fd->info, "romio_pvfs_listio_read", value);
fd->hints->fs_hints.pvfs.listio_read = ADIOI_HINT_ENABLE;
} else if ( !strcmp(value, "disable") || !strcmp(value, "DISABLE"))
{
- MPI_Info_set(fd->info , "romio_pvfs_listio_read", value);
+ ADIOI_Info_set(fd->info , "romio_pvfs_listio_read", value);
fd->hints->fs_hints.pvfs.listio_read = ADIOI_HINT_DISABLE;
}
else if ( !strcmp(value, "automatic") || !strcmp(value, "AUTOMATIC"))
{
- MPI_Info_set(fd->info, "romio_pvfs_listio_read", value);
+ ADIOI_Info_set(fd->info, "romio_pvfs_listio_read", value);
fd->hints->fs_hints.pvfs.listio_read = ADIOI_HINT_AUTO;
}
tmp_val = fd->hints->fs_hints.pvfs.listio_read;
@@ -107,21 +107,21 @@
/* --END ERROR HANDLING-- */
}
}
- MPI_Info_get(users_info, "romio_pvfs_listio_write", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "romio_pvfs_listio_write", MPI_MAX_INFO_VAL,
value, &flag);
if (flag) {
if ( !strcmp(value, "enable") || !strcmp(value, "ENABLE"))
{
- MPI_Info_set(fd->info, "romio_pvfs_listio_write", value);
+ ADIOI_Info_set(fd->info, "romio_pvfs_listio_write", value);
fd->hints->fs_hints.pvfs.listio_write = ADIOI_HINT_ENABLE;
} else if ( !strcmp(value, "disable") || !strcmp(value, "DISABLE"))
{
- MPI_Info_set(fd->info, "romio_pvfs_listio_write", value);
+ ADIOI_Info_set(fd->info, "romio_pvfs_listio_write", value);
fd->hints->fs_hints.pvfs.listio_write = ADIOI_HINT_DISABLE;
}
else if ( !strcmp(value, "automatic") || !strcmp(value, "AUTOMATIC"))
{
- MPI_Info_set(fd->info, "romio_pvfs_listio_write", value);
+ ADIOI_Info_set(fd->info, "romio_pvfs_listio_write", value);
fd->hints->fs_hints.pvfs.listio_write = ADIOI_HINT_AUTO;
}
tmp_val = fd->hints->fs_hints.pvfs.listio_write;
Modified: mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_open.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_open.c 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_open.c 2010-05-25 18:59:13 UTC (rev 6739)
@@ -37,15 +37,15 @@
value = (char *) ADIOI_Malloc((MPI_MAX_INFO_VAL+1)*sizeof(char));
- MPI_Info_get(fd->info, "striping_factor", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(fd->info, "striping_factor", MPI_MAX_INFO_VAL,
value, &flag);
if (flag && (atoi(value) > 0)) pstat.pcount = atoi(value);
- MPI_Info_get(fd->info, "striping_unit", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(fd->info, "striping_unit", MPI_MAX_INFO_VAL,
value, &flag);
if (flag && (atoi(value) > 0)) pstat.ssize = atoi(value);
- MPI_Info_get(fd->info, "start_iodevice", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(fd->info, "start_iodevice", MPI_MAX_INFO_VAL,
value, &flag);
if (flag && (atoi(value) >= 0)) pstat.base = atoi(value);
@@ -71,11 +71,11 @@
if (fd->fd_sys != -1) {
pvfs_ioctl(fd->fd_sys, GETMETA, &pstat);
ADIOI_Snprintf(value, MPI_MAX_INFO_VAL+1, "%d", pstat.pcount);
- MPI_Info_set(fd->info, "striping_factor", value);
+ ADIOI_Info_set(fd->info, "striping_factor", value);
ADIOI_Snprintf(value, MPI_MAX_INFO_VAL+1, "%d", pstat.ssize);
- MPI_Info_set(fd->info, "striping_unit", value);
+ ADIOI_Info_set(fd->info, "striping_unit", value);
ADIOI_Snprintf(value, MPI_MAX_INFO_VAL+1, "%d", pstat.base);
- MPI_Info_set(fd->info, "start_iodevice", value);
+ ADIOI_Info_set(fd->info, "start_iodevice", value);
}
ADIOI_Free(value);
Modified: mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_hints.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_hints.c 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_hints.c 2010-05-25 18:59:13 UTC (rev 6739)
@@ -17,28 +17,28 @@
if ((fd->info) == MPI_INFO_NULL) {
/* part of the open call */
MPI_Info_create(&(fd->info));
- MPI_Info_set(fd->info, "romio_pvfs2_debugmask", "0");
+ ADIOI_Info_set(fd->info, "romio_pvfs2_debugmask", "0");
fd->hints->fs_hints.pvfs2.debugmask = 0;
- MPI_Info_set(fd->info, "striping_factor", "0");
+ ADIOI_Info_set(fd->info, "striping_factor", "0");
fd->hints->striping_factor = 0;
- MPI_Info_set(fd->info, "striping_unit", "0");
+ ADIOI_Info_set(fd->info, "striping_unit", "0");
fd->hints->striping_unit = 0;
/* disable the aggressive strided optimizations by default */
- MPI_Info_set(fd->info, "romio_pvfs2_posix_read", "disable");
- MPI_Info_set(fd->info, "romio_pvfs2_posix_write", "disable");
+ ADIOI_Info_set(fd->info, "romio_pvfs2_posix_read", "disable");
+ ADIOI_Info_set(fd->info, "romio_pvfs2_posix_write", "disable");
fd->hints->fs_hints.pvfs2.posix_read = ADIOI_HINT_DISABLE;
fd->hints->fs_hints.pvfs2.posix_write = ADIOI_HINT_DISABLE;
- MPI_Info_set(fd->info, "romio_pvfs2_dtype_read", "disable");
- MPI_Info_set(fd->info, "romio_pvfs2_dtype_write", "disable");
+ ADIOI_Info_set(fd->info, "romio_pvfs2_dtype_read", "disable");
+ ADIOI_Info_set(fd->info, "romio_pvfs2_dtype_write", "disable");
fd->hints->fs_hints.pvfs2.dtype_read = ADIOI_HINT_DISABLE;
fd->hints->fs_hints.pvfs2.dtype_write = ADIOI_HINT_DISABLE;
- MPI_Info_set(fd->info, "romio_pvfs2_listio_read", "disable");
- MPI_Info_set(fd->info, "romio_pvfs2_listio_write", "disable");
+ ADIOI_Info_set(fd->info, "romio_pvfs2_listio_read", "disable");
+ ADIOI_Info_set(fd->info, "romio_pvfs2_listio_write", "disable");
fd->hints->fs_hints.pvfs2.listio_read = ADIOI_HINT_DISABLE;
fd->hints->fs_hints.pvfs2.listio_write = ADIOI_HINT_DISABLE;
@@ -47,7 +47,7 @@
if (users_info != MPI_INFO_NULL) {
/* pvfs2 debugging */
value = (char *) ADIOI_Malloc( (MPI_MAX_INFO_VAL+1)*sizeof(char));
- MPI_Info_get(users_info, "romio_pvfs2_debugmask",
+ ADIOI_Info_get(users_info, "romio_pvfs2_debugmask",
MPI_MAX_INFO_VAL, value, &flag);
if (flag) {
tmp_value = fd->hints->fs_hints.pvfs2.debugmask =
@@ -63,11 +63,11 @@
}
/* --END ERROR HANDLING-- */
- MPI_Info_set(fd->info, "romio_pvfs2_debugmask", value);
+ ADIOI_Info_set(fd->info, "romio_pvfs2_debugmask", value);
}
/* the striping factor */
- MPI_Info_get(users_info, "striping_factor",
+ ADIOI_Info_get(users_info, "striping_factor",
MPI_MAX_INFO_VAL, value, &flag);
if (flag) {
tmp_value = fd->hints->striping_factor = atoi(value);
@@ -82,11 +82,11 @@
}
/* --END ERROR HANDLING-- */
- MPI_Info_set(fd->info, "striping_factor", value);
+ ADIOI_Info_set(fd->info, "striping_factor", value);
}
/* the striping unit */
- MPI_Info_get(users_info, "striping_unit",
+ ADIOI_Info_get(users_info, "striping_unit",
MPI_MAX_INFO_VAL, value, &flag);
if (flag) {
tmp_value = fd->hints->striping_unit = atoi(value);
@@ -100,29 +100,29 @@
}
/* --END ERROR HANDLING-- */
- MPI_Info_set(fd->info, "striping_unit", value);
+ ADIOI_Info_set(fd->info, "striping_unit", value);
}
/* distribution name */
- MPI_Info_get(users_info, "romio_pvfs2_distribution_name",
+ ADIOI_Info_get(users_info, "romio_pvfs2_distribution_name",
MPI_MAX_INFO_VAL, value, &flag);
if (flag) {
}
/* POSIX read */
- MPI_Info_get(users_info, "romio_pvfs2_posix_read",
+ ADIOI_Info_get(users_info, "romio_pvfs2_posix_read",
MPI_MAX_INFO_VAL, value, &flag);
if (flag) {
if ( !strcmp(value, "enable") || !strcmp(value, "ENABLE"))
{
- MPI_Info_set(fd->info, "romio_pvfs2_posix_read", value);
+ ADIOI_Info_set(fd->info, "romio_pvfs2_posix_read", value);
fd->hints->fs_hints.pvfs2.posix_read = ADIOI_HINT_ENABLE;
}
else if ( !strcmp(value, "disable") ||
!strcmp(value, "DISABLE"))
{
- MPI_Info_set(fd->info , "romio_pvfs2_posix_read", value);
+ ADIOI_Info_set(fd->info , "romio_pvfs2_posix_read", value);
fd->hints->fs_hints.pvfs2.posix_read = ADIOI_HINT_DISABLE;
}
tmp_value = fd->hints->fs_hints.pvfs2.posix_read;
@@ -136,18 +136,18 @@
}
/* POSIX write */
- MPI_Info_get(users_info, "romio_pvfs2_posix_write",
+ ADIOI_Info_get(users_info, "romio_pvfs2_posix_write",
MPI_MAX_INFO_VAL, value, &flag);
if (flag) {
if ( !strcmp(value, "enable") || !strcmp(value, "ENABLE"))
{
- MPI_Info_set(fd->info, "romio_pvfs2_posix_write", value);
+ ADIOI_Info_set(fd->info, "romio_pvfs2_posix_write", value);
fd->hints->fs_hints.pvfs2.posix_write = ADIOI_HINT_ENABLE;
}
else if ( !strcmp(value, "disable") ||
!strcmp(value, "DISABLE"))
{
- MPI_Info_set(fd->info , "romio_pvfs2_posix_write", value);
+ ADIOI_Info_set(fd->info , "romio_pvfs2_posix_write", value);
fd->hints->fs_hints.pvfs2.posix_write = ADIOI_HINT_DISABLE;
}
tmp_value = fd->hints->fs_hints.pvfs2.posix_write;
@@ -161,18 +161,18 @@
}
/* Datatype read */
- MPI_Info_get(users_info, "romio_pvfs2_dtype_read",
+ ADIOI_Info_get(users_info, "romio_pvfs2_dtype_read",
MPI_MAX_INFO_VAL, value, &flag);
if (flag) {
if ( !strcmp(value, "enable") || !strcmp(value, "ENABLE"))
{
- MPI_Info_set(fd->info, "romio_pvfs2_dtype_read", value);
+ ADIOI_Info_set(fd->info, "romio_pvfs2_dtype_read", value);
fd->hints->fs_hints.pvfs2.dtype_read = ADIOI_HINT_ENABLE;
}
else if ( !strcmp(value, "disable") ||
!strcmp(value, "DISABLE"))
{
- MPI_Info_set(fd->info , "romio_pvfs2_dtype_read", value);
+ ADIOI_Info_set(fd->info , "romio_pvfs2_dtype_read", value);
fd->hints->fs_hints.pvfs2.dtype_read = ADIOI_HINT_DISABLE;
}
tmp_value = fd->hints->fs_hints.pvfs2.dtype_read;
@@ -186,18 +186,18 @@
}
/* Datatype write */
- MPI_Info_get(users_info, "romio_pvfs2_dtype_write",
+ ADIOI_Info_get(users_info, "romio_pvfs2_dtype_write",
MPI_MAX_INFO_VAL, value, &flag);
if (flag) {
if ( !strcmp(value, "enable") || !strcmp(value, "ENABLE"))
{
- MPI_Info_set(fd->info, "romio_pvfs2_dtype_write", value);
+ ADIOI_Info_set(fd->info, "romio_pvfs2_dtype_write", value);
fd->hints->fs_hints.pvfs2.dtype_write = ADIOI_HINT_ENABLE;
}
else if ( !strcmp(value, "disable") ||
!strcmp(value, "DISABLE"))
{
- MPI_Info_set(fd->info , "romio_pvfs2_dtype_write", value);
+ ADIOI_Info_set(fd->info , "romio_pvfs2_dtype_write", value);
fd->hints->fs_hints.pvfs2.dtype_write = ADIOI_HINT_DISABLE;
}
tmp_value = fd->hints->fs_hints.pvfs2.dtype_write;
@@ -211,18 +211,18 @@
}
/* Listio read */
- MPI_Info_get(users_info, "romio_pvfs2_listio_read",
+ ADIOI_Info_get(users_info, "romio_pvfs2_listio_read",
MPI_MAX_INFO_VAL, value, &flag);
if (flag) {
if ( !strcmp(value, "enable") || !strcmp(value, "ENABLE"))
{
- MPI_Info_set(fd->info, "romio_pvfs2_listio_read", value);
+ ADIOI_Info_set(fd->info, "romio_pvfs2_listio_read", value);
fd->hints->fs_hints.pvfs2.listio_read = ADIOI_HINT_ENABLE;
}
else if ( !strcmp(value, "disable") ||
!strcmp(value, "DISABLE"))
{
- MPI_Info_set(fd->info , "romio_pvfs2_listio_read", value);
+ ADIOI_Info_set(fd->info , "romio_pvfs2_listio_read", value);
fd->hints->fs_hints.pvfs2.listio_read = ADIOI_HINT_DISABLE;
}
tmp_value = fd->hints->fs_hints.pvfs2.listio_read;
@@ -236,18 +236,18 @@
}
/* Datatype write */
- MPI_Info_get(users_info, "romio_pvfs2_listio_write",
+ ADIOI_Info_get(users_info, "romio_pvfs2_listio_write",
MPI_MAX_INFO_VAL, value, &flag);
if (flag) {
if ( !strcmp(value, "enable") || !strcmp(value, "ENABLE"))
{
- MPI_Info_set(fd->info, "romio_pvfs2_listio_write", value);
+ ADIOI_Info_set(fd->info, "romio_pvfs2_listio_write", value);
fd->hints->fs_hints.pvfs2.listio_write = ADIOI_HINT_ENABLE;
}
else if ( !strcmp(value, "disable") ||
!strcmp(value, "DISABLE"))
{
- MPI_Info_set(fd->info , "romio_pvfs2_listio_write", value);
+ ADIOI_Info_set(fd->info , "romio_pvfs2_listio_write", value);
fd->hints->fs_hints.pvfs2.listio_write = ADIOI_HINT_DISABLE;
}
tmp_value = fd->hints->fs_hints.pvfs2.listio_write;
Modified: mpich2/trunk/src/mpi/romio/adio/ad_xfs/ad_xfs_hints.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_xfs/ad_xfs_hints.c 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/ad_xfs/ad_xfs_hints.c 2010-05-25 18:59:13 UTC (rev 6739)
@@ -19,8 +19,8 @@
if (fd->info == MPI_INFO_NULL) MPI_Info_create(&(fd->info));
- MPI_Info_set(fd->info, "direct_read", "false");
- MPI_Info_set(fd->info, "direct_write", "false");
+ ADIOI_Info_set(fd->info, "direct_read", "false");
+ ADIOI_Info_set(fd->info, "direct_write", "false");
fd->direct_read = fd->direct_write = 0;
if (!xfs_initialized) {
@@ -67,17 +67,17 @@
if (users_info != MPI_INFO_NULL) {
value = (char *) ADIOI_Malloc((MPI_MAX_INFO_VAL+1)*sizeof(char));
- MPI_Info_get(users_info, "direct_read", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "direct_read", MPI_MAX_INFO_VAL,
value, &flag);
if (flag && !strcmp(value, "true")) {
- MPI_Info_set(fd->info, "direct_read", "true");
+ ADIOI_Info_set(fd->info, "direct_read", "true");
fd->direct_read = 1;
}
- MPI_Info_get(users_info, "direct_write", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "direct_write", MPI_MAX_INFO_VAL,
value, &flag);
if (flag && !strcmp(value, "true")) {
- MPI_Info_set(fd->info, "direct_write", "true");
+ ADIOI_Info_set(fd->info, "direct_write", "true");
fd->direct_write = 1;
}
Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_aggregate_new.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/common/ad_aggregate_new.c 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/common/ad_aggregate_new.c 2010-05-25 18:59:13 UTC (rev 6739)
@@ -202,7 +202,7 @@
}
if (fd->hints->cb_pfr == ADIOI_HINT_ENABLE) {
sprintf (value, "%d", fr_size);
- MPI_Info_set (fd->info, "romio_cb_fr_type", value);
+ ADIOI_Info_set (fd->info, "romio_cb_fr_type", value);
}
}
Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_hints.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/common/ad_hints.c 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/common/ad_hints.c 2010-05-25 18:59:13 UTC (rev 6739)
@@ -49,15 +49,15 @@
if (!fd->hints->initialized) {
/* buffer size for collective I/O */
- MPI_Info_set(info, "cb_buffer_size", ADIOI_CB_BUFFER_SIZE_DFLT);
+ ADIOI_Info_set(info, "cb_buffer_size", ADIOI_CB_BUFFER_SIZE_DFLT);
fd->hints->cb_buffer_size = atoi(ADIOI_CB_BUFFER_SIZE_DFLT);
/* default is to let romio automatically decide when to use
* collective buffering
*/
- MPI_Info_set(info, "romio_cb_read", "automatic");
+ ADIOI_Info_set(info, "romio_cb_read", "automatic");
fd->hints->cb_read = ADIOI_HINT_AUTO;
- MPI_Info_set(info, "romio_cb_write", "automatic");
+ ADIOI_Info_set(info, "romio_cb_write", "automatic");
fd->hints->cb_write = ADIOI_HINT_AUTO;
fd->hints->cb_config_list = NULL;
@@ -66,51 +66,51 @@
MPI_Comm_size(fd->comm, &nprocs);
nprocs_is_valid = 1;
ADIOI_Snprintf(value, MPI_MAX_INFO_VAL+1, "%d", nprocs);
- MPI_Info_set(info, "cb_nodes", value);
+ ADIOI_Info_set(info, "cb_nodes", value);
fd->hints->cb_nodes = nprocs;
/* hint indicating that no indep. I/O will be performed on this file */
- MPI_Info_set(info, "romio_no_indep_rw", "false");
+ ADIOI_Info_set(info, "romio_no_indep_rw", "false");
fd->hints->no_indep_rw = 0;
/* hint instructing the use of persistent file realms */
- MPI_Info_set(info, "romio_cb_pfr", "disable");
+ ADIOI_Info_set(info, "romio_cb_pfr", "disable");
fd->hints->cb_pfr = ADIOI_HINT_DISABLE;
/* hint guiding the assignment of persistent file realms */
- MPI_Info_set(info, "romio_cb_fr_types", "aar");
+ ADIOI_Info_set(info, "romio_cb_fr_types", "aar");
fd->hints->cb_fr_type = ADIOI_FR_AAR;
/* hint to align file realms with a certain byte value */
- MPI_Info_set(info, "romio_cb_fr_alignment", "1");
+ ADIOI_Info_set(info, "romio_cb_fr_alignment", "1");
fd->hints->cb_fr_alignment = 1;
/* hint to set a threshold percentage for a datatype's size/extent at
* which data sieving should be done in collective I/O */
- MPI_Info_set(info, "romio_cb_ds_threshold", "0");
+ ADIOI_Info_set(info, "romio_cb_ds_threshold", "0");
fd->hints->cb_ds_threshold = 0;
/* hint to switch between point-to-point or all-to-all for two-phase */
- MPI_Info_set(info, "romio_cb_alltoall", "automatic");
+ ADIOI_Info_set(info, "romio_cb_alltoall", "automatic");
fd->hints->cb_alltoall = ADIOI_HINT_AUTO;
/* deferred_open derived from no_indep_rw and cb_{read,write} */
fd->hints->deferred_open = 0;
/* buffer size for data sieving in independent reads */
- MPI_Info_set(info, "ind_rd_buffer_size", ADIOI_IND_RD_BUFFER_SIZE_DFLT);
+ ADIOI_Info_set(info, "ind_rd_buffer_size", ADIOI_IND_RD_BUFFER_SIZE_DFLT);
fd->hints->ind_rd_buffer_size = atoi(ADIOI_IND_RD_BUFFER_SIZE_DFLT);
/* buffer size for data sieving in independent writes */
- MPI_Info_set(info, "ind_wr_buffer_size", ADIOI_IND_WR_BUFFER_SIZE_DFLT);
+ ADIOI_Info_set(info, "ind_wr_buffer_size", ADIOI_IND_WR_BUFFER_SIZE_DFLT);
fd->hints->ind_wr_buffer_size = atoi(ADIOI_IND_WR_BUFFER_SIZE_DFLT);
/* default is to let romio automatically decide when to use data
* sieving
*/
- MPI_Info_set(info, "romio_ds_read", "automatic");
+ ADIOI_Info_set(info, "romio_ds_read", "automatic");
fd->hints->ds_read = ADIOI_HINT_AUTO;
- MPI_Info_set(info, "romio_ds_write", "automatic");
+ ADIOI_Info_set(info, "romio_ds_write", "automatic");
fd->hints->ds_write = ADIOI_HINT_AUTO;
/* still to do: tune this a bit for a variety of file systems. there's
@@ -130,7 +130,7 @@
/* add in user's info if supplied */
if (users_info != MPI_INFO_NULL) {
- MPI_Info_get(users_info, "cb_buffer_size", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "cb_buffer_size", MPI_MAX_INFO_VAL,
value, &flag);
if (flag && ((intval=atoi(value)) > 0)) {
tmp_val = intval;
@@ -145,13 +145,13 @@
}
/* --END ERROR HANDLING-- */
- MPI_Info_set(info, "cb_buffer_size", value);
+ ADIOI_Info_set(info, "cb_buffer_size", value);
fd->hints->cb_buffer_size = intval;
}
/* aligning file realms to certain sizes (e.g. stripe sizes)
* may benefit I/O performance */
- MPI_Info_get(users_info, "romio_cb_fr_alignment", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "romio_cb_fr_alignment", MPI_MAX_INFO_VAL,
value, &flag);
if (flag && ((intval=atoi(value)) > 0)) {
tmp_val = intval;
@@ -166,7 +166,7 @@
}
/* --END ERROR HANDLING-- */
- MPI_Info_set(info, "romio_cb_fr_alignment", value);
+ ADIOI_Info_set(info, "romio_cb_fr_alignment", value);
fd->hints->cb_fr_alignment = intval;
}
@@ -174,7 +174,7 @@
/* for collective I/O, try to be smarter about when to do data sieving
* using a specific threshold for the datatype size/extent
* (percentage 0-100%) */
- MPI_Info_get(users_info, "romio_cb_ds_threshold", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "romio_cb_ds_threshold", MPI_MAX_INFO_VAL,
value, &flag);
if (flag && ((intval=atoi(value)) > 0)) {
tmp_val = intval;
@@ -189,24 +189,24 @@
}
/* --END ERROR HANDLING-- */
- MPI_Info_set(info, "romio_cb_ds_threshold", value);
+ ADIOI_Info_set(info, "romio_cb_ds_threshold", value);
fd->hints->cb_ds_threshold = intval;
}
- MPI_Info_get(users_info, "romio_cb_alltoall", MPI_MAX_INFO_VAL, value,
+ ADIOI_Info_get(users_info, "romio_cb_alltoall", MPI_MAX_INFO_VAL, value,
&flag);
if (flag) {
if (!strcmp(value, "enable") || !strcmp(value, "ENABLE")) {
- MPI_Info_set(info, "romio_cb_alltoall", value);
+ ADIOI_Info_set(info, "romio_cb_alltoall", value);
fd->hints->cb_read = ADIOI_HINT_ENABLE;
}
else if (!strcmp(value, "disable") || !strcmp(value, "DISABLE")) {
- MPI_Info_set(info, "romio_cb_alltoall", value);
+ ADIOI_Info_set(info, "romio_cb_alltoall", value);
fd->hints->cb_read = ADIOI_HINT_DISABLE;
}
else if (!strcmp(value, "automatic") || !strcmp(value, "AUTOMATIC"))
{
- MPI_Info_set(info, "romio_cb_alltoall", value);
+ ADIOI_Info_set(info, "romio_cb_alltoall", value);
fd->hints->cb_read = ADIOI_HINT_AUTO;
}
@@ -226,23 +226,23 @@
/* new hints for enabling/disabling coll. buffering on
* reads/writes
*/
- MPI_Info_get(users_info, "romio_cb_read", MPI_MAX_INFO_VAL, value,
+ ADIOI_Info_get(users_info, "romio_cb_read", MPI_MAX_INFO_VAL, value,
&flag);
if (flag) {
if (!strcmp(value, "enable") || !strcmp(value, "ENABLE")) {
- MPI_Info_set(info, "romio_cb_read", value);
+ ADIOI_Info_set(info, "romio_cb_read", value);
fd->hints->cb_read = ADIOI_HINT_ENABLE;
}
else if (!strcmp(value, "disable") || !strcmp(value, "DISABLE")) {
/* romio_cb_read overrides no_indep_rw */
- MPI_Info_set(info, "romio_cb_read", value);
- MPI_Info_set(info, "romio_no_indep_rw", "false");
+ ADIOI_Info_set(info, "romio_cb_read", value);
+ ADIOI_Info_set(info, "romio_no_indep_rw", "false");
fd->hints->cb_read = ADIOI_HINT_DISABLE;
fd->hints->no_indep_rw = ADIOI_HINT_DISABLE;
}
else if (!strcmp(value, "automatic") || !strcmp(value, "AUTOMATIC"))
{
- MPI_Info_set(info, "romio_cb_read", value);
+ ADIOI_Info_set(info, "romio_cb_read", value);
fd->hints->cb_read = ADIOI_HINT_AUTO;
}
@@ -258,25 +258,25 @@
}
/* --END ERROR HANDLING-- */
}
- MPI_Info_get(users_info, "romio_cb_write", MPI_MAX_INFO_VAL, value,
+ ADIOI_Info_get(users_info, "romio_cb_write", MPI_MAX_INFO_VAL, value,
&flag);
if (flag) {
if (!strcmp(value, "enable") || !strcmp(value, "ENABLE")) {
- MPI_Info_set(info, "romio_cb_write", value);
+ ADIOI_Info_set(info, "romio_cb_write", value);
fd->hints->cb_write = ADIOI_HINT_ENABLE;
}
else if (!strcmp(value, "disable") || !strcmp(value, "DISABLE"))
{
/* romio_cb_write overrides no_indep_rw, too */
- MPI_Info_set(info, "romio_cb_write", value);
- MPI_Info_set(info, "romio_no_indep_rw", "false");
+ ADIOI_Info_set(info, "romio_cb_write", value);
+ ADIOI_Info_set(info, "romio_no_indep_rw", "false");
fd->hints->cb_write = ADIOI_HINT_DISABLE;
fd->hints->no_indep_rw = ADIOI_HINT_DISABLE;
}
else if (!strcmp(value, "automatic") ||
!strcmp(value, "AUTOMATIC"))
{
- MPI_Info_set(info, "romio_cb_write", value);
+ ADIOI_Info_set(info, "romio_cb_write", value);
fd->hints->cb_write = ADIOI_HINT_AUTO;
}
@@ -295,20 +295,20 @@
/* enable/disable persistent file realms for collective I/O */
/* may want to check for no_indep_rdwr hint as well */
- MPI_Info_get(users_info, "romio_cb_pfr", MPI_MAX_INFO_VAL, value,
+ ADIOI_Info_get(users_info, "romio_cb_pfr", MPI_MAX_INFO_VAL, value,
&flag);
if (flag) {
if (!strcmp(value, "enable") || !strcmp(value, "ENABLE")) {
- MPI_Info_set(info, "romio_cb_pfr", value);
+ ADIOI_Info_set(info, "romio_cb_pfr", value);
fd->hints->cb_pfr = ADIOI_HINT_ENABLE;
}
else if (!strcmp(value, "disable") || !strcmp(value, "DISABLE")) {
- MPI_Info_set(info, "romio_cb_pfr", value);
+ ADIOI_Info_set(info, "romio_cb_pfr", value);
fd->hints->cb_pfr = ADIOI_HINT_DISABLE;
}
else if (!strcmp(value, "automatic") || !strcmp(value, "AUTOMATIC"))
{
- MPI_Info_set(info, "romio_cb_pfr", value);
+ ADIOI_Info_set(info, "romio_cb_pfr", value);
fd->hints->cb_pfr = ADIOI_HINT_AUTO;
}
@@ -328,7 +328,7 @@
/* file realm assignment types ADIOI_FR_AAR(0),
ADIOI_FR_FSZ(-1), ADIOI_FR_USR_REALMS(-2), all others specify
a regular fr size in bytes. probably not the best way... */
- MPI_Info_get(users_info, "romio_cb_fr_type", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "romio_cb_fr_type", MPI_MAX_INFO_VAL,
value, &flag);
if (flag && ((intval=atoi(value)) >= -2)) {
tmp_val = intval;
@@ -343,29 +343,29 @@
}
/* --END ERROR HANDLING-- */
- MPI_Info_set(info, "romio_cb_fr_type", value);
+ ADIOI_Info_set(info, "romio_cb_fr_type", value);
fd->hints->cb_fr_type = intval;
}
/* new hint for specifying no indep. read/write will be performed */
- MPI_Info_get(users_info, "romio_no_indep_rw", MPI_MAX_INFO_VAL, value,
+ ADIOI_Info_get(users_info, "romio_no_indep_rw", MPI_MAX_INFO_VAL, value,
&flag);
if (flag) {
if (!strcmp(value, "true") || !strcmp(value, "TRUE")) {
/* if 'no_indep_rw' set, also hint that we will do
* collective buffering: if we aren't doing independent io,
* then we have to do collective */
- MPI_Info_set(info, "romio_no_indep_rw", value);
- MPI_Info_set(info, "romio_cb_write", "enable");
- MPI_Info_set(info, "romio_cb_read", "enable");
+ ADIOI_Info_set(info, "romio_no_indep_rw", value);
+ ADIOI_Info_set(info, "romio_cb_write", "enable");
+ ADIOI_Info_set(info, "romio_cb_read", "enable");
fd->hints->no_indep_rw = 1;
fd->hints->cb_read = 1;
fd->hints->cb_write = 1;
tmp_val = 1;
}
else if (!strcmp(value, "false") || !strcmp(value, "FALSE")) {
- MPI_Info_set(info, "romio_no_indep_rw", value);
+ ADIOI_Info_set(info, "romio_no_indep_rw", value);
fd->hints->no_indep_rw = 0;
tmp_val = 0;
}
@@ -387,38 +387,38 @@
/* new hints for enabling/disabling data sieving on
* reads/writes
*/
- MPI_Info_get(users_info, "romio_ds_read", MPI_MAX_INFO_VAL, value,
+ ADIOI_Info_get(users_info, "romio_ds_read", MPI_MAX_INFO_VAL, value,
&flag);
if (flag) {
if (!strcmp(value, "enable") || !strcmp(value, "ENABLE")) {
- MPI_Info_set(info, "romio_ds_read", value);
+ ADIOI_Info_set(info, "romio_ds_read", value);
fd->hints->ds_read = ADIOI_HINT_ENABLE;
}
else if (!strcmp(value, "disable") || !strcmp(value, "DISABLE")) {
- MPI_Info_set(info, "romio_ds_read", value);
+ ADIOI_Info_set(info, "romio_ds_read", value);
fd->hints->ds_read = ADIOI_HINT_DISABLE;
}
else if (!strcmp(value, "automatic") || !strcmp(value, "AUTOMATIC"))
{
- MPI_Info_set(info, "romio_ds_read", value);
+ ADIOI_Info_set(info, "romio_ds_read", value);
fd->hints->ds_read = ADIOI_HINT_AUTO;
}
/* otherwise ignore */
}
- MPI_Info_get(users_info, "romio_ds_write", MPI_MAX_INFO_VAL, value,
+ ADIOI_Info_get(users_info, "romio_ds_write", MPI_MAX_INFO_VAL, value,
&flag);
if (flag) {
if (!strcmp(value, "enable") || !strcmp(value, "ENABLE")) {
- MPI_Info_set(info, "romio_ds_write", value);
+ ADIOI_Info_set(info, "romio_ds_write", value);
fd->hints->ds_write = ADIOI_HINT_ENABLE;
}
else if (!strcmp(value, "disable") || !strcmp(value, "DISABLE")) {
- MPI_Info_set(info, "romio_ds_write", value);
+ ADIOI_Info_set(info, "romio_ds_write", value);
fd->hints->ds_write = ADIOI_HINT_DISABLE;
}
else if (!strcmp(value, "automatic") || !strcmp(value, "AUTOMATIC"))
{
- MPI_Info_set(info, "romio_ds_write", value);
+ ADIOI_Info_set(info, "romio_ds_write", value);
fd->hints->ds_write = ADIOI_HINT_AUTO;
}
/* otherwise ignore */
@@ -428,7 +428,7 @@
/* MPI_File_open path sets up some data structrues that don't
* get resized in the MPI_File_set_view path, so ignore
* cb_nodes in the set_view case */
- MPI_Info_get(users_info, "cb_nodes", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "cb_nodes", MPI_MAX_INFO_VAL,
value, &flag);
if (flag && ((intval=atoi(value)) > 0)) {
tmp_val = intval;
@@ -451,27 +451,27 @@
nprocs_is_valid = 1;
}
if (intval <= nprocs) {
- MPI_Info_set(info, "cb_nodes", value);
+ ADIOI_Info_set(info, "cb_nodes", value);
fd->hints->cb_nodes = intval;
}
}
} /* if (ok_to_override_cb_nodes) */
- MPI_Info_get(users_info, "ind_wr_buffer_size", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "ind_wr_buffer_size", MPI_MAX_INFO_VAL,
value, &flag);
if (flag && ((intval = atoi(value)) > 0)) {
- MPI_Info_set(info, "ind_wr_buffer_size", value);
+ ADIOI_Info_set(info, "ind_wr_buffer_size", value);
fd->hints->ind_wr_buffer_size = intval;
}
- MPI_Info_get(users_info, "ind_rd_buffer_size", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "ind_rd_buffer_size", MPI_MAX_INFO_VAL,
value, &flag);
if (flag && ((intval = atoi(value)) > 0)) {
- MPI_Info_set(info, "ind_rd_buffer_size", value);
+ ADIOI_Info_set(info, "ind_rd_buffer_size", value);
fd->hints->ind_rd_buffer_size = intval;
}
- MPI_Info_get(users_info, "cb_config_list", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "cb_config_list", MPI_MAX_INFO_VAL,
value, &flag);
if (flag) {
if (fd->hints->cb_config_list == NULL) {
@@ -480,7 +480,7 @@
* the cb_config_list hint will be set at file open time
* either by the user or to the default
*/
- MPI_Info_set(info, "cb_config_list", value);
+ ADIOI_Info_set(info, "cb_config_list", value);
len = (strlen(value)+1) * sizeof(char);
fd->hints->cb_config_list = ADIOI_Malloc(len);
if (fd->hints->cb_config_list == NULL) {
@@ -493,18 +493,18 @@
* info value with a cb_config_list value in it in a couple
* of calls, which would be irritating. */
}
- MPI_Info_get(users_info, "romio_min_fdomain_size", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "romio_min_fdomain_size", MPI_MAX_INFO_VAL,
value, &flag);
if ( flag && ((intval = atoi(value)) > 0) ) {
- MPI_Info_set(info, "romio_min_fdomain_size", value);
+ ADIOI_Info_set(info, "romio_min_fdomain_size", value);
fd->hints->min_fdomain_size = intval;
}
/* Now we use striping unit in common code so we should
process hints for it. */
- MPI_Info_get(users_info, "striping_unit", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(users_info, "striping_unit", MPI_MAX_INFO_VAL,
value, &flag);
if ( flag && ((intval = atoi(value)) > 0) ) {
- MPI_Info_set(info, "striping_unit", value);
+ ADIOI_Info_set(info, "striping_unit", value);
fd->hints->striping_unit = intval;
}
}
@@ -513,7 +513,7 @@
* free/alloc and insures it is always set
*/
if (fd->hints->cb_config_list == NULL) {
- MPI_Info_set(info, "cb_config_list", ADIOI_CB_CONFIG_LIST_DFLT);
+ ADIOI_Info_set(info, "cb_config_list", ADIOI_CB_CONFIG_LIST_DFLT);
len = (strlen(ADIOI_CB_CONFIG_LIST_DFLT)+1) * sizeof(char);
fd->hints->cb_config_list = ADIOI_Malloc(len);
if (fd->hints->cb_config_list == NULL) {
@@ -534,7 +534,7 @@
* disable at the same time doesn't make sense. honor
* romio_cb_{read,write} and force the no_indep_rw hint to
* 'disable' */
- MPI_Info_set(info, "romio_no_indep_rw", "false");
+ ADIOI_Info_set(info, "romio_no_indep_rw", "false");
fd->hints->no_indep_rw = 0;
fd->hints->deferred_open = 0;
}
@@ -542,16 +542,16 @@
if (ADIO_Feature(fd, ADIO_DATA_SIEVING_WRITES) == 0) {
/* disable data sieving for fs that do not
support file locking */
- MPI_Info_get(info, "ind_wr_buffer_size", MPI_MAX_INFO_VAL,
+ ADIOI_Info_get(info, "ind_wr_buffer_size", MPI_MAX_INFO_VAL,
value, &flag);
if (flag) {
/* get rid of this value if it is set */
- MPI_Info_delete(info, "ind_wr_buffer_size");
+ ADIOI_Info_delete(info, "ind_wr_buffer_size");
}
/* note: leave ind_wr_buffer_size alone; used for other cases
* as well. -- Rob Ross, 04/22/2003
*/
- MPI_Info_set(info, "romio_ds_write", "disable");
+ ADIOI_Info_set(info, "romio_ds_write", "disable");
fd->hints->ds_write = ADIOI_HINT_DISABLE;
}
Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_open.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/common/ad_open.c 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/common/ad_open.c 2010-05-25 18:59:13 UTC (rev 6739)
@@ -271,7 +271,7 @@
/* TEMPORARY -- REMOVE WHEN NO LONGER UPDATING INFO FOR FS-INDEP. */
value = (char *) ADIOI_Malloc((MPI_MAX_INFO_VAL+1)*sizeof(char));
ADIOI_Snprintf(value, MPI_MAX_INFO_VAL+1, "%d", rank_ct);
- MPI_Info_set(fd->info, "cb_nodes", value);
+ ADIOI_Info_set(fd->info, "cb_nodes", value);
ADIOI_Free(value);
}
Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_read_str.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/common/ad_read_str.c 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/common/ad_read_str.c 2010-05-25 18:59:13 UTC (rev 6739)
@@ -102,7 +102,7 @@
/* get max_bufsize from the info object. */
value = (char *) ADIOI_Malloc((MPI_MAX_INFO_VAL+1)*sizeof(char));
- MPI_Info_get(fd->info, "ind_rd_buffer_size", MPI_MAX_INFO_VAL, value,
+ ADIOI_Info_get(fd->info, "ind_rd_buffer_size", MPI_MAX_INFO_VAL, value,
&info_flag);
max_bufsize = atoi(value);
ADIOI_Free(value);
Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_write_coll.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/common/ad_write_coll.c 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/common/ad_write_coll.c 2010-05-25 18:59:13 UTC (rev 6739)
@@ -331,7 +331,7 @@
That gives the no. of communication phases as well. */
value = (char *) ADIOI_Malloc((MPI_MAX_INFO_VAL+1)*sizeof(char));
- MPI_Info_get(fd->info, "cb_buffer_size", MPI_MAX_INFO_VAL, value,
+ ADIOI_Info_get(fd->info, "cb_buffer_size", MPI_MAX_INFO_VAL, value,
&info_flag);
coll_bufsize = atoi(value);
ADIOI_Free(value);
Modified: mpich2/trunk/src/mpi/romio/adio/common/cb_config_list.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/common/cb_config_list.c 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/common/cb_config_list.c 2010-05-25 18:59:13 UTC (rev 6739)
@@ -83,7 +83,7 @@
* FS-INDEP. */
value = (char *) ADIOI_Malloc((MPI_MAX_INFO_VAL+1)*sizeof(char));
ADIOI_Snprintf(value, MPI_MAX_INFO_VAL+1, "%d", fd->hints->cb_nodes);
- MPI_Info_set(fd->info, "cb_nodes", value);
+ ADIOI_Info_set(fd->info, "cb_nodes", value);
ADIOI_Free(value);
return 0;
Modified: mpich2/trunk/src/mpi/romio/adio/common/system_hints.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/common/system_hints.c 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/common/system_hints.c 2010-05-25 18:59:13 UTC (rev 6739)
@@ -52,7 +52,7 @@
for (i=0; i<nkeys; i++) {
MPI_Info_get_nthkey(info, i, key);
- MPI_Info_get(info, key, MPI_MAX_INFO_VAL-1, value, &flag);
+ ADIOI_Info_get(info, key, MPI_MAX_INFO_VAL-1, value, &flag);
printf("key = %s, value = %s\n", key, value);
}
return;
@@ -122,9 +122,9 @@
#endif
/* don't actually care what the value is. only want to know if key
* exists: we leave it alone if so*/
- MPI_Info_get(info, key, 1, &dummy, &flag);
+ ADIOI_Info_get(info, key, 1, &dummy, &flag);
if (flag == 1) continue;
- MPI_Info_set(info, key, val);
+ ADIOI_Info_set(info, key, val);
} while ((token = strtok_r(NULL, "\n", &pos1)) != NULL);
ADIOI_Free(buffer);
return 0;
@@ -173,10 +173,10 @@
for (i=0; i<nkeys_sysinfo; i++) {
MPI_Info_get_nthkey(sysinfo, i, key);
/* don't care about the value, just want to know if hint set already*/
- if (info != MPI_INFO_NULL) MPI_Info_get(info, key, 1, val, &flag);
+ if (info != MPI_INFO_NULL) ADIOI_Info_get(info, key, 1, val, &flag);
if (flag == 1) continue; /* skip any hints already set by user */
- MPI_Info_get(sysinfo, key, MPI_MAX_INFO_VAL-1, val, &flag);
- MPI_Info_set(*new_info, key, val);
+ ADIOI_Info_get(sysinfo, key, MPI_MAX_INFO_VAL-1, val, &flag);
+ ADIOI_Info_set(*new_info, key, val);
flag = 0;
}
Modified: mpich2/trunk/src/mpi/romio/adio/include/adioi.h
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/include/adioi.h 2010-05-25 18:58:03 UTC (rev 6738)
+++ mpich2/trunk/src/mpi/romio/adio/include/adioi.h 2010-05-25 18:59:13 UTC (rev 6739)
@@ -737,6 +737,23 @@
int ADIOI_Strnapp( char *, const char *, size_t );
char *ADIOI_Strdup( const char * );
+/* the current MPI standard is not const-correct, and modern compilers warn
+ * about the following sort of code:
+ *
+ * MPI_Info_set(info, "key", "val");
+ *
+ * reminding us that "key" and "val" are const. We use the following macros to
+ * cast away the const and suppress the warning. */
+#define ADIOI_Info_set(info_,key_str_,val_) \
+ MPI_Info_set((info_),((char*)key_str_),(char*)(val_))
+#define ADIOI_Info_get(info_,key_str_,val_len_,val_,flag_) \
+ MPI_Info_get((info_),((char*)key_str_),(val_len_),(val_),(flag_))
+#define ADIOI_Info_get_valuelen(info_,key_str_,val_len_,flag_) \
+ MPI_Info_get_valuelen((info_),((char*)key_str_),(val_len_),(flag_))
+#define ADIOI_Info_delete(info_,key_str_) \
+ MPI_Info_delete((info_),((char*)key_str_))
+
+
/* Provide a fallback snprintf for systems that do not have one */
/* Define attribute as empty if it has no definition */
#ifndef ATTRIBUTE
More information about the mpich2-commits
mailing list