- commits - mailman3.cels.anl.gov

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

21 Nov '12

Author: goodell Date: 2012-11-21 14:56:27 -0600 (Wed, 21 Nov 2012) New Revision: 10658 Modified: mpich2/trunk/src/mpi/romio/adio/common/iscontig.c Log: fix overzealous MPICH2-->MPICH rename No reviewer. Modified: mpich2/trunk/src/mpi/romio/adio/common/iscontig.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/common/iscontig.c 2012-11-21 20:56:27 UTC (rev 10657) +++ mpich2/trunk/src/mpi/romio/adio/common/iscontig.c 2012-11-21 20:56:27 UTC (rev 10658) @@ -9,7 +9,7 @@ #include "mpisgi2.h" #endif */ -#if (defined(MPICH) || defined(MPICH)) +#if defined(MPICH) /* MPICH also provides this routine */ void MPIR_Datatype_iscontig(MPI_Datatype datatype, int *flag); @@ -17,19 +17,16 @@ { MPIR_Datatype_iscontig(datatype, flag); - /* if it is MPICH and the datatype is reported as contigous, - check if the true_lb is non-zero, and if so, mark the - datatype as noncontiguous */ -#ifdef MPICH + /* if the datatype is reported as contigous, check if the true_lb is + * non-zero, and if so, mark the datatype as noncontiguous */ if (*flag) { MPI_Aint true_extent, true_lb; - + MPI_Type_get_true_extent(datatype, &true_lb, &true_extent); if (true_lb > 0) *flag = 0; } -#endif } #elif (defined(MPIHP) && defined(HAVE_MPI_INFO))

1 0

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

21 Nov '12

Author: goodell Date: 2012-11-21 14:56:27 -0600 (Wed, 21 Nov 2012) New Revision: 10657 Modified: mpich2/trunk/src/mpi/romio/mpi-io/mpiu_external32.c Log: fix implicit declaration warning in external32 code This was easily seen with `--enable-strict`, but Jeff also pointed it out in tt#1754. No reviewer. Modified: mpich2/trunk/src/mpi/romio/mpi-io/mpiu_external32.c =================================================================== --- mpich2/trunk/src/mpi/romio/mpi-io/mpiu_external32.c 2012-11-21 18:51:24 UTC (rev 10656) +++ mpich2/trunk/src/mpi/romio/mpi-io/mpiu_external32.c 2012-11-21 20:56:27 UTC (rev 10657) @@ -21,7 +21,7 @@ int mpi_errno = MPI_SUCCESS; int is_contig = 0; - MPIR_Datatype_iscontig(datatype, &is_contig); + ADIOI_Datatype_iscontig(datatype, &is_contig); mpi_errno = MPI_Pack_external_size("external32", count, datatype, &bytes); if (mpi_errno != MPI_SUCCESS) goto fn_exit; @@ -74,7 +74,7 @@ int mpi_errno = MPI_SUCCESS; int is_contig = 0; - MPIR_Datatype_iscontig(datatype, &is_contig); + ADIOI_Datatype_iscontig(datatype, &is_contig); mpi_errno = MPI_Pack_external_size("external32", count, datatype, &bytes); if (mpi_errno != MPI_SUCCESS) goto fn_exit;

1 0

r10651 - mpich2/trunk/src/include
by gropp＠mcs.anl.gov 21 Nov '12

21 Nov '12

Author: gropp Date: 2012-11-21 11:30:21 -0600 (Wed, 21 Nov 2012) New Revision: 10651 Modified: mpich2/trunk/src/include/mpimem.h Log: Suppress variable unused warning when alloca used for local memory Modified: mpich2/trunk/src/include/mpimem.h =================================================================== --- mpich2/trunk/src/include/mpimem.h 2012-11-21 17:29:17 UTC (rev 10650) +++ mpich2/trunk/src/include/mpimem.h 2012-11-21 17:30:21 UTC (rev 10651) @@ -23,6 +23,11 @@ /* ensure that we weren't included out of order */ #include "mpibase.h" +/* Define attribute as empty if it has no definition */ +#ifndef ATTRIBUTE +#define ATTRIBUTE(a) +#endif + /* ------------------------------------------------------------------------- */ /* mpimem.h */ /* ------------------------------------------------------------------------- */ @@ -298,7 +303,7 @@ /* Define decl with a dummy definition to allow us to put a semi-colon after the macro without causing the declaration block to end (restriction imposed by C) */ -#define MPIU_CHKLMEM_DECL(n_) int dummy_ +#define MPIU_CHKLMEM_DECL(n_) int dummy_ ATTRIBUTE((unused)) #define MPIU_CHKLMEM_FREEALL() #define MPIU_CHKLMEM_MALLOC_ORSTMT(pointer_,type_,nbytes_,rc_,name_,stmt_) \ {pointer_ = (type_)alloca(nbytes_); \ @@ -429,11 +434,6 @@ (ptr_) = realloc_tmp_; \ } while (0) -/* Define attribute as empty if it has no definition */ -#ifndef ATTRIBUTE -#define ATTRIBUTE(a) -#endif - #if defined(HAVE_STRNCASECMP) # define MPIU_Strncasecmp strncasecmp #elif defined(HAVE_STRNICMP)

