February 2013 - commits - mailman3.cels.anl.gov

[mpich] MPICH primary repository branch, master, updated. v3.0.2-6-g2bdb181
by noreply＠mpich.org 05 Feb '13

05 Feb '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 2bdb181f2ff8607c3cfa6f7d306e94f604dc94ba (commit) from d8eec5491fa0929d43da3086230795a2fb1c6545 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/2bdb181f2ff8607c3cfa6f7d306e94f60… commit 2bdb181f2ff8607c3cfa6f7d306e94f604dc94ba Author: Dave Goodell <goodell(a)mcs.anl.gov> Date: Tue Feb 5 10:53:55 2013 -0600 explain external32 limitations in RELEASE_NOTES references ticket #1754. No reviewer. diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 4d44831..49f2e7e 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -36,7 +36,14 @@ * Support for "external32" data representation is incomplete. This affects the MPI_Pack_external and MPI_Unpack_external routines, as - well the external data representation capabilities of ROMIO. + well the external data representation capabilities of ROMIO. In + particular: noncontiguous user buffers could consume egregious + amounts of memory in the MPI library and any types which vary in + width between the native representation and the external32 + representation will likely cause corruption. The following ticket + contains some additional information: + + http://trac.mpich.org/projects/mpich/ticket/1754 * ch3 has known problems in some cases when threading and dynamic processes are used together on communicators of size greater than ----------------------------------------------------------------------- Summary of changes: RELEASE_NOTES | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.2-5-gd8eec54
by noreply＠mpich.org 05 Feb '13

