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

[mpich] MPICH primary repository branch, master, updated. v3.1rc3-17-g09b425c
by noreply＠mpich.org 17 Feb '14

17 Feb '14

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 09b425c7ffd1767db5e5f942fa4294ad5d5a1d17 (commit) from 0bbe725b2bdbf4dcc594a22f64c631b1211caf23 (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/09b425c7ffd1767db5e5f942fa4294ad5… commit 09b425c7ffd1767db5e5f942fa4294ad5d5a1d17 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Mon Feb 17 12:56:44 2014 -0600 update version and changes info for rc4 release We are doing an rc4 before the final 3.1, so update the version and changes info to reflect that. Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/CHANGES b/CHANGES index 11b1a60..ffb2ca8 100644 --- a/CHANGES +++ b/CHANGES @@ -41,7 +41,7 @@ A full list of changes is available at the following link: - http://git.mpich.org/mpich.git/shortlog/v3.0.4..v3.1 + http://git.mpich.org/mpich.git/shortlog/v3.0.4..v3.1rc4 A full list of bugs that have been fixed is available at the following link: diff --git a/maint/version.m4 b/maint/version.m4 index 4fd24c2..2c89d00 100644 --- a/maint/version.m4 +++ b/maint/version.m4 @@ -14,7 +14,7 @@ # changing this by playing with diversions, but then we would probably be # playing with autotools-fire. -m4_define([MPICH_VERSION_m4],[3.1])dnl +m4_define([MPICH_VERSION_m4],[3.1rc4])dnl m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl # For libtool ABI versioning rules see: ----------------------------------------------------------------------- Summary of changes: CHANGES | 2 +- maint/version.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc3-16-g0bbe725
by noreply＠mpich.org 14 Feb '14

14 Feb '14

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 0bbe725b2bdbf4dcc594a22f64c631b1211caf23 (commit) from 503da0c79099a3ef0cf022e5c615662e5376ca99 (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/0bbe725b2bdbf4dcc594a22f64c631b12… commit 0bbe725b2bdbf4dcc594a22f64c631b1211caf23 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Fri Feb 14 12:38:53 2014 -0600 Revert "Message Queue debug support" This reverts commit [e0a1cf61], which was breaking support for the Totalview debugger integration. Fixes #2030 diff --git a/src/mpi/debugger/dbginit.c b/src/mpi/debugger/dbginit.c index 6ae6a21..d8f7d1c 100644 --- a/src/mpi/debugger/dbginit.c +++ b/src/mpi/debugger/dbginit.c @@ -114,11 +114,8 @@ void *MPIR_Breakpoint(void); library that the debugger can load in order to access information about the parallel program, such as message queues */ #ifdef HAVE_DEBUGGER_SUPPORT -#undef MPICH_INFODLL_LOC #ifdef MPICH_INFODLL_LOC char MPIR_dll_name[] = MPICH_INFODLL_LOC; -#else -char MPIR_dll_name[] = "libtvmpich2.so"; #endif #endif diff --git a/src/mpi/debugger/dll_mpich.c b/src/mpi/debugger/dll_mpich.c index fa362ae..526399e 100644 --- a/src/mpi/debugger/dll_mpich.c +++ b/src/mpi/debugger/dll_mpich.c @@ -305,52 +305,55 @@ int mqs_image_has_queues (mqs_image *image, char **message) request definition */ { mqs_type *req_type = dbgr_find_type( image, (char *)"MPID_Request", mqs_lang_c ); - if (req_type) { - int mpid_offs; - mpid_offs = dbgr_field_offset( req_type, (char *)"mpid" ); + if (req_type) { + int dev_offs; + dev_offs = dbgr_field_offset( req_type, (char *)"dev" ); i_info->req_status_offs = dbgr_field_offset( req_type, (char *)"status" ); i_info->req_cc_offs = dbgr_field_offset( req_type, (char *)"cc" ); - - if (mpid_offs >= 0) { + if (dev_offs >= 0) { mqs_type *dreq_type = dbgr_find_type( image, (char *)"MPIDI_Request", mqs_lang_c ); - i_info->req_mpid_offs = mpid_offs; + i_info->req_dev_offs = dev_offs; if (dreq_type) { - int loff, envelope_offs; + int loff, match_offs; loff = dbgr_field_offset( dreq_type, (char *)"next" ); - i_info->req_next_offs = mpid_offs + loff; - loff = dbgr_field_offset( dreq_type, (char *)"userbuf" ); - i_info->req_userbuf_offs = mpid_offs + loff; - loff = dbgr_field_offset( dreq_type, (char *)"userbufcount" ); - i_info->req_userbufcount_offs = mpid_offs + loff; + i_info->req_next_offs = dev_offs + loff; + loff = dbgr_field_offset( dreq_type, (char *)"user_buf" ); + i_info->req_user_buf_offs = dev_offs + loff; + loff = dbgr_field_offset( dreq_type, (char *)"user_count" ); + i_info->req_user_count_offs = dev_offs + loff; loff = dbgr_field_offset( dreq_type, (char *)"datatype" ); - i_info->req_datatype_offs = mpid_offs + loff; - loff = dbgr_field_offset( dreq_type, (char *)"uebuflen" ); - i_info->req_uebuflen_offs = mpid_offs + loff; - loff = dbgr_field_offset( dreq_type, (char *)"uebuf" ); - i_info->req_uebuf_offs = mpid_offs + loff; - envelope_offs = dbgr_field_offset( dreq_type, (char *)"envelope" ); - envelope_offs += mpid_offs ; - - if (envelope_offs >= 0) { - mqs_type *envelope_type = dbgr_find_type( image, (char *)"MPIDI_MsgEnvelope", mqs_lang_c ); - if (envelope_type) { - int msginfo_offs= dbgr_field_offset( envelope_type, (char *)"msginfo" ); - msginfo_offs = envelope_offs + msginfo_offs; - - if (msginfo_offs >= 0) { - mqs_type *msginfo_type= dbgr_find_type( image, (char *)"MPIDI_MsgInfo", mqs_lang_c ); - if (msginfo_type) { + i_info->req_datatype_offs = dev_offs + loff; + match_offs = dbgr_field_offset( dreq_type, (char *)"match" ); + /* + Current definition from the mpidpre.h file for ch3. + + typedef struct MPIDI_Message_match_parts { + int32_t tag; + MPIR_Rank_t rank; + MPIR_Context_id_t context_id; + } MPIDI_Message_match_parts_t; + typedef union { + MPIDI_Message_match_parts_t parts; + MPIR_Upint whole; + } MPIDI_Message_match; + */ + if (match_offs >= 0) { + mqs_type *match_type = dbgr_find_type( image, (char *)"MPIDI_Message_match", mqs_lang_c ); + if (match_type) { + int parts_offs = dbgr_field_offset( match_type, (char *)"parts" ); + if (parts_offs >= 0) { + mqs_type *parts_type = dbgr_find_type( image, (char *)"MPIDI_Message_match_parts_t", mqs_lang_c ); + if (parts_type) { int moff; - moff = dbgr_field_offset( msginfo_type, (char *)"MPItag" ); - i_info->req_tag_offs = msginfo_offs + moff; - moff = dbgr_field_offset( msginfo_type, (char *)"MPIrank" ); - i_info->req_rank_offs = msginfo_offs + moff; - moff = dbgr_field_offset( msginfo_type, (char *)"MPIctxt" ); - i_info->req_context_id_offs = msginfo_offs + moff; + moff = dbgr_field_offset( parts_type, (char *)"tag" ); + i_info->req_tag_offs = dev_offs + match_offs + moff; + moff = dbgr_field_offset( parts_type, (char *)"rank" ); + i_info->req_rank_offs = dev_offs + match_offs + moff; + moff = dbgr_field_offset( parts_type, (char *)"context_id" ); + i_info->req_context_id_offs = dev_offs + match_offs + moff; } } - } } } @@ -637,7 +640,7 @@ static int fetch_receive (mqs_process *proc, mpich_process_info *p_info, #endif while (base != 0) { /* Check this entry to see if the context matches */ - int actual_context = fetch_int16( proc, base + i_info->req_context_id_offs, p_info ); + int16_t actual_context = fetch_int16( proc, base + i_info->req_context_id_offs, p_info ); #ifdef DEBUG_LIST_ITER initLogFile(); @@ -646,37 +649,27 @@ static int fetch_receive (mqs_process *proc, mpich_process_info *p_info, if (actual_context == wanted_context) { /* Found a request for this communicator */ int tag = fetch_int( proc, base + i_info->req_tag_offs, p_info ); - int rank = fetch_int( proc, base + i_info->req_rank_offs, p_info ); + int rank = fetch_int16( proc, base + i_info->req_rank_offs, p_info ); int is_complete = fetch_int ( proc, base + i_info->req_cc_offs, p_info); - mqs_taddr_t buffer = 0; - unsigned buf_count = -1; - - if(look_for_user_buffer) - { - buffer = fetch_pointer(proc, base + i_info->req_userbuf_offs, p_info); - buf_count = fetch_int(proc, base + i_info->req_userbufcount_offs, p_info); - }else{ - /* unexpected buffer*/ - buffer = fetch_pointer(proc, base + i_info->req_uebuf_offs, p_info); - buf_count = fetch_int(proc, base + i_info->req_uebuflen_offs, p_info); - } - - /* Return -1 for ANY_TAG or ANY_SOURCE */ + mqs_tword_t user_buffer = fetch_pointer( proc,base+i_info->req_user_buf_offs, p_info); + int user_count = fetch_int( proc,base + i_info->req_user_count_offs, p_info ); + + /* Return -1 for ANY_TAG or ANY_SOURCE */ res->desired_tag = (tag >= 0) ? tag : -1; res->desired_local_rank = (rank >= 0) ? rank : -1; res->desired_global_rank = -1; /* Convert to rank in comm world, if valid (in mpi-2, may not be available) */ - res->desired_length = buf_count; /* Count, not bytes */ + res->desired_length = user_count; /* Count, not bytes */ res->tag_wild = (tag < 0); - res->buffer = buffer; + res->buffer = user_buffer; /* We don't know the rest of these */ res->system_buffer = 0; res->actual_local_rank = rank; res->actual_global_rank = -1; res->actual_tag = tag; - res->actual_length = buf_count; + res->actual_length = -1; res->extra_text[0][0] = 0; res->status = (is_complete != 0) ? mqs_st_pending : mqs_st_complete; @@ -797,7 +790,7 @@ static int fetch_send (mqs_process *proc, mpich_process_info *p_info, #ifdef DEBUG_LIST_ITER if (base) { initLogFile(); - fprintf( debugfp, "comm ptr = %p, comm context = %d\n", + fprintf( debugf, "comm ptr = %p, comm context = %d\n", comm, comm->context_id ); } #endif @@ -820,13 +813,13 @@ static int fetch_send (mqs_process *proc, mpich_process_info *p_info, mqs_taddr_t data = 0; mqs_taddr_t sreq = fetch_pointer(proc, base+i_info->sendq_req_offs, p_info ); mqs_tword_t is_complete = fetch_int( proc, sreq+i_info->req_cc_offs, p_info ); - data = fetch_pointer( proc, sreq+i_info->req_userbuf_offs, p_info ); - length = fetch_int( proc, sreq+i_info->req_userbufcount_offs, p_info ); + data = fetch_pointer( proc, sreq+i_info->req_user_buf_offs, p_info ); + length = fetch_int( proc, sreq+i_info->req_user_count_offs, p_info ); /* mqs_tword_t complete=0; */ #ifdef DEBUG_LIST_ITER initLogFile(); - fprintf( debugfp, "sendq entry = %p, rank off = %d, tag off = %d, context = %d\n", + fprintf( debugpf, "sendq entry = %p, rank off = %d, tag off = %d, context = %d\n", base, i_info->sendq_rank_offs, i_info->sendq_tag_offs, actual_context ); #endif @@ -1103,14 +1096,14 @@ static mqs_tword_t fetch_int (mqs_process * proc, mqs_taddr_t addr, dbgr_target_to_host (proc, buffer, ((char *)&res) + (host_is_big_endian ? sizeof(mqs_tword_t)-isize : 0), isize); - + return res; } static mqs_tword_t fetch_int16 (mqs_process * proc, mqs_taddr_t addr, mpich_process_info *p_info) { char buffer[8]; /* ASSUME an integer fits in 8 bytes */ - mqs_tword_t res = 0; + int16_t res = 0; if (mqs_ok == dbgr_fetch_data (proc, addr, 2, buffer)) dbgr_target_to_host (proc, buffer, diff --git a/src/mpi/debugger/mpich_dll_defs.h b/src/mpi/debugger/mpich_dll_defs.h index 561dfba..c66c39a 100644 --- a/src/mpi/debugger/mpich_dll_defs.h +++ b/src/mpi/debugger/mpich_dll_defs.h @@ -32,16 +32,14 @@ typedef struct /* Fields in MPID_Request (including structures within the request) */ int req_status_offs; int req_cc_offs; - int req_mpid_offs; + int req_dev_offs; int req_next_offs; int req_tag_offs; int req_rank_offs; int req_context_id_offs; - int req_userbuf_offs; - int req_userbufcount_offs; + int req_user_buf_offs; + int req_user_count_offs; int req_datatype_offs; - int req_uebuf_offs; - int req_uebuflen_offs; /* Fields in MPIR_Sendq */ int sendq_next_offs; ----------------------------------------------------------------------- Summary of changes: src/mpi/debugger/dbginit.c | 3 - src/mpi/debugger/dll_mpich.c | 115 +++++++++++++++++------------------- src/mpi/debugger/mpich_dll_defs.h | 8 +-- 3 files changed, 57 insertions(+), 69 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc3-15-g503da0c
by noreply＠mpich.org 13 Feb '14

13 Feb '14

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 503da0c79099a3ef0cf022e5c615662e5376ca99 (commit) from c48f6b1b52b98a28ffe0d796a5b2f3cdcc46fb77 (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/503da0c79099a3ef0cf022e5c615662e5… commit 503da0c79099a3ef0cf022e5c615662e5376ca99 Author: Haizhu Liu <haizhu(a)us.ibm.com> Date: Sun Sep 29 23:09:55 2013 -0400 PAMId support of MPI 3.0 functions: MPI_Mprobe/MPI_Improbe/MPI_Mrecv/MPI_Imrecv (ibm) F192956 Signed-off-by: Su Huang <suhuang(a)us.ibm.com> diff --git a/src/mpid/pamid/src/mpid_improbe.c b/src/mpid/pamid/src/mpid_improbe.c index 0a3bd2b..ebac24c 100644 --- a/src/mpid/pamid/src/mpid_improbe.c +++ b/src/mpid/pamid/src/mpid_improbe.c @@ -6,102 +6,45 @@ #include "mpidimpl.h" -int (*MPIDI_Anysource_improbe_fn)(int tag, MPID_Comm * comm, int context_offset, - int *flag, MPID_Request **message, - MPI_Status * status) = NULL; - -#undef FUNCNAME -#define FUNCNAME MPID_Improbe -#undef FCNAME -#define FCNAME MPIU_QUOTE(FUNCNAME) int MPID_Improbe(int source, int tag, MPID_Comm *comm, int context_offset, int *flag, MPID_Request **message, MPI_Status *status) { int mpi_errno = MPI_SUCCESS; -#if 0 - int context_id = comm->recvcontext_id + context_offset; - - *message = NULL; + const int context = comm->recvcontext_id + context_offset; + int pami_source; + int foundp = FALSE; + MPID_Request * rreq = NULL; if (source == MPI_PROC_NULL) - { + { MPIR_Status_set_procnull(status); + /* We set the flag to true because an MPI_Recv with this rank will + * return immediately */ *flag = TRUE; - *message = NULL; /* should be interpreted as MPI_MESSAGE_NO_PROC */ - goto fn_exit; - } - -#ifdef ENABLE_COMM_OVERRIDES - if (MPIDI_Anysource_improbe_fn) { - if (source == MPI_ANY_SOURCE) { - /* if it's anysource, check shm, then check the network. - If still not found, call progress, and check again. */ - - /* check shm*/ - MPIU_THREAD_CS_ENTER(MSGQUEUE,); - *message = MPIDI_CH3U_Recvq_FDU_matchonly(source, tag, context_id, comm, flag); - MPIU_THREAD_CS_EXIT(MSGQUEUE,); - if (!*flag) { - /* not found, check network */ - mpi_errno = MPIDI_Anysource_improbe_fn(tag, comm, context_offset, flag, message, status); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); - if (!*flag) { - /* still not found, make some progress*/ - mpi_errno = MPIDI_CH3_Progress_poke(); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); - /* check shm again */ - MPIU_THREAD_CS_ENTER(MSGQUEUE,); - *message = MPIDI_CH3U_Recvq_FDU_matchonly(source, tag, context_id, comm, flag); - MPIU_THREAD_CS_EXIT(MSGQUEUE,); - if (!*flag) { - /* check network again */ - mpi_errno = MPIDI_Anysource_improbe_fn(tag, comm, context_offset, flag, message, status); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); - } - } - } - goto fn_exit; - } - else { - /* it's not anysource, check if the netmod has overridden it */ - MPIDI_VC_t * vc; - MPIDI_Comm_get_vc_set_active(comm, source, &vc); - if (vc->comm_ops && vc->comm_ops->probe) { - mpi_errno = vc->comm_ops->improbe(vc, source, tag, comm, context_offset, flag, message, status); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); - goto fn_exit; - } - /* fall-through to shm case */ - } + *message = NULL; + return MPI_SUCCESS; + } + + if(source != MPI_ANY_SOURCE) { + pami_source = MPID_VCR_GET_LPID(comm->vcr, source); + } else { + pami_source = MPI_ANY_SOURCE; } +#ifndef OUT_OF_ORDER_HANDLING + rreq = MPIDI_Recvq_FDU(source, tag, context, &foundp); +#else + rreq = MPIDI_Recvq_FDU(source, pami_source, tag, context, &foundp); #endif - - MPIU_THREAD_CS_ENTER(MSGQUEUE,); - *message = MPIDI_CH3U_Recvq_FDU_matchonly(source, tag, context_id, comm, flag); - MPIU_THREAD_CS_EXIT(MSGQUEUE,); - - if (!*flag) { - /* Always try to advance progress before returning failure - from the improbe test. */ - /* FIXME: It would be helpful to know if the Progress_poke - operation causes any change in state; we could then avoid - a second test of the receive queue if we knew that nothing - had changed */ - mpi_errno = MPID_Progress_poke(); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); - MPIU_THREAD_CS_ENTER(MSGQUEUE,); - *message = MPIDI_CH3U_Recvq_FDU_matchonly(source, tag, context_id, comm, flag); - MPIU_THREAD_CS_EXIT(MSGQUEUE,); + if (rreq==NULL) { + MPID_Progress_poke(); } - - if (*flag && *message) { - (*message)->kind = MPID_REQUEST_MPROBE; - MPIR_Request_extract_status((*message), status); + else { + rreq->kind = MPID_REQUEST_MPROBE; + MPIR_Request_extract_status(rreq, status); } -#endif -fn_exit: - return mpi_errno; -fn_fail: - goto fn_exit; + + *message = rreq; + *flag = foundp; + return MPI_SUCCESS; } diff --git a/src/mpid/pamid/src/mpid_imrecv.c b/src/mpid/pamid/src/mpid_imrecv.c index 2dd4439..e2e35fe 100644 --- a/src/mpid/pamid/src/mpid_imrecv.c +++ b/src/mpid/pamid/src/mpid_imrecv.c @@ -6,127 +6,87 @@ #include "mpidimpl.h" -#undef FUNCNAME -#define FUNCNAME MPID_Imrecv -#undef FCNAME -#define FCNAME MPIU_QUOTE(FUNCNAME) int MPID_Imrecv(void *buf, int count, MPI_Datatype datatype, MPID_Request *message, MPID_Request **rreqp) { - int mpi_errno = MPI_SUCCESS; -#if 0 - MPID_Request *rreq; - MPID_Comm *comm; - MPIDI_VC_t *vc = NULL; - - /* message==NULL is equivalent to MPI_MESSAGE_NO_PROC being passed at the - * upper level */ - if (message == NULL) + int mpi_errno = MPI_SUCCESS; + + MPID_Request * rreq; + int found; + + /* ---------------------------------------- */ + /* NULL rank means empty request */ + /* ---------------------------------------- */ + if (unlikely(message == NULL)) { - MPIDI_Request_create_null_rreq(rreq, mpi_errno, fn_fail); - *rreqp = rreq; - goto fn_exit; + rreq = MPIDI_Request_create2(); + MPIR_Status_set_procnull(&rreq->status); + rreq->kind = MPID_REQUEST_RECV; + MPIDI_Request_complete(rreq); + *rreqp = rreq; + return MPI_SUCCESS; + } - MPIU_Assert(message != NULL); - MPIU_Assert(message->kind == MPID_REQUEST_MPROBE); + MPIU_Assert(message != NULL); + MPIU_Assert(message->kind == MPID_REQUEST_MPROBE); - /* promote the request object to be a "real" recv request */ - message->kind = MPID_REQUEST_RECV; + /* promote the request object to be a "real" recv request */ + message->kind = MPID_REQUEST_RECV; - *rreqp = rreq = message; + *rreqp = rreq = message; - comm = rreq->comm; +#ifdef OUT_OF_ORDER_HANDLING + if ((MPIDI_In_cntr[rreq->mpid.peer_pami].n_OutOfOrderMsgs>0)) + MPIDI_Recvq_process_out_of_order_msgs(rreq->mpid.peer_pami, MPIDI_Context[0]); +#endif - /* the following code was adapted from FDU_or_AEP and MPID_Irecv */ - /* comm was already added at FDU (mprobe) time */ - rreq->dev.user_buf = buf; - rreq->dev.user_count = count; - rreq->dev.datatype = datatype; +#if (MPIDI_STATISTICS) + MPID_NSTAT(mpid_statp->recvs); +#endif - if (MPIDI_Request_get_msg_type(rreq) == MPIDI_REQUEST_EAGER_MSG) - { - int recv_pending; - - /* This is an eager message */ - MPIU_DBG_MSG(CH3_OTHER,VERBOSE,"eager message in the request"); - - /* If this is an eager synchronous message, then we need to send an - acknowledgement back to the sender. */ - if (MPIDI_Request_get_sync_send_flag(rreq)) - { - MPIDI_Comm_get_vc_set_active(comm, rreq->dev.match.parts.rank, &vc); - mpi_errno = MPIDI_CH3_EagerSyncAck(vc, rreq); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); - } - - /* the request was found in the unexpected queue, so it has a - recv_pending_count of at least 1 */ - MPIDI_Request_decr_pending(rreq); - MPIDI_Request_check_pending(rreq, &recv_pending); - - if (MPID_Request_is_complete(rreq)) { - /* is it ever possible to have (cc==0 && recv_pending>0) ? */ - MPIU_Assert(!recv_pending); - - /* All of the data has arrived, we need to copy the data and - then free the buffer. */ - if (rreq->dev.recv_data_sz > 0) - { - MPIDI_CH3U_Request_unpack_uebuf(rreq); - MPIU_Free(rreq->dev.tmpbuf); - } - - mpi_errno = rreq->status.MPI_ERROR; - goto fn_exit; - } - else - { - /* there should never be outstanding completion events for an unexpected - * recv without also having a "pending recv" */ - MPIU_Assert(recv_pending); - /* The data is still being transfered across the net. We'll - leave it to the progress engine to handle once the - entire message has arrived. */ - if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) - { - MPID_Datatype_get_ptr(datatype, rreq->dev.datatype_ptr); - MPID_Datatype_add_ref(rreq->dev.datatype_ptr); - } - - } - } - else if (MPIDI_Request_get_msg_type(rreq) == MPIDI_REQUEST_RNDV_MSG) - { - MPIDI_Comm_get_vc_set_active(comm, rreq->dev.match.parts.rank, &vc); - - mpi_errno = vc->rndvRecv_fn(vc, rreq); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); - if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) - { - MPID_Datatype_get_ptr(datatype, rreq->dev.datatype_ptr); - MPID_Datatype_add_ref(rreq->dev.datatype_ptr); - } - } - else if (MPIDI_Request_get_msg_type(rreq) == MPIDI_REQUEST_SELF_MSG) - { - mpi_errno = MPIDI_CH3_RecvFromSelf(rreq, buf, count, datatype); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); - } - else +#ifdef MPIDI_TRACE +{ + size_t ll; + ll = count * MPID_Datatype_get_basic_size(datatype); + /*MPIDI_SET_PR_REC(rreq,buf,count,ll,datatype,pami_source,rank,tag,comm,is_blocking); */ +} +#endif + + /* ----------------------------------------------------------------- */ + /* populate request with our data */ + /* We can do this because this is not a multithreaded implementation */ + /* ----------------------------------------------------------------- */ + + rreq->mpid.userbuf = buf; + rreq->mpid.userbufcount = count; + rreq->mpid.datatype = datatype; + MPIDI_RecvMsg_Unexp(rreq, buf, count, datatype); + mpi_errno = rreq->status.MPI_ERROR; + if (TOKEN_FLOW_CONTROL_ON) { + #if TOKEN_FLOW_CONTROL + if ((rreq->mpid.uebuflen) && (!(rreq->mpid.envelope.msginfo.isRzv))) { + MPIDI_Token_cntr[(rreq->mpid.peer_pami)].unmatched--; + MPIDI_Update_rettoks(rreq->mpid.peer_pami); + } + MPIDI_Must_return_tokens(MPIDI_Context[0],(rreq->mpid.peer_pami)); + #else + MPID_assert_always(0); + #endif + } + +#ifdef OUT_OF_ORDER_HANDLING + if ((MPIDI_In_cntr[rreq->mpid.peer_pami].n_OutOfOrderMsgs>0)) + MPIDI_Recvq_process_out_of_order_msgs(rreq->mpid.peer_pami, MPIDI_Context[0]); +#endif + +#ifdef MPIDI_STATISTICS + if (!(MPID_cc_is_complete(&rreq->cc))) { - /* --BEGIN ERROR HANDLING-- */ - int msg_type = MPIDI_Request_get_msg_type(rreq); - MPID_Request_release(rreq); - rreq = NULL; - MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_INTERN, "**ch3|badmsgtype", - "**ch3|badmsgtype %d", msg_type); - /* --END ERROR HANDLING-- */ + MPID_NSTAT(mpid_statp->recvWaitsComplete); } #endif -fn_exit: - return mpi_errno; -fn_fail: - goto fn_exit; + + return mpi_errno; } diff --git a/src/mpid/pamid/src/mpid_mprobe.c b/src/mpid/pamid/src/mpid_mprobe.c index 436c1a5..ec1a6fc 100644 --- a/src/mpid/pamid/src/mpid_mprobe.c +++ b/src/mpid/pamid/src/mpid_mprobe.c @@ -6,62 +6,37 @@ #include "mpidimpl.h" -#undef FUNCNAME -#define FUNCNAME MPID_Mprobe -#undef FCNAME -#define FCNAME MPIU_QUOTE(FUNCNAME) int MPID_Mprobe(int source, int tag, MPID_Comm *comm, int context_offset, MPID_Request **message, MPI_Status *status) { int mpi_errno = MPI_SUCCESS; -#if 0 - MPID_Progress_state progress_state; - int found = FALSE; - int context_id = comm->recvcontext_id + context_offset; - - *message = NULL; + const int context = comm->recvcontext_id + context_offset; + int pami_source; + int foundp; + MPID_Request * rreq = NULL; if (source == MPI_PROC_NULL) - { - MPIR_Status_set_procnull(status); - found = TRUE; - *message = NULL; /* should be interpreted as MPI_MESSAGE_NO_PROC */ - goto fn_exit; - } - - /* Inefficient implementation: we poll the unexpected queue looking for a - * matching request, interleaved with calls to progress. If there are many - * non-matching unexpected messages in the queue then we will end up - * needlessly scanning the UQ. - * - * A smarter implementation would enqueue a partial request (one lacking the - * recv buffer triple) onto the PQ. Unfortunately, this is a lot harder to - * do than it seems at first because of the spread-out nature of callers to - * various CH3U_Recvq routines and especially because of the enqueue/dequeue - * hooks for native MX tag matching support. */ - MPIDI_CH3_Progress_start(&progress_state); - do - { - MPIU_THREAD_CS_ENTER(MSGQUEUE,); - *message = MPIDI_CH3U_Recvq_FDU_matchonly(source, tag, context_id, comm, &found); - MPIU_THREAD_CS_EXIT(MSGQUEUE,); - if (found) - break; - - mpi_errno = MPIDI_CH3_Progress_wait(&progress_state); + { + MPIR_Status_set_procnull(status); + return MPI_SUCCESS; + } + + if(source != MPI_ANY_SOURCE) { + pami_source = MPID_VCR_GET_LPID(comm->vcr, source); + } else { + pami_source = MPI_ANY_SOURCE; } - while(mpi_errno == MPI_SUCCESS); - MPIDI_CH3_Progress_end(&progress_state); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); +#ifndef OUT_OF_ORDER_HANDLING + MPID_PROGRESS_WAIT_WHILE((rreq=MPIDI_Recvq_FDU(source, tag, context, &foundp) ) == NULL ); +#else + MPID_PROGRESS_WAIT_WHILE((rreq=MPIDI_Recvq_FDU(source, pami_source, tag, context, &foundp) ) == NULL ); +#endif - if (*message) { - (*message)->kind = MPID_REQUEST_MPROBE; - MPIR_Request_extract_status((*message), status); + if (rreq) { + rreq->kind = MPID_REQUEST_MPROBE; + MPIR_Request_extract_status(rreq, status); } -#endif -fn_exit: - return mpi_errno; -fn_fail: - goto fn_exit; + *message = rreq; + return MPI_SUCCESS; } diff --git a/src/mpid/pamid/src/mpid_mrecv.c b/src/mpid/pamid/src/mpid_mrecv.c index ff5fba8..fdd2b70 100644 --- a/src/mpid/pamid/src/mpid_mrecv.c +++ b/src/mpid/pamid/src/mpid_mrecv.c @@ -6,10 +6,6 @@ #include "mpidimpl.h" -#undef FUNCNAME -#define FUNCNAME MPID_Imrecv -#undef FCNAME -#define FCNAME MPIU_QUOTE(FUNCNAME) int MPID_Mrecv(void *buf, int count, MPI_Datatype datatype, MPID_Request *message, MPI_Status *status) { @@ -21,7 +17,7 @@ int MPID_Mrecv(void *buf, int count, MPI_Datatype datatype, if (message == NULL) { /* treat as though MPI_MESSAGE_NO_PROC was passed */ MPIR_Status_set_procnull(status); - goto fn_exit; + return mpi_errno; } /* There is no optimized MPID_Mrecv at this time because there is no real @@ -29,30 +25,10 @@ int MPID_Mrecv(void *buf, int count, MPI_Datatype datatype, * creating a request unnecessarily for messages that are already present * and eligible for immediate completion. */ mpi_errno = MPID_Imrecv(buf, count, datatype, message, &rreq); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); - if (!MPID_Request_is_complete(rreq)) { - MPID_Progress_state progress_state; + MPID_PROGRESS_WAIT_WHILE(!MPID_Request_is_complete(rreq)); - MPID_Progress_start(&progress_state); - while (!MPID_Request_is_complete(rreq)) - { - mpi_errno = MPID_Progress_wait(&progress_state); - if (mpi_errno) { - /* --BEGIN ERROR HANDLING-- */ - MPID_Progress_end(&progress_state); - MPIU_ERR_POP(mpi_errno); - /* --END ERROR HANDLING-- */ - } - } - MPID_Progress_end(&progress_state); - } mpi_errno = MPIR_Request_complete(&req_handle, rreq, status, &active_flag); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); - -fn_exit: return mpi_errno; -fn_fail: - goto fn_exit; } ----------------------------------------------------------------------- Summary of changes: src/mpid/pamid/src/mpid_improbe.c | 113 ++++++------------------ src/mpid/pamid/src/mpid_imrecv.c | 176 ++++++++++++++----------------------- src/mpid/pamid/src/mpid_mprobe.c | 71 +++++---------- src/mpid/pamid/src/mpid_mrecv.c | 28 +------ 4 files changed, 121 insertions(+), 267 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc3-14-gc48f6b1
by noreply＠mpich.org 10 Feb '14

10 Feb '14

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 c48f6b1b52b98a28ffe0d796a5b2f3cdcc46fb77 (commit) from 16005083a56c442d3a0c167d65544b73f60bc044 (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/c48f6b1b52b98a28ffe0d796a5b2f3cdc… commit c48f6b1b52b98a28ffe0d796a5b2f3cdcc46fb77 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sun Feb 9 19:31:22 2014 -0600 Protect assumption of MPI-I/O availability. Only set error handler on the file when MPI-I/O is enabled. Fixes #2019. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/test/mpi/cxx/util/mtest.cxx b/test/mpi/cxx/util/mtest.cxx index a4689b4..b3db910 100644 --- a/test/mpi/cxx/util/mtest.cxx +++ b/test/mpi/cxx/util/mtest.cxx @@ -76,7 +76,9 @@ void MTest_Init( void ) provided = MPI::Init_thread( threadLevel ); } +#if defined(HAVE_MPI_IO) MPI::FILE_NULL.Set_errhandler(MPI::ERRORS_THROW_EXCEPTIONS); +#endif /* Check for debugging control */ if (getenv( "MPITEST_DEBUG" )) { ----------------------------------------------------------------------- Summary of changes: test/mpi/cxx/util/mtest.cxx | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc3-13-g1600508
by noreply＠mpich.org 10 Feb '14

10 Feb '14

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 16005083a56c442d3a0c167d65544b73f60bc044 (commit) from 8335d6c0ae1e3a5efc3d33b181e4fa2a17a6660d (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/16005083a56c442d3a0c167d65544b73f… commit 16005083a56c442d3a0c167d65544b73f60bc044 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sun Feb 9 19:40:45 2014 -0600 Remove overly conservative assertion. MPI_COMM_IDUP currently just asserts out when we use it in multithreaded mode. This is overly conservative. MPI_COMM_IDUP works fine in such modes unless it is executed concurrently with another routine that also tries to allocate or free a context ID. Removing this assertion till we find a more appropriate way of tracking this error. Fixes #2020. Signed-off-by: Huiwei Lu <huiweilu(a)mcs.anl.gov> diff --git a/src/mpi/comm/commutil.c b/src/mpi/comm/commutil.c index dd2198d..1651fce 100644 --- a/src/mpi/comm/commutil.c +++ b/src/mpi/comm/commutil.c @@ -1272,8 +1272,6 @@ static int gcn_sch(MPID_Comm *comm_ptr, MPIR_Context_id_t *ctx0, MPIR_Context_id MPIU_Assert(comm_ptr->comm_kind == MPID_INTRACOMM); - MPIU_ERR_CHKANDJUMP(MPIU_ISTHREADED, mpi_errno, MPI_ERR_INTERN, "**notsuppmultithread"); - /* first do as much local setup as we can */ if (initialize_context_mask) { MPIR_Init_contextid(); ----------------------------------------------------------------------- Summary of changes: src/mpi/comm/commutil.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc3-12-g8335d6c
by noreply＠mpich.org 10 Feb '14

10 Feb '14

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 8335d6c0ae1e3a5efc3d33b181e4fa2a17a6660d (commit) via 21887d384b937f4674a0d289c7957011a04dc57a (commit) from 784c271295a44783488fc773ca7e1a0b80386067 (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/8335d6c0ae1e3a5efc3d33b181e4fa2a1… commit 8335d6c0ae1e3a5efc3d33b181e4fa2a17a6660d Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Mon Feb 10 10:56:04 2014 -0600 Use MPL_large_readv in ch3:nemesis:tcp and ch3:sock. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c index fae2d21..b34af09 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c @@ -606,7 +606,7 @@ static int recv_id_or_tmpvc_info(sockconn_t *const sc, int *got_sc_eof) iov[1].iov_len = pg_id_len; ++iov_cnt; } - CHECK_EINTR (nread, readv(sc->fd, iov, iov_cnt)); + nread = MPL_large_readv(sc->fd, iov, iov_cnt); MPIU_ERR_CHKANDJUMP1(nread == -1 && errno != EAGAIN, mpi_errno, MPI_ERR_OTHER, "**read", "**read %s", MPIU_Strerror(errno)); MPIU_ERR_CHKANDJUMP(nread != hdr.datalen, mpi_errno, MPI_ERR_OTHER, "**read"); /* FIXME-Z1 */ if (pg_id_len == 0) { @@ -666,7 +666,7 @@ static int recv_id_or_tmpvc_info(sockconn_t *const sc, int *got_sc_eof) iov[0].iov_base = (void *) &(sc->vc->port_name_tag); iov[0].iov_len = sizeof(sc->vc->port_name_tag); - CHECK_EINTR (nread, readv(sc->fd, iov, iov_cnt)); + nread = MPL_large_readv(sc->fd, iov, iov_cnt); MPIU_ERR_CHKANDJUMP1(nread == -1 && errno != EAGAIN, mpi_errno, MPI_ERR_OTHER, "**read", "**read %s", MPIU_Strerror(errno)); MPIU_ERR_CHKANDJUMP(nread != hdr.datalen, mpi_errno, MPI_ERR_OTHER, "**read"); /* FIXME-Z1 */ sc->is_same_pg = FALSE; @@ -1582,7 +1582,7 @@ static int MPID_nem_tcp_recv_handler(sockconn_t *const sc) MPIU_Assert(rreq->dev.iov_offset >= 0); MPIU_Assert(rreq->dev.iov_count + rreq->dev.iov_offset <= MPID_IOV_LIMIT); - CHECK_EINTR(bytes_recvd, readv(sc_fd, iov, rreq->dev.iov_count)); + bytes_recvd = MPL_large_readv(sc_fd, iov, rreq->dev.iov_count); if (bytes_recvd <= 0) { if (bytes_recvd == -1 && errno == EAGAIN) /* handle this fast */ diff --git a/src/mpid/common/sock/poll/sock_immed.i b/src/mpid/common/sock/poll/sock_immed.i index 323758d..4f87d1b 100644 --- a/src/mpid/common/sock/poll/sock_immed.i +++ b/src/mpid/common/sock/poll/sock_immed.i @@ -408,7 +408,7 @@ int MPIDU_Sock_readv(MPIDU_Sock_t sock, MPID_IOV * iov, int iov_n, do { MPIDI_FUNC_ENTER(MPID_STATE_READV); - nb = readv(pollinfo->fd, iov, iov_n); + nb = MPL_large_readv(pollinfo->fd, iov, iov_n); MPIDI_FUNC_EXIT(MPID_STATE_READV); } while (nb == -1 && errno == EINTR); diff --git a/src/mpid/common/sock/poll/sock_wait.i b/src/mpid/common/sock/poll/sock_wait.i index 8c1e48e..21a852a 100644 --- a/src/mpid/common/sock/poll/sock_wait.i +++ b/src/mpid/common/sock/poll/sock_wait.i @@ -583,7 +583,7 @@ static int MPIDU_Socki_handle_read(struct pollfd * const pollfd, struct pollinfo if (pollinfo->read_iov_flag) { MPIDI_FUNC_ENTER(MPID_STATE_READV); - nb = readv(pollinfo->fd, pollinfo->read.iov.ptr + pollinfo->read.iov.offset, + nb = MPL_large_readv(pollinfo->fd, pollinfo->read.iov.ptr + pollinfo->read.iov.offset, pollinfo->read.iov.count - pollinfo->read.iov.offset); MPIDI_FUNC_EXIT(MPID_STATE_READV); } http://git.mpich.org/mpich.git/commitdiff/21887d384b937f4674a0d289c7957011a… commit 21887d384b937f4674a0d289c7957011a04dc57a Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Mon Feb 10 10:55:08 2014 -0600 Added an MPL large readv call. We add an MPL large writev call, but missed the readv call. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpl/include/mplsock.h b/src/mpl/include/mplsock.h index 4aae366..4759fca 100644 --- a/src/mpl/include/mplsock.h +++ b/src/mpl/include/mplsock.h @@ -35,6 +35,7 @@ extern "C" { /* *INDENT-OFF* */ int MPL_large_writev(int fd, const struct iovec *iov, int iovcnt); +int MPL_large_readv(int fd, const struct iovec *iov, int iovcnt); /* *INDENT-ON* */ #if defined(__cplusplus) diff --git a/src/mpl/src/mplsock.c b/src/mpl/src/mplsock.c index 93504b8..087ebd5 100644 --- a/src/mpl/src/mplsock.c +++ b/src/mpl/src/mplsock.c @@ -66,4 +66,56 @@ int MPL_large_writev(int fd, const struct iovec *iov, int iovcnt) return total_size; } + + +int MPL_large_readv(int fd, const struct iovec *iov, int iovcnt) +{ + ssize_t total_size, tmp; + struct iovec dummy; + int i; + + /* If the total data fits into INT_MAX, directly use readv */ + total_size = 0; + for (i = 0; i < iovcnt; i++) + total_size += iov[i].iov_len; + + if (total_size <= INT_MAX) { + do { + tmp = readv(fd, iov, iovcnt); + } while (tmp == -1 && errno == EINTR); + return tmp; + } + + /* Total data is larger than INT_MAX. Issue readv with fewer + * elements, so as to not exceed INT_MAX. In this case, doing + * multiple read calls, one for each iov segment is not a big + * deal with respect to performance. */ + + total_size = 0; + for (i = 0; i < iovcnt; i++) { + if (iov[i].iov_len <= INT_MAX) { + do { + tmp = readv(fd, &iov[i], 1); + } while (tmp == -1 && errno == EINTR); + } + else { + dummy.iov_base = iov[i].iov_base; + dummy.iov_len = INT_MAX; + do { + tmp = readv(fd, &dummy, 1); + } while (tmp == -1 && errno == EINTR); + } + + if (tmp < 0) + return tmp; + else if (tmp < iov[i].iov_len) { + total_size += tmp; + return total_size; + } + else + total_size += tmp; + } + + return total_size; +} #endif /* MPL_HAVE_SYS_UIO_H */ ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c | 6 +- src/mpid/common/sock/poll/sock_immed.i | 2 +- src/mpid/common/sock/poll/sock_wait.i | 2 +- src/mpl/include/mplsock.h | 1 + src/mpl/src/mplsock.c | 52 +++++++++++++++++++++ 5 files changed, 58 insertions(+), 5 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc3-10-g784c271
by noreply＠mpich.org 09 Feb '14

09 Feb '14

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 784c271295a44783488fc773ca7e1a0b80386067 (commit) from 55ec3281bd929e4ae2b924944d23ee4d5f824886 (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/784c271295a44783488fc773ca7e1a0b8… commit 784c271295a44783488fc773ca7e1a0b80386067 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Thu Feb 6 22:07:00 2014 -0600 Improve localhost detection. When compiled with strict we completely disable local host detection. In the case where no host is specified, we use the local host name that we get using gethostname. However, when we try to detect if that is the local host, we do not even attempt to do a simple gethostname check. Thanks to Orion Poplawski <orion(a)cora.nwra.com> for reporting the problem and a detailed analysis of the issue. Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/pm/hydra/utils/sock/sock.c b/src/pm/hydra/utils/sock/sock.c index 56cd7c7..1a282cb 100644 --- a/src/pm/hydra/utils/sock/sock.c +++ b/src/pm/hydra/utils/sock/sock.c @@ -608,9 +608,23 @@ HYD_status HYDU_sock_is_local(char *host, int *is_local) #else HYD_status HYDU_sock_is_local(char *host, int *is_local) { + char lhost[MAX_HOSTNAME_LEN]; + HYD_status status = HYD_SUCCESS; + *is_local = 0; - return HYD_SUCCESS; + if (gethostname(lhost, MAX_HOSTNAME_LEN) < 0) { + HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR, "gethostname returned an error\n"); + } + else if (!strcmp(lhost, host)) { + *is_local = 1; + } + + fn_exit: + return status; + + fn_fail: + goto fn_exit; } #endif /* HAVE_GETIFADDRS && HAVE_INET_NTOP */ ----------------------------------------------------------------------- Summary of changes: src/pm/hydra/utils/sock/sock.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc3-9-g55ec328
by noreply＠mpich.org 09 Feb '14

09 Feb '14

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 55ec3281bd929e4ae2b924944d23ee4d5f824886 (commit) from 5d595a22d3f00cae36158161c07bbe46e6ce3a61 (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/55ec3281bd929e4ae2b924944d23ee4d5… commit 55ec3281bd929e4ae2b924944d23ee4d5f824886 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Fri Feb 7 09:51:43 2014 -0600 reduce memory usage for large_type_sendrec test Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/test/mpi/datatype/large_type_sendrec.c b/test/mpi/datatype/large_type_sendrec.c index 60cfbdf..f6500fb 100644 --- a/test/mpi/datatype/large_type_sendrec.c +++ b/test/mpi/datatype/large_type_sendrec.c @@ -119,24 +119,24 @@ int main(int argc, char * argv[]) MPI_ASSERT(MPIX_Type_contiguous_x( (MPI_Count)count, MPI_CHAR, &bigtype)); MPI_ASSERT(MPI_Type_commit(&bigtype)); - char * rbuf = NULL; - char * sbuf = NULL; - - rbuf = malloc( count * sizeof(char)); assert(rbuf!=NULL); - sbuf = malloc( count * sizeof(char)); assert(sbuf!=NULL); - - for (i=0; i<count; i++) - rbuf[i] = 'a'; - for (i=0; i<count; i++) - sbuf[i] = 'z'; - MPI_Request requests[2]; MPI_Status statuses[2]; + char * rbuf = NULL; + char * sbuf = NULL; + if (rank==(size-1)) { + rbuf = malloc( count * sizeof(char)); assert(rbuf!=NULL); + for (i=0; i<count; i++) + rbuf[i] = 'a'; + MPI_ASSERT(MPI_Irecv(rbuf, 1, bigtype, 0, 0, MPI_COMM_WORLD, &(requests[1]) )); } if (rank==0) { + sbuf = malloc( count * sizeof(char)); assert(sbuf!=NULL); + for (i=0; i<count; i++) + sbuf[i] = 'z'; + MPI_ASSERT(MPI_Isend(sbuf, 1, bigtype, size-1, 0, MPI_COMM_WORLD, &(requests[0]) )); } ----------------------------------------------------------------------- Summary of changes: test/mpi/datatype/large_type_sendrec.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc3-8-g5d595a2
by noreply＠mpich.org 09 Feb '14

09 Feb '14

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 5d595a22d3f00cae36158161c07bbe46e6ce3a61 (commit) via f51499529a6040c79ab759cf640893aca572b34b (commit) via d593f14654c76840d6acbea058200260426359f5 (commit) via f2c75e957247ee262ade2f0d9c11515aca9aefc1 (commit) from 8df06af4810d8266839b36d3d5e43ee25ab9aeeb (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/5d595a22d3f00cae36158161c07bbe46e… commit 5d595a22d3f00cae36158161c07bbe46e6ce3a61 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sat Feb 8 22:10:44 2014 -0600 Fix bad casting that creates errors for large messages. The bad casting to int was losing information when the message size is larger than 2GB. Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/sock/src/ch3_isendv.c b/src/mpid/ch3/channels/sock/src/ch3_isendv.c index b407da6..8d0fcf4 100644 --- a/src/mpid/ch3/channels/sock/src/ch3_isendv.c +++ b/src/mpid/ch3/channels/sock/src/ch3_isendv.c @@ -91,7 +91,7 @@ int MPIDI_CH3_iSendv(MPIDI_VC_t * vc, MPID_Request * sreq, while (offset < n_iov) { - if ((int)iov[offset].MPID_IOV_LEN <= nb) + if (iov[offset].MPID_IOV_LEN <= nb) { nb -= iov[offset].MPID_IOV_LEN; offset++; http://git.mpich.org/mpich.git/commitdiff/f51499529a6040c79ab759cf640893aca… commit f51499529a6040c79ab759cf640893aca572b34b Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sat Feb 8 19:13:51 2014 -0600 Use MPL_large_writev instead of plain writev in ch3:sock. Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/mpid/common/sock/poll/sock_immed.i b/src/mpid/common/sock/poll/sock_immed.i index 5da081b..323758d 100644 --- a/src/mpid/common/sock/poll/sock_immed.i +++ b/src/mpid/common/sock/poll/sock_immed.i @@ -607,7 +607,7 @@ int MPIDU_Sock_writev(MPIDU_Sock_t sock, MPID_IOV * iov, int iov_n, MPIU_Size_t do { MPIDI_FUNC_ENTER(MPID_STATE_WRITEV); - nb = writev(pollinfo->fd, iov, iov_n); + nb = MPL_large_writev(pollinfo->fd, iov, iov_n); MPIDI_FUNC_EXIT(MPID_STATE_WRITEV); } while (nb == -1 && errno == EINTR); diff --git a/src/mpid/common/sock/poll/sock_wait.i b/src/mpid/common/sock/poll/sock_wait.i index 7a7e85d..8c1e48e 100644 --- a/src/mpid/common/sock/poll/sock_wait.i +++ b/src/mpid/common/sock/poll/sock_wait.i @@ -702,7 +702,7 @@ static int MPIDU_Socki_handle_write(struct pollfd * const pollfd, struct pollinf if (pollinfo->write_iov_flag) { MPIDI_FUNC_ENTER(MPID_STATE_WRITEV); - nb = writev(pollinfo->fd, pollinfo->write.iov.ptr + pollinfo->write.iov.offset, + nb = MPL_large_writev(pollinfo->fd, pollinfo->write.iov.ptr + pollinfo->write.iov.offset, pollinfo->write.iov.count - pollinfo->write.iov.offset); MPIDI_FUNC_EXIT(MPID_STATE_WRITEV); } http://git.mpich.org/mpich.git/commitdiff/d593f14654c76840d6acbea0582002604… commit d593f14654c76840d6acbea058200260426359f5 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sat Feb 8 17:55:32 2014 -0600 Use MPL_large_writev instead of plain writev in ch3:nemesis:tcp. This works around problems with writev on some platforms (such as Mac OSX, 10.9.1) where writev hangs for large messages. Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c index 8baada1..fae2d21 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c @@ -493,7 +493,7 @@ static int send_id_info(const sockconn_t *const sc) ++iov_cnt; } - CHECK_EINTR (offset, writev(sc->fd, iov, iov_cnt)); + offset = MPL_large_writev(sc->fd, iov, iov_cnt); MPIU_ERR_CHKANDJUMP1(offset == -1 && errno != EAGAIN, mpi_errno, MPI_ERR_OTHER, "**write", "**write %s", MPIU_Strerror(errno)); MPIU_ERR_CHKANDJUMP1(offset != buf_size, mpi_errno, MPI_ERR_OTHER, "**write", "**write %s", MPIU_Strerror(errno)); /* FIXME log appropriate error */ @@ -543,7 +543,7 @@ static int send_tmpvc_info(const sockconn_t *const sc) iov[1].iov_len = sizeof(port_info); buf_size = sizeof(hdr) + sizeof(port_info); - CHECK_EINTR (offset, writev(sc->fd, iov, iov_cnt)); + offset = MPL_large_writev(sc->fd, iov, iov_cnt); MPIU_ERR_CHKANDJUMP1(offset == -1 && errno != EAGAIN, mpi_errno, MPI_ERR_OTHER, "**write", "**write %s", MPIU_Strerror(errno)); MPIU_ERR_CHKANDJUMP1(offset != buf_size, mpi_errno, MPI_ERR_OTHER, "**write", "**write %s", MPIU_Strerror(errno)); /* FIXME log appropriate error */ diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c index 7abb119..8031092 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c @@ -92,7 +92,7 @@ int MPID_nem_tcp_send_queued(MPIDI_VC_t *vc, MPIDI_nem_tcp_request_queue_t *send iov = &sreq->dev.iov[sreq->dev.iov_offset]; - CHECK_EINTR(offset, writev(vc_tcp->sc->fd, iov, sreq->dev.iov_count)); + offset = MPL_large_writev(vc_tcp->sc->fd, iov, sreq->dev.iov_count); if (offset == 0) { int req_errno = MPI_SUCCESS; @@ -257,7 +257,7 @@ int MPID_nem_tcp_iStartContigMsg(MPIDI_VC_t *vc, void *hdr, MPIDI_msg_sz_t hdr_s iov[1].MPID_IOV_BUF = data; iov[1].MPID_IOV_LEN = data_sz; - CHECK_EINTR(offset, writev(sc->fd, iov, 2)); + offset = MPL_large_writev(sc->fd, iov, 2); if (offset == 0) { int req_errno = MPI_SUCCESS; @@ -396,7 +396,7 @@ int MPID_nem_tcp_iStartContigMsg_paused(MPIDI_VC_t *vc, void *hdr, MPIDI_msg_sz_ iov[1].MPID_IOV_BUF = data; iov[1].MPID_IOV_LEN = data_sz; - CHECK_EINTR(offset, writev(sc->fd, iov, 2)); + offset = MPL_large_writev(sc->fd, iov, 2); if (offset == 0) { int req_errno = MPI_SUCCESS; @@ -531,7 +531,7 @@ int MPID_nem_tcp_iSendContig(MPIDI_VC_t *vc, MPID_Request *sreq, void *hdr, MPID iov[1].MPID_IOV_BUF = data; iov[1].MPID_IOV_LEN = data_sz; - CHECK_EINTR(offset, writev(sc->fd, iov, 2)); + offset = MPL_large_writev(sc->fd, iov, 2); if (offset == 0) { int req_errno = MPI_SUCCESS; @@ -690,7 +690,7 @@ int MPID_nem_tcp_SendNoncontig(MPIDI_VC_t *vc, MPID_Request *sreq, void *header, { if (MPIDI_CH3I_Sendq_empty(vc_tcp->send_queue)) { - CHECK_EINTR(offset, writev(vc_tcp->sc->fd, iov, iov_n)); + offset = MPL_large_writev(vc_tcp->sc->fd, iov, iov_n); if (offset == 0) { int req_errno = MPI_SUCCESS; http://git.mpich.org/mpich.git/commitdiff/f2c75e957247ee262ade2f0d9c11515ac… commit f2c75e957247ee262ade2f0d9c11515aca9aefc1 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sat Feb 8 16:24:42 2014 -0600 Added a new MPL_large_writev function. Using writev on larger than 2GB messages seems to cause some platforms to hang (e.g., Mac OSX, at least as of 10.9.1). This patch creates a new function that reduces the message size being transmitted. The function does not attempt to send all data, in order to avoid making it a blocking function. A higher-level function would need to check how much data is sent and retry later if needed. Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/mpl/Makefile.am b/src/mpl/Makefile.am index 8693ae6..5800349 100644 --- a/src/mpl/Makefile.am +++ b/src/mpl/Makefile.am @@ -8,7 +8,7 @@ ACLOCAL_AMFLAGS = -I confdb AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include lib_LTLIBRARIES = lib@[email protected] -lib@MPLLIBNAME@_la_SOURCES = src/mplstr.c src/mpltrmem.c src/mplenv.c +lib@MPLLIBNAME@_la_SOURCES = src/mplstr.c src/mpltrmem.c src/mplenv.c src/mplsock.c lib@MPLLIBNAME@_la_LDFLAGS = ${lib@MPLLIBNAME@_so_versionflags} MPL_TESTS = strsep @@ -24,7 +24,8 @@ mpl_headers = \ include/mplconfig.h \ include/mplenv.h \ include/mplstr.h \ - include/mpltrmem.h + include/mpltrmem.h \ + include/mplsock.h if MPL_EMBEDDED_MODE noinst_HEADERS = $(mpl_headers) diff --git a/src/mpl/configure.ac b/src/mpl/configure.ac index c151de7..8d348e6 100644 --- a/src/mpl/configure.ac +++ b/src/mpl/configure.ac @@ -71,7 +71,7 @@ if test "$pac_cv_have___typeof" = "yes" ; then fi dnl Check if the necessary headers are available -AC_CHECK_HEADERS(stdio.h stdlib.h string.h stdarg.h ctype.h search.h) +AC_CHECK_HEADERS(stdio.h stdlib.h string.h stdarg.h ctype.h search.h sys/types.h sys/uio.h) # A C99 compliant compiler should have inttypes.h for fixed-size int types AC_CHECK_HEADERS(inttypes.h stdint.h) diff --git a/src/mpl/include/mpl.h b/src/mpl/include/mpl.h index 3a33f0a..28120a1 100644 --- a/src/mpl/include/mpl.h +++ b/src/mpl/include/mpl.h @@ -61,5 +61,6 @@ #include "mplstr.h" #include "mpltrmem.h" #include "mplenv.h" +#include "mplsock.h" #endif /* MPL_H_INCLUDED */ diff --git a/src/mpl/include/mplsock.h b/src/mpl/include/mplsock.h new file mode 100644 index 0000000..4aae366 --- /dev/null +++ b/src/mpl/include/mplsock.h @@ -0,0 +1,45 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * (C) 2001 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ + +#ifndef MPLSOCK_H_INCLUDED +#define MPLSOCK_H_INCLUDED + +#include "mplconfig.h" + +#include <sys/types.h> +#include <sys/socket.h> +#include <netinet/in.h> +#include <errno.h> +#include <netinet/tcp.h> +#include <netdb.h> +#include <limits.h> + +#ifdef MPL_HAVE_SYS_TYPES_H +#include <sys/types.h> /* macs need sys/types.h before uio.h can be included */ +#endif +#ifdef MPL_HAVE_SYS_UIO_H +#include <sys/uio.h> +#endif + +#if !defined(MPL_HAVE_SYS_UIO_H) +struct iovec; +#endif + +/* *INDENT-ON* */ +#if defined(__cplusplus) +extern "C" { +#endif +/* *INDENT-OFF* */ + +int MPL_large_writev(int fd, const struct iovec *iov, int iovcnt); + +/* *INDENT-ON* */ +#if defined(__cplusplus) +} +#endif +/* *INDENT-OFF* */ + +#endif /* MPLSOCK_H_INCLUDED */ diff --git a/src/mpl/src/mplsock.c b/src/mpl/src/mplsock.c new file mode 100644 index 0000000..93504b8 --- /dev/null +++ b/src/mpl/src/mplsock.c @@ -0,0 +1,69 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * (C) 2001 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ + +#include "mpl.h" + +#if defined MPL_HAVE_SYS_UIO_H +/* Some platforms, such as Mac OSX (at least as of 10.9.1) hang when + * attempting to send more than 2GB data, even though the writev + * function is supposed to be able to handle large data. This + * function is a simple workaround for this case by attempting to send + * lesser data, and having the upper layer retry later if needed. + * This adds a small amount of bookkeeping overhead, but it should be + * negligible compared to the system call overhead for small messages + * and compared to the data transmission overhead for large + * messages. */ +int MPL_large_writev(int fd, const struct iovec *iov, int iovcnt) +{ + ssize_t total_size, tmp; + struct iovec dummy; + int i; + + /* If the total data fits into INT_MAX, directly use writev */ + total_size = 0; + for (i = 0; i < iovcnt; i++) + total_size += iov[i].iov_len; + + if (total_size <= INT_MAX) { + do { + tmp = writev(fd, iov, iovcnt); + } while (tmp == -1 && errno == EINTR); + return tmp; + } + + /* Total data is larger than INT_MAX. Issue writev with fewer + * elements, so as to not exceed INT_MAX. In this case, doing + * multiple write calls, one for each iov segment is not a big + * deal with respect to performance. */ + + total_size = 0; + for (i = 0; i < iovcnt; i++) { + if (iov[i].iov_len <= INT_MAX) { + do { + tmp = writev(fd, &iov[i], 1); + } while (tmp == -1 && errno == EINTR); + } + else { + dummy.iov_base = iov[i].iov_base; + dummy.iov_len = INT_MAX; + do { + tmp = writev(fd, &dummy, 1); + } while (tmp == -1 && errno == EINTR); + } + + if (tmp < 0) + return tmp; + else if (tmp < iov[i].iov_len) { + total_size += tmp; + return total_size; + } + else + total_size += tmp; + } + + return total_size; +} +#endif /* MPL_HAVE_SYS_UIO_H */ ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c | 4 +- .../ch3/channels/nemesis/netmod/tcp/tcp_send.c | 10 ++-- src/mpid/ch3/channels/sock/src/ch3_isendv.c | 2 +- src/mpid/common/sock/poll/sock_immed.i | 2 +- src/mpid/common/sock/poll/sock_wait.i | 2 +- src/mpl/Makefile.am | 5 +- src/mpl/configure.ac | 2 +- src/mpl/include/mpl.h | 1 + src/mpl/include/mplsock.h | 45 +++++++++++++ src/mpl/src/mplsock.c | 69 ++++++++++++++++++++ 10 files changed, 129 insertions(+), 13 deletions(-) create mode 100644 src/mpl/include/mplsock.h create mode 100644 src/mpl/src/mplsock.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc3-4-g8df06af
by noreply＠mpich.org 06 Feb '14

06 Feb '14

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 8df06af4810d8266839b36d3d5e43ee25ab9aeeb (commit) from 19d0aa5e04c0552be9bfc642844b96889e975e00 (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/8df06af4810d8266839b36d3d5e43ee25… commit 8df06af4810d8266839b36d3d5e43ee25ab9aeeb Author: Su Huang <suhuang(a)us.ibm.com> Date: Wed Feb 5 16:41:56 2014 -0500 Change the pamid default for advancing the scheduled NBCs In the pamid layer, mpir_nbc is set to 0 as the default e.g. the scheduled NBC work will not be advanced which would cause the job hang. The NBC would work only if the schedule is advanced. To do so, a user requires to set the environment variable PAMID_MPIR_NBC to 1. With MPICH 3.1 being released and NBC is one of support items in the release, the default for mpir_nbc should be changed from 0 to 1. Signed-off-by: Michael Blocksome <blocksom(a)us.ibm.com> Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/pamid/src/mpid_init.c b/src/mpid/pamid/src/mpid_init.c index 3938b67..5a63d44 100644 --- a/src/mpid/pamid/src/mpid_init.c +++ b/src/mpid/pamid/src/mpid_init.c @@ -128,7 +128,7 @@ MPIDI_Process_t MPIDI_Process = { .num_requests = 1, }, - .mpir_nbc = 0, + .mpir_nbc = 1, .numTasks = 0, }; ----------------------------------------------------------------------- Summary of changes: src/mpid/pamid/src/mpid_init.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0