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 f840491129bc170ffc383d25cd313088642a358a (commit) via f855566a45f1e6ab1a789f4fb9833d9cd8af93c0 (commit) via 7d1fd2923de65f2f6b37d27ff3ca83fb2f1349b7 (commit) from 27330ebafd4615a95c2054e9c4c33a61c4b93fec (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/f840491129bc170ffc383d25cd31308864... commit f840491129bc170ffc383d25cd313088642a358a Author: Ken Raffenetti <[email protected]> Date: Tue Mar 24 11:12:15 2015 -0500 portals4: add missing newline to error message Signed-off-by: Antonio J. Pena <[email protected]> diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c index 40dc3cc..27cbc02 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c @@ -478,7 +478,7 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e) break; default: - MPIU_Error_printf("Received unexpected event type: %d %s", e->type, MPID_nem_ptl_strevent(e)); + MPIU_Error_printf("Received unexpected event type: %d %s\n", e->type, MPID_nem_ptl_strevent(e)); MPIU_ERR_INTERNALANDJUMP(mpi_errno, "Unexpected event type"); break; } http://git.mpich.org/mpich.git/commitdiff/f855566a45f1e6ab1a789f4fb9833d9cd8... commit f855566a45f1e6ab1a789f4fb9833d9cd8af93c0 Author: Ken Raffenetti <[email protected]> Date: Mon Mar 23 16:24:57 2015 -0500 portals4: remove unused header file Signed-off-by: Antonio J. Pena <[email protected]> diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c index fcc5e01..40dc3cc 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c @@ -5,7 +5,6 @@ */ #include "ptl_impl.h" -#include "stddef.h" /* C99; for offsetof */ #include <mpl_utlist.h> #include "rptl.h" http://git.mpich.org/mpich.git/commitdiff/7d1fd2923de65f2f6b37d27ff3ca83fb2f... commit 7d1fd2923de65f2f6b37d27ff3ca83fb2f1349b7 Author: Ken Raffenetti <[email protected]> Date: Mon Mar 23 16:15:35 2015 -0500 portals4: fix incorrect usage of max_eqs limit The max_eqs limit returned at PtlNIInit time is actually a limit on the number of event queues a particular interface can support. It is not the number of events a single queue can hold, which is how we were using it. Since there is no way to query for the max events a queue can hold, we simply request a conservative 32K. Thanks to Sayantan Sur for pointing out our error. Signed-off-by: Antonio J. Pena <[email protected]> diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c index 3b0807d..1a7f5da 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c @@ -13,7 +13,7 @@ #endif #define UNEXPECTED_HDR_COUNT 32768 -#define EQ_COUNT 32768 +#define EVENT_COUNT 32768 #define LIST_SIZE 32768 #define NID_KEY "NID" #define PID_KEY "PID" @@ -179,8 +179,6 @@ static int ptl_init(MPIDI_PG_t *pg_p, int pg_rank, char **bc_val_p, int *val_max /* set higher limits if they are determined to be too low */ if (desired.max_unexpected_headers < UNEXPECTED_HDR_COUNT && getenv("PTL_LIM_MAX_UNEXPECTED_HEADERS") == NULL) desired.max_unexpected_headers = UNEXPECTED_HDR_COUNT; - if (desired.max_eqs < EQ_COUNT && getenv("PTL_LIM_MAX_EQS") == NULL) - desired.max_eqs = EQ_COUNT; if (desired.max_list_size < LIST_SIZE && getenv("PTL_LIM_MAX_LIST_SIZE") == NULL) desired.max_list_size = LIST_SIZE; @@ -190,18 +188,18 @@ static int ptl_init(MPIDI_PG_t *pg_p, int pg_rank, char **bc_val_p, int *val_max MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlniinit", "**ptlniinit %s", MPID_nem_ptl_strerror(ret)); /* allocate EQs for each portal */ - ret = PtlEQAlloc(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_ni_limits.max_eqs, &MPIDI_nem_ptl_eq); + ret = PtlEQAlloc(MPIDI_nem_ptl_ni, EVENT_COUNT, &MPIDI_nem_ptl_eq); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptleqalloc", "**ptleqalloc %s", MPID_nem_ptl_strerror(ret)); - ret = PtlEQAlloc(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_ni_limits.max_eqs, &MPIDI_nem_ptl_get_eq); + ret = PtlEQAlloc(MPIDI_nem_ptl_ni, EVENT_COUNT, &MPIDI_nem_ptl_get_eq); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptleqalloc", "**ptleqalloc %s", MPID_nem_ptl_strerror(ret)); - ret = PtlEQAlloc(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_ni_limits.max_eqs, &MPIDI_nem_ptl_control_eq); + ret = PtlEQAlloc(MPIDI_nem_ptl_ni, EVENT_COUNT, &MPIDI_nem_ptl_control_eq); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptleqalloc", "**ptleqalloc %s", MPID_nem_ptl_strerror(ret)); /* allocate a separate EQ for origin events. with this, we can implement rate-limit operations to prevent a locally triggered flow control even */ - ret = PtlEQAlloc(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_ni_limits.max_eqs, &MPIDI_nem_ptl_origin_eq); + ret = PtlEQAlloc(MPIDI_nem_ptl_ni, EVENT_COUNT, &MPIDI_nem_ptl_origin_eq); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptleqalloc", "**ptleqalloc %s", MPID_nem_ptl_strerror(ret)); /* allocate portal for matching messages */ ----------------------------------------------------------------------- Summary of changes: .../channels/nemesis/netmod/portals4/ptl_init.c | 12 +++++------- .../ch3/channels/nemesis/netmod/portals4/ptl_nm.c | 3 +-- 2 files changed, 6 insertions(+), 9 deletions(-) hooks/post-receive -- MPICH primary repository