05 Feb '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via d8eec5491fa0929d43da3086230795a2fb1c6545 (commit) from 0b3640682130339f69e5391560d39b771c04bad4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/d8eec5491fa0929d43da3086230795a2f… commit d8eec5491fa0929d43da3086230795a2fb1c6545 Author: Dave Goodell <goodell(a)mcs.anl.gov> Date: Mon Feb 4 23:14:50 2013 -0600 tt#1754: fix warnings in ROMIO external32 code This doesn't fix any of the serious bugs or inefficiencies present in the current external32 implementation. But it at least fixes some very valid warnings related to const-ness and passing incorrect pointer types. References ticket #1754 Reviewed-by: robl diff --git a/src/mpi/romio/adio/common/error.c b/src/mpi/romio/adio/common/error.c index ddf78be..15f2376 100644 --- a/src/mpi/romio/adio/common/error.c +++ b/src/mpi/romio/adio/common/error.c @@ -38,7 +38,7 @@ int ADIOI_Error(ADIO_File fd, int error_code, char *string) /* 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 ADIOI_Err_create_code(const char *myname, const char *filename, int my_errno) { int error_code = MPI_SUCCESS; if(!my_errno) return MPI_SUCCESS; diff --git a/src/mpi/romio/adio/include/adioi.h b/src/mpi/romio/adio/include/adioi.h index d430da8..063b39c 100644 --- a/src/mpi/romio/adio/include/adioi.h +++ b/src/mpi/romio/adio/include/adioi.h @@ -561,7 +561,7 @@ int ADIOI_End_call(MPI_Comm comm, int keyval, void *attribute_val, void *extra_s 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_Err_create_code(const char *myname, const char *filename, int my_errno); int ADIOI_FAKE_IODone(ADIO_Request *request, ADIO_Status *status, diff --git a/src/mpi/romio/adio/include/mpiu_external32.h b/src/mpi/romio/adio/include/mpiu_external32.h index eb5eec7..4302373 100644 --- a/src/mpi/romio/adio/include/mpiu_external32.h +++ b/src/mpi/romio/adio/include/mpiu_external32.h @@ -8,7 +8,7 @@ #ifndef _MPIU_EXTERNAL32_H_ #define _MPIU_EXTERNAL32_H_ -int MPIU_write_external32_conversion_fn (void *userbuf, MPI_Datatype datatype, +int MPIU_write_external32_conversion_fn (const void *userbuf, MPI_Datatype datatype, int count, void *filebuf); int MPIU_read_external32_conversion_fn(void *userbuf, MPI_Datatype datatype, int count, void *filebuf); @@ -17,6 +17,6 @@ int MPIU_datatype_full_size(MPI_Datatype datatype, MPI_Aint *size); /* given a buffer, count, and datatype, return an apropriately sized and * * external32-formatted buffer, suitable for handing off to a subsequent write * * routine */ -int MPIU_external32_buffer_setup(void * buf, int count, MPI_Datatype type, void **newbuf); +int MPIU_external32_buffer_setup(const void * buf, int count, MPI_Datatype type, void **newbuf); #endif diff --git a/src/mpi/romio/mpi-io/mpiu_external32.c b/src/mpi/romio/mpi-io/mpiu_external32.c index 8e9d467..75b4c27 100644 --- a/src/mpi/romio/mpi-io/mpiu_external32.c +++ b/src/mpi/romio/mpi-io/mpiu_external32.c @@ -12,7 +12,7 @@ #include "mpioprof.h" #endif -int MPIU_write_external32_conversion_fn (void *userbuf, MPI_Datatype datatype, +int MPIU_write_external32_conversion_fn (const void *userbuf, MPI_Datatype datatype, int count, void *filebuf) { int position_i = 0; @@ -136,7 +136,7 @@ fn_exit: /* given a buffer, count, and datatype, return an apropriately allocated, sized * and external32-formatted buffer, suitable for handing off to a subsequent * write routine. Caller is responsible for freeing 'newbuf' */ -int MPIU_external32_buffer_setup(void * buf, int count, MPI_Datatype type, void **newbuf) +int MPIU_external32_buffer_setup(const void * buf, int count, MPI_Datatype type, void **newbuf) { MPI_Aint datatype_size=0, bytes=0; diff --git a/src/mpi/romio/mpi-io/read.c b/src/mpi/romio/mpi-io/read.c index c7fb25d..029db3b 100644 --- a/src/mpi/romio/mpi-io/read.c +++ b/src/mpi/romio/mpi-io/read.c @@ -124,11 +124,12 @@ int MPIOI_File_read(MPI_File fh, xbuf = buf; if (adio_fh->is_external32) { - error_code = MPIU_datatype_full_size(datatype, &datatype_size); + MPI_Aint e32_size = 0; + error_code = MPIU_datatype_full_size(datatype, &e32_size); if (error_code != MPI_SUCCESS) goto fn_exit; - e32_buf = ADIOI_Malloc(datatype_size*count); + e32_buf = ADIOI_Malloc(e32_size*count); xbuf = e32_buf; } diff --git a/src/mpi/romio/mpi-io/read_all.c b/src/mpi/romio/mpi-io/read_all.c index 8d412a3..b387fe9 100644 --- a/src/mpi/romio/mpi-io/read_all.c +++ b/src/mpi/romio/mpi-io/read_all.c @@ -107,11 +107,12 @@ int MPIOI_File_read_all(MPI_File fh, xbuf = buf; if (adio_fh->is_external32) { - error_code = MPIU_datatype_full_size(datatype, &datatype_size); + MPI_Aint e32_size = 0; + error_code = MPIU_datatype_full_size(datatype, &e32_size); if (error_code != MPI_SUCCESS) goto fn_exit; - e32_buf = ADIOI_Malloc(datatype_size*count); + e32_buf = ADIOI_Malloc(e32_size*count); xbuf = e32_buf; } diff --git a/src/mpi/romio/mpi-io/read_allb.c b/src/mpi/romio/mpi-io/read_allb.c index 2ba4b3a..ecc9088 100644 --- a/src/mpi/romio/mpi-io/read_allb.c +++ b/src/mpi/romio/mpi-io/read_allb.c @@ -104,11 +104,12 @@ int MPIOI_File_read_all_begin(MPI_File fh, xbuf = buf; if (adio_fh->is_external32) { - error_code = MPIU_datatype_full_size(datatype, &datatype_size); + MPI_Aint e32_size = 0; + error_code = MPIU_datatype_full_size(datatype, &e32_size); if (error_code != MPI_SUCCESS) goto fn_exit; - e32_buf = ADIOI_Malloc(datatype_size*count); + e32_buf = ADIOI_Malloc(e32_size*count); xbuf = e32_buf; } diff --git a/src/mpi/romio/mpi-io/read_ordb.c b/src/mpi/romio/mpi-io/read_ordb.c index 6944e68..324fa7f 100644 --- a/src/mpi/romio/mpi-io/read_ordb.c +++ b/src/mpi/romio/mpi-io/read_ordb.c @@ -102,11 +102,12 @@ int MPI_File_read_ordered_begin(MPI_File fh, void *buf, int count, xbuf = buf; if (adio_fh->is_external32) { - error_code = MPIU_datatype_full_size(datatype, &datatype_size); + MPI_Aint e32_size = 0; + error_code = MPIU_datatype_full_size(datatype, &e32_size); if (error_code != MPI_SUCCESS) goto fn_exit; - e32_buf = ADIOI_Malloc(datatype_size*count); + e32_buf = ADIOI_Malloc(e32_size*count); xbuf = e32_buf; } diff --git a/src/mpi/romio/mpi-io/read_sh.c b/src/mpi/romio/mpi-io/read_sh.c index 8ee0e63..1536838 100644 --- a/src/mpi/romio/mpi-io/read_sh.c +++ b/src/mpi/romio/mpi-io/read_sh.c @@ -99,11 +99,12 @@ int MPI_File_read_shared(MPI_File fh, void *buf, int count, xbuf = buf; if (adio_fh->is_external32) { - error_code = MPIU_datatype_full_size(datatype, &datatype_size); + MPI_Aint e32_size = 0; + error_code = MPIU_datatype_full_size(datatype, &e32_size); if (error_code != MPI_SUCCESS) goto fn_exit; - e32_buf = ADIOI_Malloc(datatype_size*count); + e32_buf = ADIOI_Malloc(e32_size*count); xbuf = e32_buf; } diff --git a/src/mpi/romio/mpi-io/write.c b/src/mpi/romio/mpi-io/write.c index 4221eb3..02867c2 100644 --- a/src/mpi/romio/mpi-io/write.c +++ b/src/mpi/romio/mpi-io/write.c @@ -74,7 +74,8 @@ int MPIOI_File_write(MPI_File fh, int datatype_size; ADIO_Offset off; ADIO_File adio_fh; - void *e32buf=NULL, *xbuf=NULL; + void *e32buf=NULL; + const void *xbuf=NULL; MPIU_THREAD_CS_ENTER(ALLFUNC,); @@ -121,7 +122,7 @@ int MPIOI_File_write(MPI_File fh, ADIOI_TEST_DEFERRED(adio_fh, myname, &error_code); - xbuf = (void *)buf; + xbuf = buf; if (adio_fh->is_external32) { error_code = MPIU_external32_buffer_setup(buf, count, datatype, &e32buf); if (error_code != MPI_SUCCESS) diff --git a/src/mpi/romio/mpi-io/write_all.c b/src/mpi/romio/mpi-io/write_all.c index 28cd31a..2e1533c 100644 --- a/src/mpi/romio/mpi-io/write_all.c +++ b/src/mpi/romio/mpi-io/write_all.c @@ -74,7 +74,8 @@ int MPIOI_File_write_all(MPI_File fh, { int error_code, datatype_size; ADIO_File adio_fh; - void *e32buf=NULL, *xbuf=NULL; + void *e32buf=NULL; + const void *xbuf=NULL; MPIU_THREAD_CS_ENTER(ALLFUNC,); @@ -104,7 +105,7 @@ int MPIOI_File_write_all(MPI_File fh, MPIO_CHECK_COUNT_SIZE(adio_fh, count, datatype_size, myname, error_code); /* --END ERROR HANDLING-- */ - xbuf = (void *)buf; + xbuf = buf; if (adio_fh->is_external32) { error_code = MPIU_external32_buffer_setup(buf, count, datatype, &e32buf); if (error_code != MPI_SUCCESS) diff --git a/src/mpi/romio/mpi-io/write_allb.c b/src/mpi/romio/mpi-io/write_allb.c index 3ee56ca..21e928e 100644 --- a/src/mpi/romio/mpi-io/write_allb.c +++ b/src/mpi/romio/mpi-io/write_allb.c @@ -60,7 +60,8 @@ int MPIOI_File_write_all_begin(MPI_File fh, { int error_code, datatype_size; ADIO_File adio_fh; - void *e32buf=NULL, *xbuf=NULL; + void *e32buf=NULL; + const void *xbuf=NULL; MPIU_THREAD_CS_ENTER(ALLFUNC,); @@ -100,7 +101,7 @@ int MPIOI_File_write_all_begin(MPI_File fh, /* --END ERROR HANDLING-- */ - xbuf = (void *)buf; + xbuf = buf; if (adio_fh->is_external32) { error_code = MPIU_external32_buffer_setup(buf, count, datatype, &e32buf); if (error_code != MPI_SUCCESS) diff --git a/src/mpi/romio/mpi-io/write_ord.c b/src/mpi/romio/mpi-io/write_ord.c index 2dc7b91..d0fe63f 100644 --- a/src/mpi/romio/mpi-io/write_ord.c +++ b/src/mpi/romio/mpi-io/write_ord.c @@ -48,7 +48,8 @@ int MPI_File_write_ordered(MPI_File fh, const void *buf, int count, static char myname[] = "MPI_FILE_WRITE_ORDERED"; ADIO_Offset shared_fp; ADIO_File adio_fh; - void *e32buf=NULL, *xbuf; + void *e32buf=NULL; + const void *xbuf; MPIU_THREAD_CS_ENTER(ALLFUNC,); diff --git a/src/mpi/romio/mpi-io/write_ordb.c b/src/mpi/romio/mpi-io/write_ordb.c index f11b1df..87ee213 100644 --- a/src/mpi/romio/mpi-io/write_ordb.c +++ b/src/mpi/romio/mpi-io/write_ordb.c @@ -44,7 +44,8 @@ int MPI_File_write_ordered_begin(MPI_File fh, const void *buf, int count, static char myname[] = "MPI_FILE_WRITE_ORDERED_BEGIN"; ADIO_Offset shared_fp; ADIO_File adio_fh; - void *e32buf = NULL, *xbuf=NULL; + void *e32buf = NULL; + const void *xbuf=NULL; MPIU_THREAD_CS_ENTER(ALLFUNC,); diff --git a/src/mpi/romio/mpi-io/write_sh.c b/src/mpi/romio/mpi-io/write_sh.c index 23f81b7..de7d21d 100644 --- a/src/mpi/romio/mpi-io/write_sh.c +++ b/src/mpi/romio/mpi-io/write_sh.c @@ -47,7 +47,8 @@ int MPI_File_write_shared(MPI_File fh, const void *buf, int count, int datatype_size, incr; ADIO_Offset off, shared_fp; ADIO_File adio_fh; - void *e32buf = NULL, *xbuf = NULL; + void *e32buf = NULL; + const void *xbuf = NULL; MPIU_THREAD_CS_ENTER(ALLFUNC,); ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/adio/common/error.c | 2 +- src/mpi/romio/adio/include/adioi.h | 2 +- src/mpi/romio/adio/include/mpiu_external32.h | 4 ++-- src/mpi/romio/mpi-io/mpiu_external32.c | 4 ++-- src/mpi/romio/mpi-io/read.c | 5 +++-- src/mpi/romio/mpi-io/read_all.c | 5 +++-- src/mpi/romio/mpi-io/read_allb.c | 5 +++-- src/mpi/romio/mpi-io/read_ordb.c | 5 +++-- src/mpi/romio/mpi-io/read_sh.c | 5 +++-- src/mpi/romio/mpi-io/write.c | 5 +++-- src/mpi/romio/mpi-io/write_all.c | 5 +++-- src/mpi/romio/mpi-io/write_allb.c | 5 +++-- src/mpi/romio/mpi-io/write_ord.c | 3 ++- src/mpi/romio/mpi-io/write_ordb.c | 3 ++- src/mpi/romio/mpi-io/write_sh.c | 3 ++- 15 files changed, 36 insertions(+), 25 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.2-4-g0b36406
by noreply＠mpich.org 05 Feb '13

