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 39fe32a8b0a6476d80cf11142d4010e40e8da4ce (commit) via 06c1391cc88937abc6661309cde12a8c2d3ad8e7 (commit) via 0aec805e36a425a24a672ea2d554e016ade0a024 (commit) via faa37d89d90db3687754045595cd94c3102650b2 (commit) via 983df3aeeb6f43046e7f1b569c1ad5881b14d0b8 (commit) from 461431a019a1500e48ec73637b8bbba40cfc0fb8 (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/39fe32a8b0a6476d80cf11142d4010e40e... commit 39fe32a8b0a6476d80cf11142d4010e40e8da4ce Author: Pavan Balaji <[email protected]> Date: Sat Jul 19 15:42:48 2014 -0500 Created an enum for packet flags. We were using defines instead of enum to represent the same class of flags. Signed-off-by: Wesley Bland <[email protected]> diff --git a/src/mpid/ch3/include/mpidpkt.h b/src/mpid/ch3/include/mpidpkt.h index 44a674f..98c5fce 100644 --- a/src/mpid/ch3/include/mpidpkt.h +++ b/src/mpid/ch3/include/mpidpkt.h @@ -110,18 +110,17 @@ typedef enum MPIDI_CH3_PKT_INVALID = -1 /* forces a signed enum to quash warnings */ } MPIDI_CH3_Pkt_type_t; -typedef uint16_t MPIDI_CH3_Pkt_flags_t; - - /* Flag vector bits:*/ -#define MPIDI_CH3_PKT_FLAG_NONE 0 -#define MPIDI_CH3_PKT_FLAG_RMA_LOCK 1 /* ...............X */ -#define MPIDI_CH3_PKT_FLAG_RMA_UNLOCK 2 /* ..............X. */ -#define MPIDI_CH3_PKT_FLAG_RMA_FLUSH 4 /* .............X.. */ -#define MPIDI_CH3_PKT_FLAG_RMA_REQ_ACK 8 /* ............X... */ -#define MPIDI_CH3_PKT_FLAG_RMA_AT_COMPLETE 16 /* ...........X.... */ -#define MPIDI_CH3_PKT_FLAG_RMA_NOCHECK 32 /* ..........X..... */ -#define MPIDI_CH3_PKT_FLAG_RMA_SHARED 64 /* .........X...... */ -#define MPIDI_CH3_PKT_FLAG_RMA_EXCLUSIVE 128 /* ........X....... */ +typedef enum { + MPIDI_CH3_PKT_FLAG_NONE = 0, + MPIDI_CH3_PKT_FLAG_RMA_LOCK = 1, + MPIDI_CH3_PKT_FLAG_RMA_UNLOCK = 2, + MPIDI_CH3_PKT_FLAG_RMA_FLUSH = 4, + MPIDI_CH3_PKT_FLAG_RMA_REQ_ACK = 8, + MPIDI_CH3_PKT_FLAG_RMA_AT_COMPLETE = 16, + MPIDI_CH3_PKT_FLAG_RMA_NOCHECK = 32, + MPIDI_CH3_PKT_FLAG_RMA_SHARED = 64, + MPIDI_CH3_PKT_FLAG_RMA_EXCLUSIVE = 128 +} MPIDI_CH3_Pkt_flags_t; typedef struct MPIDI_CH3_Pkt_send { http://git.mpich.org/mpich.git/commitdiff/06c1391cc88937abc6661309cde12a8c2d... commit 06c1391cc88937abc6661309cde12a8c2d3ad8e7 Author: Pavan Balaji <[email protected]> Date: Sat Jul 19 15:39:18 2014 -0500 Allow channel packet handlers in the CH3 structure. In nemesis we were managing a separate enum for the nemesis packet handlers, which was somehow being force compared against the CH3 packet handler enums. This is weird and a recipe for bugs. This patch unifies them into a single enum, but allowing the channel to declare its own packet handlers into the structure. Signed-off-by: Wesley Bland <[email protected]> diff --git a/src/mpid/ch3/channels/nemesis/include/mpid_nem_impl.h b/src/mpid/ch3/channels/nemesis/include/mpid_nem_impl.h index f0096f5..c32e9df 100644 --- a/src/mpid/ch3/channels/nemesis/include/mpid_nem_impl.h +++ b/src/mpid/ch3/channels/nemesis/include/mpid_nem_impl.h @@ -45,20 +45,6 @@ int MPID_nem_barrier_vars_init (MPID_nem_barrier_vars_t *barrier_region); * escape earlier than this check. */ #define MPID_nem_fbox_is_full(pbox_) (OPA_load_acquire_int(&(pbox_)->flag.value)) -/* Nemesis packets */ - -typedef enum MPID_nem_pkt_type -{ - MPIDI_NEM_PKT_LMT_RTS = MPIDI_CH3_PKT_END_ALL+1, - MPIDI_NEM_PKT_LMT_CTS, - MPIDI_NEM_PKT_LMT_DONE, - MPIDI_NEM_PKT_LMT_COOKIE, - MPIDI_NEM_PKT_CKPT_MARKER, - MPIDI_NEM_PKT_NETMOD, - MPIDI_NEM_PKT_END, - MPIDI_NEM_PKT_INVALID = -1 /* forces a signed enum to quash warnings */ -} MPID_nem_pkt_type_t; - typedef struct MPID_nem_pkt_lmt_rts { MPIDI_CH3_Pkt_type_t type; diff --git a/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_pre.h b/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_pre.h index 149b5f2..1fa883b 100644 --- a/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_pre.h +++ b/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_pre.h @@ -19,6 +19,15 @@ /*#define HAVE_CH3_PRE_INIT*/ /* #define MPIDI_CH3_HAS_NO_DYNAMIC_PROCESS */ #define MPIDI_DEV_IMPLEMENTS_KVS + +/* Nemesis packets */ +#define MPIDI_CH3_PKT_ENUM \ + MPIDI_NEM_PKT_LMT_RTS, \ + MPIDI_NEM_PKT_LMT_CTS, \ + MPIDI_NEM_PKT_LMT_DONE, \ + MPIDI_NEM_PKT_LMT_COOKIE, \ + MPIDI_NEM_PKT_CKPT_MARKER, \ + MPIDI_NEM_PKT_NETMOD typedef enum MPIDI_CH3I_VC_state { diff --git a/src/mpid/ch3/channels/nemesis/netmod/ib/ib_impl.h b/src/mpid/ch3/channels/nemesis/netmod/ib/ib_impl.h index 0a94f8d..a42df5d 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ib/ib_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/ib/ib_impl.h @@ -677,7 +677,7 @@ typedef enum MPID_nem_ib_pkt_subtype { /* derived from MPID_nem_pkt_netmod_t */ typedef struct MPID_nem_ib_pkt_prefix { - MPID_nem_pkt_type_t type; + MPIDI_CH3_Pkt_type_t type; unsigned subtype; /* additional field */ int16_t seq_num_tail; @@ -685,7 +685,7 @@ typedef struct MPID_nem_ib_pkt_prefix { /* derived from MPID_nem_pkt_netmod_t and MPID_nem_pkt_lmt_done_t */ typedef struct MPID_nem_ib_pkt_lmt_get_done { - MPID_nem_pkt_type_t type; + MPIDI_CH3_Pkt_type_t type; unsigned subtype; /* additional field */ MPI_Request req_id; @@ -694,7 +694,7 @@ typedef struct MPID_nem_ib_pkt_lmt_get_done { /* derived from MPID_nem_pkt_netmod_t */ typedef struct MPID_nem_ib_pkt_req_seq_num_t { - MPID_nem_pkt_type_t type; + MPIDI_CH3_Pkt_type_t type; unsigned subtype; /* additional field */ int16_t seq_num_tail; @@ -702,7 +702,7 @@ typedef struct MPID_nem_ib_pkt_req_seq_num_t { /* derived from MPID_nem_pkt_netmod_t */ typedef struct MPID_nem_ib_pkt_reply_seq_num_t { - MPID_nem_pkt_type_t type; + MPIDI_CH3_Pkt_type_t type; unsigned subtype; /* additional field */ int16_t seq_num_tail; @@ -710,7 +710,7 @@ typedef struct MPID_nem_ib_pkt_reply_seq_num_t { /* derived from MPID_nem_pkt_netmod_t */ typedef struct MPID_nem_ib_pkt_change_rdmabuf_occupancy_notify_state_t { - MPID_nem_pkt_type_t type; + MPIDI_CH3_Pkt_type_t type; unsigned subtype; /* additional field */ int state; diff --git a/src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c b/src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c index 4426052..a7858d7 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c @@ -624,9 +624,9 @@ int MPID_nem_ib_poll_eager(MPID_nem_ib_ringbuf_t * ringbuf) MPIU_Assert(MPID_NEM_IB_NETMOD_HDR_SZ_GET(buf) >= sz_pkt + sizeof(MPIDI_CH3_Pkt_t) + sizeof(MPID_nem_ib_netmod_trailer_t)); dprintf - ("handle_pkt,before,%d<-%d,id=%d,pkt->type=%d,pcc=%d,MPIDI_NEM_PKT_END=%d,pkt=%p,subtype=%d\n", + ("handle_pkt,before,%d<-%d,id=%d,pkt->type=%d,pcc=%d,MPIDI_CH3_PKT_END_ALL=%d,pkt=%p,subtype=%d\n", MPID_nem_ib_myrank, vc->pg_rank, *remote_poll, pkt->type, - MPIDI_CH3I_progress_completion_count.v, MPIDI_NEM_PKT_END, pkt, + MPIDI_CH3I_progress_completion_count.v, MPIDI_CH3_PKT_END_ALL, pkt, ((MPID_nem_pkt_netmod_t *) pkt)->subtype); /* see MPIDI_CH3_PktHandler_EagerSend (in src/mpid/ch3/src/ch3u_eager.c) */ mpi_errno = diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_progress.c b/src/mpid/ch3/channels/nemesis/src/ch3_progress.c index 785476a..2b58bfe 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_progress.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_progress.c @@ -28,7 +28,7 @@ static struct { vc_term_element_t *head, *tail; } vc_term_queue; #define TERMQ_ENQUEUE(ep) GENERIC_Q_ENQUEUE(&vc_term_queue, ep, next) #define TERMQ_DEQUEUE(epp) GENERIC_Q_DEQUEUE(&vc_term_queue, epp, next) -#define PKTARRAY_SIZE (MPIDI_NEM_PKT_END+1) +#define PKTARRAY_SIZE (MPIDI_CH3_PKT_END_ALL+1) static MPIDI_CH3_PktHandler_Fcn *pktArray[PKTARRAY_SIZE]; #ifndef MPIDI_POSTED_RECV_ENQUEUE_HOOK @@ -387,7 +387,7 @@ int MPIDI_CH3I_Progress (MPID_Progress_state *progress_state, int is_blocking) vc_ch = &vc->ch; /* invalid pkt data will result in unpredictable behavior */ - MPIU_Assert(pkt->type >= 0 && pkt->type < MPIDI_NEM_PKT_END); + MPIU_Assert(pkt->type >= 0 && pkt->type < MPIDI_CH3_PKT_END_ALL); mpi_errno = pktArray[pkt->type](vc, pkt, &buflen, &rreq); if (mpi_errno) MPIU_ERR_POP(mpi_errno); @@ -629,7 +629,7 @@ int MPID_nem_handle_pkt(MPIDI_VC_t *vc, char *buf, MPIDI_msg_sz_t buflen) MPIU_DBG_MSG(CH3_CHANNEL, VERBOSE, "received new message"); /* invalid pkt data will result in unpredictable behavior */ - MPIU_Assert(pkt->type >= 0 && pkt->type < MPIDI_NEM_PKT_END); + MPIU_Assert(pkt->type >= 0 && pkt->type < MPIDI_CH3_PKT_END_ALL); mpi_errno = pktArray[pkt->type](vc, pkt, &len, &rreq); if (mpi_errno) MPIU_ERR_POP(mpi_errno); @@ -677,7 +677,7 @@ int MPID_nem_handle_pkt(MPIDI_VC_t *vc, char *buf, MPIDI_msg_sz_t buflen) buf += copylen; /* invalid pkt data will result in unpredictable behavior */ - MPIU_Assert(pkt->type >= 0 && pkt->type < MPIDI_NEM_PKT_END); + MPIU_Assert(pkt->type >= 0 && pkt->type < MPIDI_CH3_PKT_END_ALL); pktlen = sizeof(MPIDI_CH3_Pkt_t); mpi_errno = pktArray[pkt->type](vc, pkt, &pktlen, &rreq); @@ -828,7 +828,7 @@ int MPIDI_CH3I_Progress_init(void) MPIDI_CH3I_shm_active_send = NULL; /* Initialize the code to handle incoming packets */ - if (PKTARRAY_SIZE <= MPIDI_NEM_PKT_END) { + if (PKTARRAY_SIZE <= MPIDI_CH3_PKT_END_ALL) { MPIU_ERR_SETFATALANDJUMP(mpi_errno, MPI_ERR_INTERN, "**ch3|pktarraytoosmall"); } /* pkt handlers from CH3 */ diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_ckpt.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_ckpt.c index 82df5f3..ac29029 100644 --- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_ckpt.c +++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_ckpt.c @@ -579,7 +579,7 @@ int MPIDI_nem_ckpt_pkthandler_init(MPIDI_CH3_PktHandler_Fcn *pktArray[], int arr MPIDI_FUNC_ENTER(MPID_STATE_MPID_NEM_CKPT_PKTHANDLER_INIT); /* Check that the array is large enough */ - if (arraySize <= MPIDI_NEM_PKT_END) { + if (arraySize <= MPIDI_CH3_PKT_END_ALL) { MPIU_ERR_SETFATALANDJUMP(mpi_errno,MPI_ERR_INTERN, "**ch3|pktarraytoosmall"); } diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c index 3b3aec9..de31188 100644 --- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c +++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c @@ -40,7 +40,7 @@ int MPID_nem_lmt_pkthandler_init(MPIDI_CH3_PktHandler_Fcn *pktArray[], int array MPIDI_FUNC_ENTER(MPID_STATE_MPID_NEM_LMT_PKTHANDLER_INIT); /* Check that the array is large enough */ - if (arraySize <= MPIDI_NEM_PKT_END) { + if (arraySize <= MPIDI_CH3_PKT_END_ALL) { MPIU_ERR_SETFATALANDJUMP(mpi_errno,MPI_ERR_INTERN, "**ch3|pktarraytoosmall"); } http://git.mpich.org/mpich.git/commitdiff/0aec805e36a425a24a672ea2d554e016ad... commit 0aec805e36a425a24a672ea2d554e016ade0a024 Author: Pavan Balaji <[email protected]> Date: Sat Jul 19 15:37:12 2014 -0500 Remove unnecessary typedef. We were using an enum for packet types and used an int16_t for the storage. Instead we should directly use the enum as the storage. Signed-off-by: Wesley Bland <[email protected]> diff --git a/src/mpid/ch3/include/mpidpkt.h b/src/mpid/ch3/include/mpidpkt.h index 66c55f2..44a674f 100644 --- a/src/mpid/ch3/include/mpidpkt.h +++ b/src/mpid/ch3/include/mpidpkt.h @@ -63,7 +63,7 @@ typedef union { /* We start with an arbitrarily chosen number (42), to help with * debugging when a packet type is not initialized or wrongly * initialized. */ -enum MPIDI_CH3_Pkt_types +typedef enum { MPIDI_CH3_PKT_EAGER_SEND = 42, #if defined(USE_EAGER_SHORT) @@ -108,9 +108,8 @@ enum MPIDI_CH3_Pkt_types # endif MPIDI_CH3_PKT_END_ALL, MPIDI_CH3_PKT_INVALID = -1 /* forces a signed enum to quash warnings */ -}; +} MPIDI_CH3_Pkt_type_t; -typedef int16_t MPIDI_CH3_Pkt_type_t; typedef uint16_t MPIDI_CH3_Pkt_flags_t; /* Flag vector bits:*/ http://git.mpich.org/mpich.git/commitdiff/faa37d89d90db3687754045595cd94c310... commit faa37d89d90db3687754045595cd94c3102650b2 Author: Pavan Balaji <[email protected]> Date: Sat Jul 19 09:06:34 2014 -0500 Don't start enums with 0. This is to help with debugging. Zero is too common a value, and is often set automatically by the system if not initialized. Starting at a different value helps us catch uninitialized cases more easily. We pick "42" as our magic number as it is the answer to the ultimate question of life, the Universe, and everything. Signed-off-by: Wesley Bland <[email protected]> diff --git a/src/mpid/ch3/include/mpidpkt.h b/src/mpid/ch3/include/mpidpkt.h index 9ef4e0b..66c55f2 100644 --- a/src/mpid/ch3/include/mpidpkt.h +++ b/src/mpid/ch3/include/mpidpkt.h @@ -60,9 +60,12 @@ typedef union { */ /* FIXME: Having predefined names makes it harder to add new message types, such as different RMA types. */ +/* We start with an arbitrarily chosen number (42), to help with + * debugging when a packet type is not initialized or wrongly + * initialized. */ enum MPIDI_CH3_Pkt_types { - MPIDI_CH3_PKT_EAGER_SEND = 0, + MPIDI_CH3_PKT_EAGER_SEND = 42, #if defined(USE_EAGER_SHORT) MPIDI_CH3_PKT_EAGERSHORT_SEND, #endif /* defined(USE_EAGER_SHORT) */ diff --git a/src/mpid/ch3/include/mpidpre.h b/src/mpid/ch3/include/mpidpre.h index 8ccbc1b..8c3a68e 100644 --- a/src/mpid/ch3/include/mpidpre.h +++ b/src/mpid/ch3/include/mpidpre.h @@ -196,8 +196,11 @@ typedef struct MPIDI_VC * MPID_VCR; # define MPIDI_REQUEST_SEQNUM #endif +/* We start with an arbitrarily chosen number (42), to help with + * debugging when a packet type is not initialized or wrongly + * initialized. */ enum MPIDI_CH3_Lock_states { - MPIDI_CH3_WIN_LOCK_NONE = 0, + MPIDI_CH3_WIN_LOCK_NONE = 42, MPIDI_CH3_WIN_LOCK_CALLED, MPIDI_CH3_WIN_LOCK_REQUESTED, MPIDI_CH3_WIN_LOCK_GRANTED, @@ -216,8 +219,11 @@ enum MPIDI_Win_info_arg_vals_accumulate_ops { MPIDI_ACC_OPS_SAME_OP_NO_OP }; +/* We start with an arbitrarily chosen number (42), to help with + * debugging when a packet type is not initialized or wrongly + * initialized. */ enum MPIDI_Win_epoch_states { - MPIDI_EPOCH_NONE = 0, + MPIDI_EPOCH_NONE = 42, MPIDI_EPOCH_FENCE, MPIDI_EPOCH_POST, MPIDI_EPOCH_START, diff --git a/src/mpid/ch3/include/mpidrma.h b/src/mpid/ch3/include/mpidrma.h index 84bac45..1fd76fa 100644 --- a/src/mpid/ch3/include/mpidrma.h +++ b/src/mpid/ch3/include/mpidrma.h @@ -31,9 +31,12 @@ enum MPIDI_RMA_Datatype { MPIDI_RMA_DATATYPE_DERIVED = 51 }; +/* We start with an arbitrarily chosen number (42), to help with + * debugging when a packet type is not initialized or wrongly + * initialized. */ enum MPID_Lock_state { - MPID_LOCK_NONE = 0, - MPID_LOCK_SHARED_ALL = 1 + MPID_LOCK_NONE = 42, + MPID_LOCK_SHARED_ALL }; /* http://git.mpich.org/mpich.git/commitdiff/983df3aeeb6f43046e7f1b569c1ad5881b... commit 983df3aeeb6f43046e7f1b569c1ad5881b14d0b8 Author: Pavan Balaji <[email protected]> Date: Sat Jul 19 15:33:35 2014 -0500 Clean up commas. Bad placement of commas was making indent very unhappy. Signed-off-by: Wesley Bland <[email protected]> diff --git a/src/mpid/ch3/include/mpidpkt.h b/src/mpid/ch3/include/mpidpkt.h index 935c03b..9ef4e0b 100644 --- a/src/mpid/ch3/include/mpidpkt.h +++ b/src/mpid/ch3/include/mpidpkt.h @@ -97,13 +97,13 @@ enum MPIDI_CH3_Pkt_types MPIDI_CH3_PKT_GET_ACCUM_RESP, MPIDI_CH3_PKT_FLOW_CNTL_UPDATE, /* FIXME: Unused */ MPIDI_CH3_PKT_CLOSE, - MPIDI_CH3_PKT_END_CH3 + MPIDI_CH3_PKT_END_CH3, /* The channel can define additional types by defining the value MPIDI_CH3_PKT_ENUM */ # if defined(MPIDI_CH3_PKT_ENUM) - , MPIDI_CH3_PKT_ENUM + MPIDI_CH3_PKT_ENUM, # endif - , MPIDI_CH3_PKT_END_ALL, + MPIDI_CH3_PKT_END_ALL, MPIDI_CH3_PKT_INVALID = -1 /* forces a signed enum to quash warnings */ }; ----------------------------------------------------------------------- Summary of changes: .../ch3/channels/nemesis/include/mpid_nem_impl.h | 14 ------- .../ch3/channels/nemesis/include/mpidi_ch3_pre.h | 9 +++++ src/mpid/ch3/channels/nemesis/netmod/ib/ib_impl.h | 10 +++--- src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c | 4 +- src/mpid/ch3/channels/nemesis/src/ch3_progress.c | 10 +++--- src/mpid/ch3/channels/nemesis/src/mpid_nem_ckpt.c | 2 +- src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c | 2 +- src/mpid/ch3/include/mpidpkt.h | 39 ++++++++++---------- src/mpid/ch3/include/mpidpre.h | 10 ++++- src/mpid/ch3/include/mpidrma.h | 7 +++- 10 files changed, 56 insertions(+), 51 deletions(-) hooks/post-receive -- MPICH primary repository