November 2012 - commits - mailman3.cels.anl.gov

r10641 - in mpich2/trunk/src/mpi/romio/adio: common include
by goodell＠mcs.anl.gov 20 Nov '12

20 Nov '12

Author: goodell Date: 2012-11-20 16:20:59 -0600 (Tue, 20 Nov 2012) New Revision: 10641 Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_close.c mpich2/trunk/src/mpi/romio/adio/common/ad_delete.c mpich2/trunk/src/mpi/romio/adio/include/adioi.h Log: only one task should actually delete in ADIO_Close Contributed by IBM. Based on patch 0013 from code discussions. Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_close.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/common/ad_close.c 2012-11-20 22:20:58 UTC (rev 10640) +++ mpich2/trunk/src/mpi/romio/adio/common/ad_close.c 2012-11-20 22:20:59 UTC (rev 10641) @@ -14,7 +14,8 @@ void ADIO_Close(ADIO_File fd, int *error_code) { - int i, j, k, combiner, myrank, err, is_contig; + int err = MPI_SUCCESS; + int i, j, k, combiner, myrank, is_contig; static char myname[] = "ADIO_CLOSE"; if (fd->async_count) { @@ -47,14 +48,21 @@ } if (fd->access_mode & ADIO_DELETE_ON_CLOSE) { + int is_agg_ldr = 0; + ADIOI_IS_AGG_LEADER(fd, &is_agg_ldr); /* if we are doing aggregation and deferred open, then it's possible * that rank 0 does not have access to the file. make sure only an * aggregator deletes the file.*/ MPI_Comm_rank(fd->comm, &myrank); - if (myrank == fd->hints->ranklist[0]) { - ADIO_Delete(fd->filename, &err); + if (is_agg_ldr) { + ADIO_Delete(fd->filename, &err); } MPI_Barrier(fd->comm); + MPI_Bcast(&err, 1, MPI_INT, fd->hints->ranklist[0], fd->comm); + if (err != MPI_SUCCESS) { + *error_code = err; + return; + } } if (fd->fortran_handle != -1) { Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_delete.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/common/ad_delete.c 2012-11-20 22:20:58 UTC (rev 10640) +++ mpich2/trunk/src/mpi/romio/adio/common/ad_delete.c 2012-11-20 22:20:59 UTC (rev 10641) @@ -18,9 +18,7 @@ err = unlink(filename); if (err == -1) { - *error_code = MPIO_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, - myname, __LINE__, MPI_ERR_IO, "**io", - "**io %s", strerror(errno)); + *error_code = ADIOI_Err_create_code(myname, filename, errno); return; } else *error_code = MPI_SUCCESS; Modified: mpich2/trunk/src/mpi/romio/adio/include/adioi.h =================================================================== --- mpich2/trunk/src/mpi/romio/adio/include/adioi.h 2012-11-20 22:20:58 UTC (rev 10640) +++ mpich2/trunk/src/mpi/romio/adio/include/adioi.h 2012-11-20 22:20:59 UTC (rev 10641) @@ -78,6 +78,13 @@ }; +#define ADIOI_IS_AGG_LEADER(fh_, is_agg_p_) \ + do { \ + int rank_; \ + MPI_Comm_rank((fh_)->comm, &rank_); \ + *(is_agg_p_) = ((fh_)->hints->ranklist[0] == 0); \ + } while (0) + typedef struct ADIOI_Datarep { char *name; void *state;

1 0

r10640 - in mpich2/trunk/src/mpi/romio/adio: ad_nfs common include
by goodell＠mcs.anl.gov 20 Nov '12

20 Nov '12

Author: goodell Date: 2012-11-20 16:20:58 -0600 (Tue, 20 Nov 2012) New Revision: 10640 Modified: mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_open.c mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_resize.c mpich2/trunk/src/mpi/romio/adio/common/ad_fstype.c mpich2/trunk/src/mpi/romio/adio/common/ad_opencoll_failsafe.c mpich2/trunk/src/mpi/romio/adio/common/ad_resize.c mpich2/trunk/src/mpi/romio/adio/common/adi_close.c mpich2/trunk/src/mpi/romio/adio/common/error.c mpich2/trunk/src/mpi/romio/adio/include/adioi.h Log: update error checkings in ADIO Adds a new helper function, ADIOI_Err_create_code. Contributed by IBM. Based on patch 0012 from code discussions. Modified: mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_open.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_open.c 2012-11-20 22:20:57 UTC (rev 10639) +++ mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_open.c 2012-11-20 22:20:58 UTC (rev 10640) @@ -91,6 +91,19 @@ __LINE__, MPI_ERR_READ_ONLY, "**ioneedrd", 0); } + else if(errno == EISDIR) { + *error_code = MPIO_Err_create_code(MPI_SUCCESS, + MPIR_ERR_RECOVERABLE, myname, + __LINE__, MPI_ERR_BAD_FILE, + "**filename", 0); + } + else if(errno == EEXIST) { + *error_code = MPIO_Err_create_code(MPI_SUCCESS, + MPIR_ERR_RECOVERABLE, myname, + __LINE__, MPI_ERR_FILE_EXISTS, + "**fileexist", 0); + + } else { *error_code = MPIO_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, myname, Modified: mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_resize.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_resize.c 2012-11-20 22:20:57 UTC (rev 10639) +++ mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_resize.c 2012-11-20 22:20:58 UTC (rev 10640) @@ -20,15 +20,13 @@ void ADIOI_NFS_Resize(ADIO_File fd, ADIO_Offset size, int *error_code) { int err; - static char myname[] = "ADIOI_GEN_RESIZE"; + static char myname[] = "ADIOI_NFS_RESIZE"; err = ftruncate(fd->fd_sys, size); /* --BEGIN ERROR HANDLING-- */ if (err == -1) { - *error_code = MPIO_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, - myname, __LINE__, MPI_ERR_IO, - "**io", "**io %s", strerror(errno)); + *error_code = ADIOI_Err_create_code(myname, fd->filename, errno); return; } /* --END ERROR HANDLING-- */ Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_fstype.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/common/ad_fstype.c 2012-11-20 22:20:57 UTC (rev 10639) +++ mpich2/trunk/src/mpi/romio/adio/common/ad_fstype.c 2012-11-20 22:20:58 UTC (rev 10640) @@ -264,18 +264,24 @@ err = statvfs(filename, &vfsbuf); } while (err && (errno == ESTALE)); - if (err && (errno == ENOENT)) { + if (err) { /* ENOENT may be returned in two cases: * 1) no directory entry for "filename" * 2) "filename" is a dangling symbolic link * * ADIO_FileSysType_parentdir tries to deal with both cases. */ - char *dir; - ADIO_FileSysType_parentdir(filename, &dir); - err = statvfs(dir, &vfsbuf); + if (errno == ENOENT) { + char *dir; + ADIO_FileSysType_parentdir(filename, &dir); + err = statvfs(dir, &vfsbuf); - ADIOI_Free(dir); + ADIOI_Free(dir); + } + else { + *error_code = ADIOI_Err_create_code(myname, filename, errno); + if(*error_code != MPI_SUCCESS) return; + } } /* --BEGIN ERROR HANDLING-- */ @@ -315,11 +321,17 @@ err = statfs(filename, &fsbuf); } while (err && (errno == ESTALE)); - if (err && (errno == ENOENT)) { - char *dir; - ADIO_FileSysType_parentdir(filename, &dir); - err = statfs(dir, &fsbuf); - ADIOI_Free(dir); + if (err) { + if(errno == ENOENT) { + char *dir; + ADIO_FileSysType_parentdir(filename, &dir); + err = statfs(dir, &fsbuf); + ADIOI_Free(dir); + } + else { + *error_code = ADIOI_Err_create_code(myname, filename, errno); + if(*error_code != MPI_SUCCESS) return; + } } /* --BEGIN ERROR HANDLING-- */ @@ -428,11 +440,17 @@ err = stat(filename, &sbuf); } while (err && (errno == ESTALE)); - if (err && (errno == ENOENT)) { - char *dir; - ADIO_FileSysType_parentdir(filename, &dir); - err = stat(dir, &sbuf); - ADIOI_Free(dir); + if (err) { + if(errno == ENOENT) { + char *dir; + ADIO_FileSysType_parentdir(filename, &dir); + err = stat(dir, &sbuf); + ADIOI_Free(dir); + } + else{ + *error_code = ADIOI_Err_create_code(myname, filename, errno); + if(*error_code != MPI_SUCCESS) return; + } } if (err) { Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_opencoll_failsafe.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/common/ad_opencoll_failsafe.c 2012-11-20 22:20:57 UTC (rev 10639) +++ mpich2/trunk/src/mpi/romio/adio/common/ad_opencoll_failsafe.c 2012-11-20 22:20:58 UTC (rev 10640) @@ -74,6 +74,7 @@ if (*error_code != MPI_SUCCESS) (*(fd->fns->ADIOI_xxx_Open))(fd, error_code); + if(*error_code != MPI_SUCCESS) return; /* if we turned off EXCL earlier, then we should turn it back on */ if (fd->access_mode != orig_amode_excl) fd->access_mode = orig_amode_excl; Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_resize.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/common/ad_resize.c 2012-11-20 22:20:57 UTC (rev 10639) +++ mpich2/trunk/src/mpi/romio/adio/common/ad_resize.c 2012-11-20 22:20:58 UTC (rev 10640) @@ -29,9 +29,7 @@ /* --BEGIN ERROR HANDLING-- */ if (err == -1) { - *error_code = MPIO_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, - myname, __LINE__, MPI_ERR_IO, - "**io", "**io %s", strerror(errno)); + *error_code = ADIOI_Err_create_code(myname, fd->filename, errno); return; } /* --END ERROR HANDLING-- */ Modified: mpich2/trunk/src/mpi/romio/adio/common/adi_close.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/common/adi_close.c 2012-11-20 22:20:57 UTC (rev 10639) +++ mpich2/trunk/src/mpi/romio/adio/common/adi_close.c 2012-11-20 22:20:58 UTC (rev 10640) @@ -39,10 +39,7 @@ fd->fd_direct = -1; if (err == -1 || derr == -1) { - *error_code = MPIO_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, - myname, __LINE__, MPI_ERR_IO, - "**io", - "**io %s", strerror(errno)); + *error_code = ADIOI_Err_create_code(myname, fd->filename, errno); } else *error_code = MPI_SUCCESS; } Modified: mpich2/trunk/src/mpi/romio/adio/common/error.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/common/error.c 2012-11-20 22:20:57 UTC (rev 10639) +++ mpich2/trunk/src/mpi/romio/adio/common/error.c 2012-11-20 22:20:58 UTC (rev 10640) @@ -36,3 +36,66 @@ return error_code; } +/* Returns an MPI error code corresponding to "my_errno", for function "myname" + * and the given file, "filename". */ +int ADIOI_Err_create_code(char *myname, char *filename, int my_errno) +{ + int error_code = MPI_SUCCESS; + if(!my_errno) return MPI_SUCCESS; + + switch(my_errno) { + case EACCES: + error_code = MPIO_Err_create_code(MPI_SUCCESS, + MPIR_ERR_RECOVERABLE, myname, + __LINE__, MPI_ERR_ACCESS, + "**fileaccess", + "**fileaccess %s", + filename ); + break; + case ENAMETOOLONG: + error_code = MPIO_Err_create_code(MPI_SUCCESS, + MPIR_ERR_RECOVERABLE, myname, + __LINE__, MPI_ERR_BAD_FILE, + "**filenamelong", + "**filenamelong %s %d", + filename, + strlen(filename)); + break; + case ENOENT: + error_code = MPIO_Err_create_code(MPI_SUCCESS, + MPIR_ERR_RECOVERABLE, myname, + __LINE__, MPI_ERR_NO_SUCH_FILE, + "**filenoexist", + "**filenoexist %s", + filename); + break; + case EISDIR: + error_code = MPIO_Err_create_code(MPI_SUCCESS, + MPIR_ERR_RECOVERABLE, + myname, __LINE__, + MPI_ERR_BAD_FILE, + "**filenamedir", + "**filenamedir %s", + filename); + break; + case EROFS: + error_code = MPIO_Err_create_code(MPI_SUCCESS, + MPIR_ERR_RECOVERABLE, myname, + __LINE__, MPI_ERR_READ_ONLY, + "**ioneedrd", 0 ); + break; + case EEXIST: + error_code = MPIO_Err_create_code(MPI_SUCCESS, + MPIR_ERR_RECOVERABLE, myname, + __LINE__, MPI_ERR_FILE_EXISTS, + "**fileexist", 0); + break; + default: + error_code = MPIO_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, + myname, __LINE__, MPI_ERR_IO, "**io", + "**io %s", strerror(my_errno)); + break; + } + + return error_code; +} Modified: mpich2/trunk/src/mpi/romio/adio/include/adioi.h =================================================================== --- mpich2/trunk/src/mpi/romio/adio/include/adioi.h 2012-11-20 22:20:57 UTC (rev 10639) +++ mpich2/trunk/src/mpi/romio/adio/include/adioi.h 2012-11-20 22:20:58 UTC (rev 10640) @@ -561,6 +561,7 @@ int MPIR_Status_set_bytes(MPI_Status *status, MPI_Datatype datatype, int nbytes); int ADIOI_Uses_generic_read(ADIO_File fd); int ADIOI_Uses_generic_write(ADIO_File fd); +int ADIOI_Err_create_code(char *myname, char *filename, int my_errno); int ADIOI_FAKE_IODone(ADIO_Request *request, ADIO_Status *status,

1 0

r10638 - mpich2/trunk/src/mpi/romio/adio/include
by goodell＠mcs.anl.gov 20 Nov '12

20 Nov '12

Author: goodell Date: 2012-11-20 16:20:57 -0600 (Tue, 20 Nov 2012) New Revision: 10638 Modified: mpich2/trunk/src/mpi/romio/adio/include/adioi_error.h Log: Change error class in MPIO_CHECK_COUNT from MPI_ERR_ARG to MPI_ERR_COUNT Contributed by IBM. Based on patch 0010 from code discussions. Modified: mpich2/trunk/src/mpi/romio/adio/include/adioi_error.h =================================================================== --- mpich2/trunk/src/mpi/romio/adio/include/adioi_error.h 2012-11-20 22:20:56 UTC (rev 10637) +++ mpich2/trunk/src/mpi/romio/adio/include/adioi_error.h 2012-11-20 22:20:57 UTC (rev 10638) @@ -41,7 +41,7 @@ error_code = MPIO_Err_create_code(MPI_SUCCESS, \ MPIR_ERR_RECOVERABLE, \ myname, __LINE__, \ - MPI_ERR_ARG, \ + MPI_ERR_COUNT, \ "**iobadcount", 0); \ error_code = MPIO_Err_return_file(fh, error_code); \ goto fn_exit; \

1 0

r10639 - mpich2/trunk/src/mpi/romio/adio/common
by goodell＠mcs.anl.gov 20 Nov '12

20 Nov '12

Author: goodell Date: 2012-11-20 16:20:57 -0600 (Tue, 20 Nov 2012) New Revision: 10639 Modified: 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/cb_config_list.c Log: handle ENOMEM errors in ADIO Contributed by IBM. Based on patch 0011 from code discussions. Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_hints.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/common/ad_hints.c 2012-11-20 22:20:57 UTC (rev 10638) +++ mpich2/trunk/src/mpi/romio/adio/common/ad_hints.c 2012-11-20 22:20:57 UTC (rev 10639) @@ -40,7 +40,13 @@ value = (char *) ADIOI_Malloc((MPI_MAX_INFO_VAL+1)*sizeof(char)); if (value == NULL) { - /* NEED TO HANDLE ENOMEM */ + *error_code = MPIO_Err_create_code(*error_code, + MPIR_ERR_RECOVERABLE, + myname, + __LINE__, + MPI_ERR_OTHER, + "**nomem2",0); + return; } /* initialize info and hints to default values if they haven't been @@ -484,7 +490,13 @@ len = (strlen(value)+1) * sizeof(char); fd->hints->cb_config_list = ADIOI_Malloc(len); if (fd->hints->cb_config_list == NULL) { - /* NEED TO HANDLE ENOMEM */ + *error_code = MPIO_Err_create_code(*error_code, + MPIR_ERR_RECOVERABLE, + myname, + __LINE__, + MPI_ERR_OTHER, + "**nomem2",0); + return; } ADIOI_Strncpy(fd->hints->cb_config_list, value, len); } @@ -517,7 +529,13 @@ 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) { - /* NEED TO HANDLE ENOMEM */ + *error_code = MPIO_Err_create_code(*error_code, + MPIR_ERR_RECOVERABLE, + myname, + __LINE__, + MPI_ERR_OTHER, + "**nomem2",0); + return; } ADIOI_Strncpy(fd->hints->cb_config_list, ADIOI_CB_CONFIG_LIST_DFLT, len); } Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_open.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/common/ad_open.c 2012-11-20 22:20:57 UTC (rev 10638) +++ mpich2/trunk/src/mpi/romio/adio/common/ad_open.c 2012-11-20 22:20:57 UTC (rev 10639) @@ -75,7 +75,13 @@ /* create and initialize info object */ fd->hints = (ADIOI_Hints *)ADIOI_Calloc(1, sizeof(struct ADIOI_Hints_struct)); if (fd->hints == NULL) { - /* NEED TO HANDLE ENOMEM ERRORS */ + *error_code = MPIO_Err_create_code(*error_code, + MPIR_ERR_RECOVERABLE, + myname, + __LINE__, + MPI_ERR_OTHER, + "**nomem2",0); + goto fn_exit; } fd->hints->cb_config_list = NULL; fd->hints->ranklist = NULL; @@ -254,7 +260,13 @@ if (rank == 0) { tmp_ranklist = (int *) ADIOI_Malloc(sizeof(int) * procs); if (tmp_ranklist == NULL) { - /* NEED TO HANDLE ENOMEM ERRORS */ + *error_code = MPIO_Err_create_code(*error_code, + MPIR_ERR_RECOVERABLE, + myname, + __LINE__, + MPI_ERR_OTHER, + "**nomem2",0); + return 0; } rank_ct = ADIOI_cb_config_list_parse(fd->hints->cb_config_list, Modified: mpich2/trunk/src/mpi/romio/adio/common/cb_config_list.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/common/cb_config_list.c 2012-11-20 22:20:57 UTC (rev 10638) +++ mpich2/trunk/src/mpi/romio/adio/common/cb_config_list.c 2012-11-20 22:20:57 UTC (rev 10639) @@ -66,6 +66,8 @@ { int my_rank; char *value; + int error_code = MPI_SUCCESS; + static char myname[] = "ADIOI_cb_bcast_rank_map"; MPI_Bcast(&(fd->hints->cb_nodes), 1, MPI_INT, 0, fd->comm); if (fd->hints->cb_nodes > 0) { @@ -73,7 +75,13 @@ if (my_rank != 0) { fd->hints->ranklist = ADIOI_Malloc(fd->hints->cb_nodes*sizeof(int)); if (fd->hints->ranklist == NULL) { - /* NEED TO HANDLE ENOMEM */ + error_code = MPIO_Err_create_code(error_code, + MPIR_ERR_RECOVERABLE, + myname, + __LINE__, + MPI_ERR_OTHER, + "**nomem2",0); + return error_code; } } MPI_Bcast(fd->hints->ranklist, fd->hints->cb_nodes, MPI_INT, 0,

1 0

r10637 - in mpich2/trunk/src/mpi/romio: adio/include mpi-io
by goodell＠mcs.anl.gov 20 Nov '12

20 Nov '12

Author: goodell Date: 2012-11-20 16:20:56 -0600 (Tue, 20 Nov 2012) New Revision: 10637 Modified: mpich2/trunk/src/mpi/romio/adio/include/adioi_error.h mpich2/trunk/src/mpi/romio/mpi-io/fsync.c mpich2/trunk/src/mpi/romio/mpi-io/open.c mpich2/trunk/src/mpi/romio/mpi-io/set_info.c mpich2/trunk/src/mpi/romio/mpi-io/set_size.c Log: add missing checks on parameters of IO routines Contributed by IBM. Based on patch 0009 from code discussions. Modified: mpich2/trunk/src/mpi/romio/adio/include/adioi_error.h =================================================================== --- mpich2/trunk/src/mpi/romio/adio/include/adioi_error.h 2012-11-20 22:20:55 UTC (rev 10636) +++ mpich2/trunk/src/mpi/romio/adio/include/adioi_error.h 2012-11-20 22:20:56 UTC (rev 10637) @@ -21,6 +21,21 @@ goto fn_exit; \ } +/* TODO could add more glue code to help check for handle validity, or perhaps + * do some sort of always-safe attribute/info call to check for handle validity */ +#define MPIO_CHECK_COMM(comm_, myname_, error_code_) \ + do { \ + if ((comm_) == MPI_COMM_NULL) { \ + error_code = MPIO_Err_create_code(MPI_SUCCESS, \ + MPIR_ERR_RECOVERABLE, \ + (myname_), __LINE__, \ + MPI_ERR_COMM, \ + "**commnull", 0); \ + error_code_ = MPIO_Err_return_file(MPI_FILE_NULL, (error_code_)); \ + goto fn_exit; \ + } \ + } while (0) + #define MPIO_CHECK_COUNT(fh, count, myname, error_code) \ if (count < 0) { \ error_code = MPIO_Err_create_code(MPI_SUCCESS, \ Modified: mpich2/trunk/src/mpi/romio/mpi-io/fsync.c =================================================================== --- mpich2/trunk/src/mpi/romio/mpi-io/fsync.c 2012-11-20 22:20:55 UTC (rev 10636) +++ mpich2/trunk/src/mpi/romio/mpi-io/fsync.c 2012-11-20 22:20:56 UTC (rev 10637) @@ -55,6 +55,7 @@ error_code = MPIO_Err_return_file(MPI_FILE_NULL, error_code); goto fn_exit; } + MPIO_CHECK_WRITABLE(fh, myname, error_code); /* --END ERROR HANDLING-- */ ADIOI_TEST_DEFERRED(adio_fh, "MPI_File_sync", &error_code); Modified: mpich2/trunk/src/mpi/romio/mpi-io/open.c =================================================================== --- mpich2/trunk/src/mpi/romio/mpi-io/open.c 2012-11-20 22:20:55 UTC (rev 10636) +++ mpich2/trunk/src/mpi/romio/mpi-io/open.c 2012-11-20 22:20:56 UTC (rev 10637) @@ -60,13 +60,7 @@ MPIU_THREAD_CS_ENTER(ALLFUNC,); /* --BEGIN ERROR HANDLING-- */ - if (comm == MPI_COMM_NULL) - { - error_code = MPIO_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, - myname, __LINE__, MPI_ERR_COMM, - "**comm", 0); - goto fn_fail; - } + MPIO_CHECK_COMM(comm, myname, error_code); /* --END ERROR HANDLING-- */ MPI_Comm_test_inter(comm, &flag); Modified: mpich2/trunk/src/mpi/romio/mpi-io/set_info.c =================================================================== --- mpich2/trunk/src/mpi/romio/mpi-io/set_info.c 2012-11-20 22:20:55 UTC (rev 10636) +++ mpich2/trunk/src/mpi/romio/mpi-io/set_info.c 2012-11-20 22:20:56 UTC (rev 10637) @@ -48,14 +48,13 @@ /* set new info */ ADIO_SetInfo(adio_fh, info, &error_code); - /* TODO: what to do with error code? */ +fn_exit: /* --BEGIN ERROR HANDLING-- */ if (error_code != MPI_SUCCESS) error_code = MPIO_Err_return_file(adio_fh, error_code); /* --END ERROR HANDLING-- */ -fn_exit: MPIU_THREAD_CS_EXIT(ALLFUNC,); return error_code; Modified: mpich2/trunk/src/mpi/romio/mpi-io/set_size.c =================================================================== --- mpich2/trunk/src/mpi/romio/mpi-io/set_size.c 2012-11-20 22:20:55 UTC (rev 10636) +++ mpich2/trunk/src/mpi/romio/mpi-io/set_size.c 2012-11-20 22:20:56 UTC (rev 10637) @@ -61,6 +61,7 @@ error_code = MPIO_Err_return_file(adio_fh, error_code); goto fn_exit; } + MPIO_CHECK_WRITABLE(fh, myname, error_code); /* --END ERROR HANDLING-- */ tmp_sz = size;

1 0

r10636 - mpich2/trunk/src/mpi/romio/mpi-io
by goodell＠mcs.anl.gov 20 Nov '12

20 Nov '12

Author: goodell Date: 2012-11-20 16:20:55 -0600 (Tue, 20 Nov 2012) New Revision: 10636 Modified: mpich2/trunk/src/mpi/romio/mpi-io/open.c Log: make ROMIO error class be consistent with PE MPI When opening file with inconsistent "amode"s. Contributed by IBM. Based on patch 0007 from code discussions. Modified: mpich2/trunk/src/mpi/romio/mpi-io/open.c =================================================================== --- mpich2/trunk/src/mpi/romio/mpi-io/open.c 2012-11-20 22:20:54 UTC (rev 10635) +++ mpich2/trunk/src/mpi/romio/mpi-io/open.c 2012-11-20 22:20:55 UTC (rev 10636) @@ -116,7 +116,7 @@ if (tmp_amode == ADIO_AMODE_NOMATCH) { error_code = MPIO_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, - myname, __LINE__, MPI_ERR_AMODE, + myname, __LINE__, MPI_ERR_NOT_SAME, "**fileamodediff", 0); goto fn_fail; }

1 0

r10634 - mpich2/trunk/src/mpi/datatype
by goodell＠mcs.anl.gov 20 Nov '12

20 Nov '12

Author: goodell Date: 2012-11-20 16:20:54 -0600 (Tue, 20 Nov 2012) New Revision: 10634 Modified: mpich2/trunk/src/mpi/datatype/type_create_darray.c Log: check rank and the product of array_of_psizes in MPI_Type_create_darray Contributed by IBM. Based on patch 0004 from code discussions. Modified: mpich2/trunk/src/mpi/datatype/type_create_darray.c =================================================================== --- mpich2/trunk/src/mpi/datatype/type_create_darray.c 2012-11-20 22:20:53 UTC (rev 10633) +++ mpich2/trunk/src/mpi/datatype/type_create_darray.c 2012-11-20 22:20:54 UTC (rev 10634) @@ -403,9 +403,11 @@ MPID_BEGIN_ERROR_CHECKS; { /* Check parameters */ - MPIR_ERRTEST_ARGNEG(rank, "rank", mpi_errno); - MPIR_ERRTEST_ARGNONPOS(size, "size", mpi_errno); - MPIR_ERRTEST_ARGNONPOS(ndims, "ndims", mpi_errno); + MPIR_ERRTEST_ARGNONPOS(size, "size", mpi_errno, MPI_ERR_ARG); + /* use MPI_ERR_RANK class for PE-MPI compatibility */ + MPIU_ERR_CHKANDJUMP3((rank < 0 || rank >= size), mpi_errno, MPI_ERR_RANK, + "**argrange", "**argrange %s %d %d", "rank", rank, (size-1)); + MPIR_ERRTEST_ARGNONPOS(ndims, "ndims", mpi_errno, MPI_ERR_DIMS); MPIR_ERRTEST_ARGNULL(array_of_gsizes, "array_of_gsizes", mpi_errno); MPIR_ERRTEST_ARGNULL(array_of_distribs, "array_of_distribs", mpi_errno); @@ -423,6 +425,7 @@ goto fn_fail; } + tmp_size = 1; for (i=0; mpi_errno == MPI_SUCCESS && i < ndims; i++) { MPIR_ERRTEST_ARGNONPOS(array_of_gsizes[i], "gsize", mpi_errno); MPIR_ERRTEST_ARGNONPOS(array_of_psizes[i], "psize", mpi_errno); @@ -468,8 +471,13 @@ i, array_of_psizes[i]); goto fn_fail; } + + tmp_size *= array_of_psizes[i]; } + MPIU_ERR_CHKANDJUMP1((tmp_size != size), mpi_errno, MPI_ERR_ARG, + "**arg", "**arg %s", "array_of_psizes"); + /* TODO: GET THIS CHECK IN ALSO */ /* check if MPI_Aint is large enough for size of global array.

1 0

r10635 - in mpich2/trunk/src: include mpi/datatype mpi/spawn mpi/topo
by goodell＠mcs.anl.gov 20 Nov '12

20 Nov '12

Author: goodell Date: 2012-11-20 16:20:54 -0600 (Tue, 20 Nov 2012) New Revision: 10635 Modified: mpich2/trunk/src/include/mpierrs.h mpich2/trunk/src/mpi/datatype/type_create_darray.c mpich2/trunk/src/mpi/datatype/type_create_subarray.c mpich2/trunk/src/mpi/spawn/comm_spawn_multiple.c mpich2/trunk/src/mpi/topo/graph_map.c Log: Added a parameter err_class to macro MPIR_ERRTEST_ARGNONPOS Subtle: also converts two error checks to use different classes at the same time. Contributed by IBM. Based on patch 0005 from code discussions. Modified: mpich2/trunk/src/include/mpierrs.h =================================================================== --- mpich2/trunk/src/include/mpierrs.h 2012-11-20 22:20:54 UTC (rev 10634) +++ mpich2/trunk/src/include/mpierrs.h 2012-11-20 22:20:54 UTC (rev 10635) @@ -143,12 +143,12 @@ goto fn_fail; \ } -#define MPIR_ERRTEST_ARGNONPOS(arg,arg_name,err) \ +#define MPIR_ERRTEST_ARGNONPOS(arg,arg_name,err,err_class) \ if ((arg) <= 0) { \ err = MPIR_Err_create_code(MPI_SUCCESS, \ MPIR_ERR_RECOVERABLE, \ FCNAME, __LINE__, \ - MPI_ERR_ARG, \ + err_class, \ "**argnonpos", \ "**argnonpos %s %d", \ arg_name, arg ); \ Modified: mpich2/trunk/src/mpi/datatype/type_create_darray.c =================================================================== --- mpich2/trunk/src/mpi/datatype/type_create_darray.c 2012-11-20 22:20:54 UTC (rev 10634) +++ mpich2/trunk/src/mpi/datatype/type_create_darray.c 2012-11-20 22:20:54 UTC (rev 10635) @@ -427,8 +427,8 @@ tmp_size = 1; for (i=0; mpi_errno == MPI_SUCCESS && i < ndims; i++) { - MPIR_ERRTEST_ARGNONPOS(array_of_gsizes[i], "gsize", mpi_errno); - MPIR_ERRTEST_ARGNONPOS(array_of_psizes[i], "psize", mpi_errno); + MPIR_ERRTEST_ARGNONPOS(array_of_gsizes[i], "gsize", mpi_errno, MPI_ERR_ARG); + MPIR_ERRTEST_ARGNONPOS(array_of_psizes[i], "psize", mpi_errno, MPI_ERR_ARG); if ((array_of_distribs[i] != MPI_DISTRIBUTE_NONE) && (array_of_distribs[i] != MPI_DISTRIBUTE_BLOCK) && Modified: mpich2/trunk/src/mpi/datatype/type_create_subarray.c =================================================================== --- mpich2/trunk/src/mpi/datatype/type_create_subarray.c 2012-11-20 22:20:54 UTC (rev 10634) +++ mpich2/trunk/src/mpi/datatype/type_create_subarray.c 2012-11-20 22:20:54 UTC (rev 10635) @@ -96,13 +96,13 @@ MPID_BEGIN_ERROR_CHECKS; { /* Check parameters */ - MPIR_ERRTEST_ARGNONPOS(ndims, "ndims", mpi_errno); + MPIR_ERRTEST_ARGNONPOS(ndims, "ndims", mpi_errno, MPI_ERR_DIMS); MPIR_ERRTEST_ARGNULL(array_of_sizes, "array_of_sizes", mpi_errno); MPIR_ERRTEST_ARGNULL(array_of_subsizes, "array_of_subsizes", mpi_errno); MPIR_ERRTEST_ARGNULL(array_of_starts, "array_of_starts", mpi_errno); for (i=0; mpi_errno == MPI_SUCCESS && i < ndims; i++) { - MPIR_ERRTEST_ARGNONPOS(array_of_sizes[i], "size", mpi_errno); - MPIR_ERRTEST_ARGNONPOS(array_of_subsizes[i], "subsize", mpi_errno); + MPIR_ERRTEST_ARGNONPOS(array_of_sizes[i], "size", mpi_errno, MPI_ERR_ARG); + MPIR_ERRTEST_ARGNONPOS(array_of_subsizes[i], "subsize", mpi_errno, MPI_ERR_ARG); MPIR_ERRTEST_ARGNEG(array_of_starts[i], "start", mpi_errno); if (array_of_subsizes[i] > array_of_sizes[i]) { mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, Modified: mpich2/trunk/src/mpi/spawn/comm_spawn_multiple.c =================================================================== --- mpich2/trunk/src/mpi/spawn/comm_spawn_multiple.c 2012-11-20 22:20:54 UTC (rev 10634) +++ mpich2/trunk/src/mpi/spawn/comm_spawn_multiple.c 2012-11-20 22:20:54 UTC (rev 10635) @@ -107,7 +107,7 @@ if (comm_ptr->rank == root) { MPIR_ERRTEST_ARGNULL(array_of_commands, "array_of_commands", mpi_errno); MPIR_ERRTEST_ARGNULL(array_of_maxprocs, "array_of_maxprocs", mpi_errno); - MPIR_ERRTEST_ARGNONPOS(count, "count", mpi_errno); + MPIR_ERRTEST_ARGNONPOS(count, "count", mpi_errno, MPI_ERR_COUNT); for (i = 0; i < count; i++) { MPIR_ERRTEST_INFO_OR_NULL(array_of_info[i], mpi_errno); Modified: mpich2/trunk/src/mpi/topo/graph_map.c =================================================================== --- mpich2/trunk/src/mpi/topo/graph_map.c 2012-11-20 22:20:54 UTC (rev 10634) +++ mpich2/trunk/src/mpi/topo/graph_map.c 2012-11-20 22:20:54 UTC (rev 10635) @@ -136,7 +136,7 @@ MPIR_ERRTEST_ARGNULL(newrank,"newrank",mpi_errno); MPIR_ERRTEST_ARGNULL(indx,"indx",mpi_errno); MPIR_ERRTEST_ARGNULL(edges,"edges",mpi_errno); - MPIR_ERRTEST_ARGNONPOS(nnodes,"nnodes",mpi_errno); + MPIR_ERRTEST_ARGNONPOS(nnodes,"nnodes",mpi_errno, MPI_ERR_ARG); } MPID_END_ERROR_CHECKS; }

1 0

r10633 - in mpich2/trunk/src/mpi/romio/adio: ad_bg ad_bgl ad_lustre ad_nfs ad_piofs ad_pvfs ad_pvfs2 ad_zoidfs common
by goodell＠mcs.anl.gov 20 Nov '12

20 Nov '12

Author: goodell Date: 2012-11-20 16:20:53 -0600 (Tue, 20 Nov 2012) New Revision: 10633 Modified: mpich2/trunk/src/mpi/romio/adio/ad_bg/ad_bg_read.c mpich2/trunk/src/mpi/romio/adio/ad_bg/ad_bg_write.c mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_read.c mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_write.c mpich2/trunk/src/mpi/romio/adio/ad_lustre/ad_lustre_wrstr.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_piofs/ad_piofs_write.c mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_read.c mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_write.c mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_read_list_classic.c mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_write_list_classic.c mpich2/trunk/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_read_list.c mpich2/trunk/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_write_list.c mpich2/trunk/src/mpi/romio/adio/common/ad_read_str.c mpich2/trunk/src/mpi/romio/adio/common/ad_read_str_naive.c mpich2/trunk/src/mpi/romio/adio/common/ad_write_nolock.c mpich2/trunk/src/mpi/romio/adio/common/ad_write_str.c mpich2/trunk/src/mpi/romio/adio/common/ad_write_str_naive.c Log: update count in status for adio when filetype_size is zero Contributed by IBM. Patch 0001 from code discussions. Modified: mpich2/trunk/src/mpi/romio/adio/ad_bg/ad_bg_read.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/ad_bg/ad_bg_read.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_bg/ad_bg_read.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -212,6 +212,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/ad_bg/ad_bg_write.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/ad_bg/ad_bg_write.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_bg/ad_bg_write.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -253,6 +253,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } 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 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_read.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -203,6 +203,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } 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 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_write.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -253,6 +253,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/ad_lustre/ad_lustre_wrstr.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/ad_lustre/ad_lustre_wrstr.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_lustre/ad_lustre_wrstr.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -188,6 +188,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if (!filetype_size) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } 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 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_read.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -187,6 +187,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } 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 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_write.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -290,6 +290,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/ad_piofs/ad_piofs_write.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/ad_piofs/ad_piofs_write.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_piofs/ad_piofs_write.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -93,6 +93,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_read.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_read.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_read.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -150,6 +150,9 @@ ADIOI_Datatype_iscontig(fd->filetype, &filetype_is_contig); MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_write.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_write.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_write.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -130,6 +130,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } @@ -514,6 +517,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_read_list_classic.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_read_list_classic.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_read_list_classic.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -70,6 +70,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_write_list_classic.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_write_list_classic.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_write_list_classic.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -86,6 +86,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_read_list.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_read_list.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_read_list.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -72,6 +72,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_write_list.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_write_list.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_write_list.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -86,6 +86,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_read_str.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/common/ad_read_str.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/common/ad_read_str.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -87,6 +87,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_read_str_naive.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/common/ad_read_str_naive.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/common/ad_read_str_naive.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -36,6 +36,9 @@ MPI_Type_size(fd->filetype, (int*)&filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, buftype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_write_nolock.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/common/ad_write_nolock.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/common/ad_write_nolock.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -58,6 +58,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_write_str.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/common/ad_write_str.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/common/ad_write_str.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -157,6 +157,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_write_str_naive.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/common/ad_write_str_naive.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/common/ad_write_str_naive.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -37,6 +37,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, buftype, 0); +#endif *error_code = MPI_SUCCESS; return; }