05 Feb '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 0b3640682130339f69e5391560d39b771c04bad4 (commit) from f71dd6e42390021aaf91814008e7208ad3e65f64 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/0b3640682130339f69e5391560d39b771… commit 0b3640682130339f69e5391560d39b771c04bad4 Author: James Dinan <dinan(a)mcs.anl.gov> Date: Tue Feb 5 08:43:47 2013 -0600 BUGFIX: Unlock piggybacking for Get_accumulate GACC operations were both piggybacking the unlock message to the origin, and sending back a PT done packet. This was causing the origin to be unlocked twice. When another lock operation was performed between the GACC and PT done unlock operations, there was a synchronization race. diff --git a/src/mpid/ch3/src/ch3u_handle_recv_req.c b/src/mpid/ch3/src/ch3u_handle_recv_req.c index 2eaa530..2352da7 100644 --- a/src/mpid/ch3/src/ch3u_handle_recv_req.c +++ b/src/mpid/ch3/src/ch3u_handle_recv_req.c @@ -82,6 +82,7 @@ int MPIDI_CH3_ReqHandler_PutAccumRespComplete( MPIDI_VC_t *vc, int *complete ) { int mpi_errno = MPI_SUCCESS; + int is_gacc_op = 0; MPID_Win *win_ptr; MPIU_CHKPMEM_DECL(1); MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_REQHANDLER_PUTACCUMRESPCOMPLETE); @@ -96,6 +97,7 @@ int MPIDI_CH3_ReqHandler_PutAccumRespComplete( MPIDI_VC_t *vc, MPID_Request *resp_req; MPID_IOV iov[MPID_IOV_LIMIT]; + is_gacc_op = 1; MPIDI_Pkt_init(get_accum_resp_pkt, MPIDI_CH3_PKT_GET_ACCUM_RESP); get_accum_resp_pkt->request_handle = rreq->dev.resp_request_handle; @@ -170,7 +172,7 @@ int MPIDI_CH3_ReqHandler_PutAccumRespComplete( MPIDI_VC_t *vc, win_ptr->my_counter -= 1; } else { - if ((win_ptr->current_lock_type == MPI_LOCK_SHARED) || + if ((win_ptr->current_lock_type == MPI_LOCK_SHARED && !is_gacc_op) || (rreq->dev.single_op_opt == 1)) { mpi_errno = MPIDI_CH3I_Send_pt_rma_done_pkt(vc, win_ptr, rreq->dev.source_win_handle); diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c index 3ffb73e..6ce857a 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -4710,6 +4710,7 @@ int MPIDI_CH3_PktHandler_PtRMADone( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, *buflen = sizeof(MPIDI_CH3_Pkt_t); MPID_Win_get_ptr(pt_rma_done_pkt->source_win_handle, win_ptr); + MPIU_Assert(win_ptr->targets[pt_rma_done_pkt->target_rank].remote_lock_state != MPIDI_CH3_WIN_LOCK_NONE); if (win_ptr->targets[pt_rma_done_pkt->target_rank].remote_lock_state == MPIDI_CH3_WIN_LOCK_FLUSH) win_ptr->targets[pt_rma_done_pkt->target_rank].remote_lock_state = MPIDI_CH3_WIN_LOCK_GRANTED; ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/src/ch3u_handle_recv_req.c | 4 +++- src/mpid/ch3/src/ch3u_rma_sync.c | 1 + 2 files changed, 4 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.2-3-gf71dd6e
by noreply＠mpich.org 04 Feb '13