1 0

r10650 - mpich2/trunk/src/pm/util
by gropp＠mcs.anl.gov 21 Nov '12

21 Nov '12

Author: gropp Date: 2012-11-21 11:29:17 -0600 (Wed, 21 Nov 2012) New Revision: 10650 Modified: mpich2/trunk/src/pm/util/pmiserv.c Log: Fix error in computing read buffer size Modified: mpich2/trunk/src/pm/util/pmiserv.c =================================================================== --- mpich2/trunk/src/pm/util/pmiserv.c 2012-11-20 23:10:55 UTC (rev 10649) +++ mpich2/trunk/src/pm/util/pmiserv.c 2012-11-21 17:29:17 UTC (rev 10650) @@ -1388,7 +1388,10 @@ while (curlen < maxlen) { if (nextChar == endChar) { do { - n = read( fd, readbuf, sizeof(readbuf)-1 ); + /* Carefully read data into buffer. This could be + written to read more at one time, but would then + need to know the size of the readbuf */ + n = read( fd, readbuf, 1 ); } while (n == -1 && errno == EINTR); if (n == 0) { /* EOF */

1 0

r10649 - in mpich2/trunk/src: mpi/comm mpid/ch3/src
by goodell＠mcs.anl.gov 20 Nov '12

20 Nov '12

Author: goodell Date: 2012-11-20 17:10:55 -0600 (Tue, 20 Nov 2012) New Revision: 10649 Modified: mpich2/trunk/src/mpi/comm/comm_create.c mpich2/trunk/src/mpid/ch3/src/ch3u_recvq.c Log: fix a couple of incorrect FUNCNAME macros Fixes tt#1752. No reviewer. Modified: mpich2/trunk/src/mpi/comm/comm_create.c =================================================================== --- mpich2/trunk/src/mpi/comm/comm_create.c 2012-11-20 23:05:15 UTC (rev 10648) +++ mpich2/trunk/src/mpi/comm/comm_create.c 2012-11-20 23:10:55 UTC (rev 10649) @@ -178,7 +178,7 @@ * * mapping[i] is the index in the old vcr of index i in the new vcr */ #undef FUNCNAME -#define FUNCNAME MPIR_Comm_create_and_map_vcrt +#define FUNCNAME MPIR_Comm_create_create_and_map_vcrt #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) int MPIR_Comm_create_create_and_map_vcrt(int n, Modified: mpich2/trunk/src/mpid/ch3/src/ch3u_recvq.c =================================================================== --- mpich2/trunk/src/mpid/ch3/src/ch3u_recvq.c 2012-11-20 23:05:15 UTC (rev 10648) +++ mpich2/trunk/src/mpid/ch3/src/ch3u_recvq.c 2012-11-20 23:10:55 UTC (rev 10649) @@ -140,7 +140,7 @@ } #undef FUNCNAME -#define FUNCNAME MPIDI_CH3U_Recvq_FU +#define FUNCNAME MPIDI_CH3U_Recvq_init #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) int MPIDI_CH3U_Recvq_init(void)

1 0

r10642 - mpich2/trunk/test/mpi/cxx/io
by goodell＠mcs.anl.gov 20 Nov '12

20 Nov '12

Author: goodell Date: 2012-11-20 16:21:00 -0600 (Tue, 20 Nov 2012) New Revision: 10642 Modified: mpich2/trunk/test/mpi/cxx/io/ioharness.defn Log: MPI_Datatype handler should be committed before it is used Contributed by IBM. Based on patch 0018 from code discussions. Modified: mpich2/trunk/test/mpi/cxx/io/ioharness.defn =================================================================== --- mpich2/trunk/test/mpi/cxx/io/ioharness.defn 2012-11-20 22:20:59 UTC (rev 10641) +++ mpich2/trunk/test/mpi/cxx/io/ioharness.defn 2012-11-20 22:21:00 UTC (rev 10642) @@ -108,6 +108,7 @@ # collective I/O and independent file I/O without seek <setcontigview> filetype = MPI::INT.Create_vector( b, n, n*s ); +filetype.Commit(); offset = r * n * sizeof(int); fh.Set_view( offset, MPI::INT, filetype, "native", MPI::INFO_NULL ); filetype.Free();

1 0

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

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

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