1 0

r10632 - mpich2/trunk/src/mpi/romio/adio/common
by goodell＠mcs.anl.gov 20 Nov '12

20 Nov '12

Author: goodell Date: 2012-11-20 16:20:51 -0600 (Tue, 20 Nov 2012) New Revision: 10632 Modified: mpich2/trunk/src/mpi/romio/adio/common/status_setb.c Log: ROMIO: fix overzealous MPICH2->MPICH change Partially reviewed by robl@ & balaji@. Modified: mpich2/trunk/src/mpi/romio/adio/common/status_setb.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/common/status_setb.c 2012-11-20 22:14:18 UTC (rev 10631) +++ mpich2/trunk/src/mpi/romio/adio/common/status_setb.c 2012-11-20 22:20:51 UTC (rev 10632) @@ -8,7 +8,7 @@ #include "adio.h" #include "mpi.h" -#if defined(MPICH) +#if defined(MPICH2) || (defined(MPICH) && (MPICH_NAME >= 3)) /* Not quite correct, but much closer for MPI2 */ /* TODO: still needs to handle partial datatypes and situations where the mpi * implementation fills status with something other than bytes (globus2 might @@ -23,20 +23,6 @@ MPI_Status_set_elements(status, MPI_BYTE, nbytes); return MPI_SUCCESS; } -#elif defined(MPICH) - -void MPID_Status_set_bytes(MPI_Status *status, int nbytes); -int MPIR_Status_set_bytes(MPI_Status *status, MPI_Datatype datatype, - int nbytes); - -int MPIR_Status_set_bytes(MPI_Status *status, MPI_Datatype datatype, - int nbytes) -{ - if (status != MPI_STATUS_IGNORE) - MPID_Status_set_bytes(status, nbytes); - return MPI_SUCCESS; -} - #elif defined(MPILAM) || defined(MPISGI) int MPIR_Status_set_bytes(MPI_Status *status, MPI_Datatype datatype, int nbytes)

1 0