04 Feb '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via f71dd6e42390021aaf91814008e7208ad3e65f64 (commit) from 34249593d1229da56c14beaa5fb8287b70aab08e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/f71dd6e42390021aaf91814008e7208ad… commit f71dd6e42390021aaf91814008e7208ad3e65f64 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Tue Jan 22 08:33:20 2013 -0600 feature-encode NTFS quirk NTFS does not have the POSIX "file exists until everyone closes it" property, so introduce the feature mechanism to NTFS and let ADIO know NTFS cannot rely on that property. diff --git a/src/mpi/romio/adio/ad_ntfs/ad_ntfs.c b/src/mpi/romio/adio/ad_ntfs/ad_ntfs.c index 696ba85..ff95110 100644 --- a/src/mpi/romio/adio/ad_ntfs/ad_ntfs.c +++ b/src/mpi/romio/adio/ad_ntfs/ad_ntfs.c @@ -34,5 +34,5 @@ struct ADIOI_Fns_struct ADIO_NTFS_operations = { ADIOI_NTFS_Flush, /* Flush */ ADIOI_NTFS_Resize, /* Resize */ ADIOI_GEN_Delete, /* Delete */ - ADIOI_GEN_Feature /* Features */ + ADIOI_NTFS_Feature /* Features */ }; diff --git a/src/mpi/romio/adio/ad_ntfs/ad_ntfs_feature.c b/src/mpi/romio/adio/ad_ntfs/ad_ntfs_feature.c new file mode 100644 index 0000000..691c224 --- /dev/null +++ b/src/mpi/romio/adio/ad_ntfs/ad_ntfs_feature.c @@ -0,0 +1,20 @@ +#include "adio.h" + +int ADIOI_NTFS_Feature(ADIO_File fd, int flag) +{ + switch(flag) { + /* supported features */ + case ADIO_LOCKS: + case ADIO_SHARED_FP: + case ADIO_ATOMIC_MODE: + case ADIO_DATA_SIEVING_WRITES: + return 1; + break; + /* unsupported features */ + case ADIO_SCALABLE_OPEN: + case ADIO_UNLINK_AFTER_CLOSE: + default: + return 0; + break; + } +} ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/adio/ad_ntfs/ad_ntfs.c | 2 +- .../ad_features.c => ad_ntfs/ad_ntfs_feature.c} | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) copy src/mpi/romio/adio/{common/ad_features.c => ad_ntfs/ad_ntfs_feature.c} (70%) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.2-2-g3424959
by noreply＠mpich.org 04 Feb '13

04 Feb '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 34249593d1229da56c14beaa5fb8287b70aab08e (commit) from 7e56bfc9f79ce102c7b907e7397efa1a278bfd74 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/34249593d1229da56c14beaa5fb8287b7… commit 34249593d1229da56c14beaa5fb8287b70aab08e Author: James Dinan <dinan(a)mcs.anl.gov> Date: Mon Feb 4 12:37:37 2013 -0600 Fix type incompat. for size_t in BSend degug msgs This patch updates BSend debugging messages to be compatible with new size_t arguments added in [7fa7e2cf]. Format strings are updated and size_t args are cast to unsigned long long. Upconverting to the largest unsinged integer type is the only safe way to deal with this in pre-C99. If we were coding to C99, we could have avoided the type cast and used '%z' directly in the format strings. This closes ticket #1786. Reviewer: goodell diff --git a/src/mpi/pt2pt/bsendutil.c b/src/mpi/pt2pt/bsendutil.c index 1776b1b..6c2dda0 100644 --- a/src/mpi/pt2pt/bsendutil.c +++ b/src/mpi/pt2pt/bsendutil.c @@ -334,11 +334,12 @@ static void MPIR_Bsend_free_segment( MPIR_Bsend_data_t *p ) MPIR_Bsend_data_t *prev = p->prev, *avail = BsendBuffer.avail, *avail_prev; MPIU_DBG_MSG_FMT(BSEND,TYPICAL,(MPIU_DBG_FDEST, - "Freeing bsend segment at %p of size %d, next at %p", - p,p->size, ((char *)p)+p->total_size)); + "Freeing bsend segment at %p of size %llu, next at %p", + p, (unsigned long long) p->size, ((char *)p)+p->total_size)); MPIU_DBG_MSG_D(BSEND,TYPICAL, - "At the begining of free_segment with size %d:", p->total_size ); + "At the begining of free_segment with size %llu:", + (unsigned long long) p->total_size ); MPIU_DBG_STMT(BSEND,TYPICAL,MPIR_Bsend_dump()); /* Remove the segment from the active list */ @@ -530,8 +531,8 @@ static void MPIR_Bsend_take_buffer( MPIR_Bsend_data_t *p, int size ) allocate for this buffer. */ MPIU_DBG_MSG_FMT(BSEND,TYPICAL,(MPIU_DBG_FDEST, - "Taking %d bytes from a block with %d bytes\n", - alloc_size, p->total_size )); + "Taking %d bytes from a block with %llu bytes\n", + alloc_size, (unsigned long long) p->total_size )); /* Is there enough space left to create a new block? */ if (alloc_size + (int)BSENDDATA_HEADER_TRUE_SIZE + MIN_BUFFER_BLOCK <= p->size) { @@ -559,8 +560,9 @@ static void MPIR_Bsend_take_buffer( MPIR_Bsend_data_t *p, int size ) p->size = p->total_size - BSENDDATA_HEADER_TRUE_SIZE; MPIU_DBG_MSG_FMT(BSEND,TYPICAL,(MPIU_DBG_FDEST, - "broken blocks p (%d) and new (%d)\n", - p->total_size, newp->total_size )); + "broken blocks p (%llu) and new (%llu)\n", + (unsigned long long) p->total_size, + (unsigned long long) newp->total_size )); } /* Remove p from the avail list and add it to the active list */ @@ -610,12 +612,13 @@ static void MPIR_Bsend_dump( void ) { MPIR_Bsend_data_t *a = BsendBuffer.avail; - MPIU_DBG_MSG_D(BSEND,TYPICAL,"Total size is %d",BsendBuffer.buffer_size ); + MPIU_DBG_MSG_D(BSEND, TYPICAL, "Total size is %llu", + (unsigned long long) BsendBuffer.buffer_size); MPIU_DBG_MSG(BSEND,TYPICAL,"Avail list is:" ); while (a) { - MPIU_DBG_MSG_FMT(BSEND,TYPICAL,(MPIU_DBG_FDEST, - "[%p] totalsize = %d(%x)", a, a->total_size, - a->total_size )); + MPIU_DBG_MSG_FMT(BSEND, TYPICAL, (MPIU_DBG_FDEST, "[%p] totalsize = %llu(%llx)", + a, (unsigned long long) a->total_size, + (unsigned long long) a->total_size)); if (a == a->next) { MPIU_DBG_MSG(BSEND,TYPICAL, "@@@Corrupt list; avail block points at itself" ); @@ -627,9 +630,9 @@ static void MPIR_Bsend_dump( void ) MPIU_DBG_MSG(BSEND,TYPICAL,"Active list is:" ); a = BsendBuffer.active; while (a) { - MPIU_DBG_MSG_FMT(BSEND,TYPICAL,(MPIU_DBG_FDEST, - "[%p] totalsize = %d(%x)", a, a->total_size, - a->total_size )); + MPIU_DBG_MSG_FMT(BSEND, TYPICAL, (MPIU_DBG_FDEST, "[%p] totalsize = %llu(%llx)", + a, (unsigned long long) a->total_size, + (unsigned long long) a->total_size)); if (a == a->next) { MPIU_DBG_MSG(BSEND,TYPICAL, "@@@Corrupt list; active block points at itself" ); ----------------------------------------------------------------------- Summary of changes: src/mpi/pt2pt/bsendutil.c | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) hooks/post-receive -- MPICH primary repository

1 0