[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b3-270-g3ad0e71

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 3ad0e71d9232c84d2b3eae9d72f1b2198c379f71 (commit) via ae124660032c666b0547a04791ed33a9c127e27b (commit) via f9439f76a38f8837147c44236328e6e319c4b939 (commit) via 225141c377295a2c4c0176faa10bd1156098b28e (commit) from 83747734d96ae918c1841b3ab920b33e42302741 (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/3ad0e71d9232c84d2b3eae9d72f1b2198c... commit 3ad0e71d9232c84d2b3eae9d72f1b2198c379f71 Author: Pavan Balaji <[email protected]> Date: Tue Jul 21 17:49:48 2015 -0500 Remove unnecessary initialization. Signed-off-by: Xin Zhao <[email protected]> diff --git a/src/mpid/ch3/src/ch3u_rma_progress.c b/src/mpid/ch3/src/ch3u_rma_progress.c index 41058c4..da604d4 100644 --- a/src/mpid/ch3/src/ch3u_rma_progress.c +++ b/src/mpid/ch3/src/ch3u_rma_progress.c @@ -938,7 +938,7 @@ int MPIDI_CH3I_RMA_Make_progress_win(MPID_Win * win_ptr, int *made_progress) #define FCNAME MPIU_QUOTE(FUNCNAME) int MPIDI_CH3I_RMA_Make_progress_global(int *made_progress) { - MPIDI_RMA_Win_list_t *win_elem = MPIDI_RMA_Win_list_head; + MPIDI_RMA_Win_list_t *win_elem; int mpi_errno = MPI_SUCCESS; (*made_progress) = 0; http://git.mpich.org/mpich.git/commitdiff/ae124660032c666b0547a04791ed33a9c1... commit ae124660032c666b0547a04791ed33a9c127e27b Author: Pavan Balaji <[email protected]> Date: Tue Jul 21 17:48:57 2015 -0500 Use MPIDI_RMA_Win_list_head instead of MPIDI_RMA_Win_list. Keep list names consistent. Signed-off-by: Xin Zhao <[email protected]> diff --git a/src/mpid/ch3/include/mpid_rma_types.h b/src/mpid/ch3/include/mpid_rma_types.h index c384a9d..ba664b1 100644 --- a/src/mpid/ch3/include/mpid_rma_types.h +++ b/src/mpid/ch3/include/mpid_rma_types.h @@ -109,7 +109,7 @@ typedef struct MPIDI_RMA_Win_list { struct MPIDI_RMA_Win_list *prev; } MPIDI_RMA_Win_list_t; -extern MPIDI_RMA_Win_list_t *MPIDI_RMA_Win_list; +extern MPIDI_RMA_Win_list_t *MPIDI_RMA_Win_list_head; typedef struct MPIDI_RMA_Target_lock_entry { struct MPIDI_RMA_Target_lock_entry *next; diff --git a/src/mpid/ch3/src/ch3u_rma_progress.c b/src/mpid/ch3/src/ch3u_rma_progress.c index 7c3d393..41058c4 100644 --- a/src/mpid/ch3/src/ch3u_rma_progress.c +++ b/src/mpid/ch3/src/ch3u_rma_progress.c @@ -938,7 +938,7 @@ int MPIDI_CH3I_RMA_Make_progress_win(MPID_Win * win_ptr, int *made_progress) #define FCNAME MPIU_QUOTE(FUNCNAME) int MPIDI_CH3I_RMA_Make_progress_global(int *made_progress) { - MPIDI_RMA_Win_list_t *win_elem = MPIDI_RMA_Win_list; + MPIDI_RMA_Win_list_t *win_elem = MPIDI_RMA_Win_list_head; int mpi_errno = MPI_SUCCESS; (*made_progress) = 0; @@ -946,7 +946,7 @@ int MPIDI_CH3I_RMA_Make_progress_global(int *made_progress) if (MPIDI_CH3I_num_active_issued_win == 0 && MPIDI_CH3I_num_passive_win == 0) goto fn_exit; - for (win_elem = MPIDI_RMA_Win_list; win_elem; win_elem = win_elem->next) { + for (win_elem = MPIDI_RMA_Win_list_head; win_elem; win_elem = win_elem->next) { int temp_progress = 0; int is_able_to_issue = 0; diff --git a/src/mpid/ch3/src/mpid_rma.c b/src/mpid/ch3/src/mpid_rma.c index b4e5595..e426c3c 100644 --- a/src/mpid/ch3/src/mpid_rma.c +++ b/src/mpid/ch3/src/mpid_rma.c @@ -41,7 +41,7 @@ cvars: MPIU_THREADSAFE_INIT_DECL(initRMAoptions); -MPIDI_RMA_Win_list_t *MPIDI_RMA_Win_list = NULL; +MPIDI_RMA_Win_list_t *MPIDI_RMA_Win_list_head = NULL; static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, MPID_Info * info, MPID_Comm * comm_ptr, MPID_Win ** win_ptr); @@ -358,12 +358,12 @@ static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, "Window list element"); win_elem->win_ptr = *win_ptr; - if (MPIDI_RMA_Win_list == NULL) { + if (MPIDI_RMA_Win_list_head == NULL) { mpi_errno = MPID_Progress_register_hook(MPIDI_CH3I_RMA_Make_progress_global); if (mpi_errno) MPIU_ERR_POP(mpi_errno); } - MPL_DL_APPEND(MPIDI_RMA_Win_list, win_elem); + MPL_DL_APPEND(MPIDI_RMA_Win_list_head, win_elem); if (MPIDI_CH3U_Win_hooks.win_init != NULL) { mpi_errno = diff --git a/src/mpid/ch3/src/mpidi_rma.c b/src/mpid/ch3/src/mpidi_rma.c index a62db0f..4a01f90 100644 --- a/src/mpid/ch3/src/mpidi_rma.c +++ b/src/mpid/ch3/src/mpidi_rma.c @@ -201,13 +201,13 @@ int MPID_Win_free(MPID_Win ** win_ptr) } /* dequeue window from the global list */ - for (win_elem = MPIDI_RMA_Win_list; win_elem && win_elem->win_ptr != *win_ptr; + for (win_elem = MPIDI_RMA_Win_list_head; win_elem && win_elem->win_ptr != *win_ptr; win_elem = win_elem->next); MPIU_ERR_CHKANDJUMP(win_elem == NULL, mpi_errno, MPI_ERR_RMA_SYNC, "**rmasync"); - MPL_DL_DELETE(MPIDI_RMA_Win_list, win_elem); + MPL_DL_DELETE(MPIDI_RMA_Win_list_head, win_elem); MPIU_Free(win_elem); - if (MPIDI_RMA_Win_list == NULL) + if (MPIDI_RMA_Win_list_head == NULL) MPID_Progress_deregister_hook(MPIDI_CH3I_RMA_Make_progress_global); comm_ptr = (*win_ptr)->comm_ptr; http://git.mpich.org/mpich.git/commitdiff/f9439f76a38f8837147c44236328e6e319... commit f9439f76a38f8837147c44236328e6e319c4b939 Author: Xin Zhao <[email protected]> Date: Fri Jul 17 06:14:24 2015 -0500 use double direction linked list for RMA related lists. Using a doubly-linked list makes deletion faster when you have a direct pointer to the object that needs to be deleted. The following lists were modified: - issue/pending operation lists - target list - operation pool - target pool - target lock entry list - window list Signed-off-by: Pavan Balaji <[email protected]> diff --git a/src/mpid/ch3/include/mpid_rma_lockqueue.h b/src/mpid/ch3/include/mpid_rma_lockqueue.h index f0509c5..6811494 100644 --- a/src/mpid/ch3/include/mpid_rma_lockqueue.h +++ b/src/mpid/ch3/include/mpid_rma_lockqueue.h @@ -28,8 +28,7 @@ static inline MPIDI_RMA_Target_lock_entry_t *MPIDI_CH3I_Win_target_lock_entry_al if (win_ptr->target_lock_entry_pool_head != NULL) { new_ptr = win_ptr->target_lock_entry_pool_head; - MPL_LL_DELETE(win_ptr->target_lock_entry_pool_head, win_ptr->target_lock_entry_pool_tail, - new_ptr); + MPL_DL_DELETE(win_ptr->target_lock_entry_pool_head, new_ptr); } if (new_ptr != NULL) { @@ -63,8 +62,7 @@ static inline int MPIDI_CH3I_Win_target_lock_entry_free(MPID_Win * win_ptr, /* use PREPEND when return objects back to the pool * in order to improve cache performance */ - MPL_LL_PREPEND(win_ptr->target_lock_entry_pool_head, win_ptr->target_lock_entry_pool_tail, - target_lock_entry); + MPL_DL_PREPEND(win_ptr->target_lock_entry_pool_head, target_lock_entry); return mpi_errno; } diff --git a/src/mpid/ch3/include/mpid_rma_oplist.h b/src/mpid/ch3/include/mpid_rma_oplist.h index fa60ab2..5d84d6f 100644 --- a/src/mpid/ch3/include/mpid_rma_oplist.h +++ b/src/mpid/ch3/include/mpid_rma_oplist.h @@ -16,9 +16,8 @@ int MPIDI_CH3I_RMA_Cleanup_target_aggressive(MPID_Win * win_ptr, MPIDI_RMA_Targe int MPIDI_CH3I_RMA_Make_progress_target(MPID_Win * win_ptr, int target_rank, int *made_progress); int MPIDI_CH3I_RMA_Make_progress_win(MPID_Win * win_ptr, int *made_progress); -extern MPIDI_RMA_Op_t *global_rma_op_pool_head, *global_rma_op_pool_tail, *global_rma_op_pool_start; -extern MPIDI_RMA_Target_t *global_rma_target_pool_head, *global_rma_target_pool_tail, - *global_rma_target_pool_start; +extern MPIDI_RMA_Op_t *global_rma_op_pool_head, *global_rma_op_pool_start; +extern MPIDI_RMA_Target_t *global_rma_target_pool_head, *global_rma_target_pool_start; MPIR_T_PVAR_DOUBLE_TIMER_DECL_EXTERN(RMA, rma_rmaqueue_alloc); @@ -58,12 +57,12 @@ static inline MPIDI_RMA_Op_t *MPIDI_CH3I_Win_op_alloc(MPID_Win * win_ptr) return NULL; else { e = global_rma_op_pool_head; - MPL_LL_DELETE(global_rma_op_pool_head, global_rma_op_pool_tail, e); + MPL_DL_DELETE(global_rma_op_pool_head, e); } } else { e = win_ptr->op_pool_head; - MPL_LL_DELETE(win_ptr->op_pool_head, win_ptr->op_pool_tail, e); + MPL_DL_DELETE(win_ptr->op_pool_head, e); } e->single_req = NULL; @@ -95,9 +94,9 @@ static inline int MPIDI_CH3I_Win_op_free(MPID_Win * win_ptr, MPIDI_RMA_Op_t * e) /* use PREPEND when return objects back to the pool * in order to improve cache performance */ if (e->pool_type == MPIDI_RMA_POOL_WIN) - MPL_LL_PREPEND(win_ptr->op_pool_head, win_ptr->op_pool_tail, e); + MPL_DL_PREPEND(win_ptr->op_pool_head, e); else - MPL_LL_PREPEND(global_rma_op_pool_head, global_rma_op_pool_tail, e); + MPL_DL_PREPEND(global_rma_op_pool_head, e); return mpi_errno; } @@ -118,18 +117,18 @@ static inline MPIDI_RMA_Target_t *MPIDI_CH3I_Win_target_alloc(MPID_Win * win_ptr return NULL; else { e = global_rma_target_pool_head; - MPL_LL_DELETE(global_rma_target_pool_head, global_rma_target_pool_tail, e); + MPL_DL_DELETE(global_rma_target_pool_head, e); } } else { e = win_ptr->target_pool_head; - MPL_LL_DELETE(win_ptr->target_pool_head, win_ptr->target_pool_tail, e); + MPL_DL_DELETE(win_ptr->target_pool_head, e); } - e->issued_read_op_list_head = e->issued_read_op_list_tail = NULL; - e->issued_write_op_list_head = e->issued_write_op_list_tail = NULL; - e->issued_dt_op_list_head = e->issued_dt_op_list_tail = NULL; - e->pending_op_list_head = e->pending_op_list_tail = NULL; + e->issued_read_op_list_head = NULL; + e->issued_write_op_list_head = NULL; + e->issued_dt_op_list_head = NULL; + e->pending_op_list_head = NULL; e->next_op_to_issue = NULL; e->target_rank = -1; @@ -167,9 +166,9 @@ static inline int MPIDI_CH3I_Win_target_free(MPID_Win * win_ptr, MPIDI_RMA_Targe /* use PREPEND when return objects back to the pool * in order to improve cache performance */ if (e->pool_type == MPIDI_RMA_POOL_WIN) - MPL_LL_PREPEND(win_ptr->target_pool_head, win_ptr->target_pool_tail, e); + MPL_DL_PREPEND(win_ptr->target_pool_head, e); else - MPL_LL_PREPEND(global_rma_target_pool_head, global_rma_target_pool_tail, e); + MPL_DL_PREPEND(global_rma_target_pool_head, e); return mpi_errno; } @@ -205,7 +204,7 @@ static inline int MPIDI_CH3I_Win_create_target(MPID_Win * win_ptr, int target_ra win_ptr->non_empty_slots++; /* Enqueue target into target list. */ - MPL_LL_APPEND(slot->target_list_head, slot->target_list_tail, t); + MPL_DL_APPEND(slot->target_list_head, t); assert(t != NULL); @@ -291,7 +290,7 @@ static inline int MPIDI_CH3I_Win_enqueue_op(MPID_Win * win_ptr, MPIDI_RMA_Op_t * } /* Enqueue operation into pending list. */ - MPL_LL_APPEND(target->pending_op_list_head, target->pending_op_list_tail, op); + MPL_DL_APPEND(target->pending_op_list_head, op); if (target->next_op_to_issue == NULL) target->next_op_to_issue = op; @@ -319,7 +318,7 @@ static inline int MPIDI_CH3I_Win_target_dequeue_and_free(MPID_Win * win_ptr, MPI else slot = &(win_ptr->slots[target_rank]); - MPL_LL_DELETE(slot->target_list_head, slot->target_list_tail, e); + MPL_DL_DELETE(slot->target_list_head, e); mpi_errno = MPIDI_CH3I_Win_target_free(win_ptr, e); if (mpi_errno != MPI_SUCCESS) @@ -342,7 +341,7 @@ static inline int MPIDI_CH3I_Win_target_dequeue_and_free(MPID_Win * win_ptr, MPI static inline int MPIDI_CH3I_RMA_Cleanup_ops_target(MPID_Win * win_ptr, MPIDI_RMA_Target_t * target) { MPIDI_RMA_Op_t *curr_op = NULL; - MPIDI_RMA_Op_t **op_list_head = NULL, **op_list_tail = NULL; + MPIDI_RMA_Op_t **op_list_head = NULL; int read_flag = 0, write_flag = 0; int mpi_errno = MPI_SUCCESS; int i; @@ -367,7 +366,6 @@ static inline int MPIDI_CH3I_RMA_Cleanup_ops_target(MPID_Win * win_ptr, MPIDI_RM /* go over issued_read_op_list, issued_write_op_list, * issued_dt_op_list, start from issued_read_op_list. */ op_list_head = &(target->issued_read_op_list_head); - op_list_tail = &(target->issued_read_op_list_tail); read_flag = 1; curr_op = *op_list_head; @@ -443,7 +441,7 @@ static inline int MPIDI_CH3I_RMA_Cleanup_ops_target(MPID_Win * win_ptr, MPIDI_RM curr_op->reqs_size = 0; /* dequeue the operation and free it */ - MPL_LL_DELETE(*op_list_head, *op_list_tail, curr_op); + MPL_DL_DELETE(*op_list_head, curr_op); MPIDI_CH3I_Win_op_free(win_ptr, curr_op); } else @@ -454,13 +452,11 @@ static inline int MPIDI_CH3I_RMA_Cleanup_ops_target(MPID_Win * win_ptr, MPIDI_RM if (read_flag == 1) { read_flag = 0; op_list_head = &(target->issued_write_op_list_head); - op_list_tail = &(target->issued_write_op_list_tail); write_flag = 1; } else if (write_flag == 1) { write_flag = 0; op_list_head = &(target->issued_dt_op_list_head); - op_list_tail = &(target->issued_dt_op_list_tail); } else { /* we reach the tail of the last operation list (dt_op_list), @@ -611,11 +607,9 @@ static inline int MPIDI_CH3I_Win_get_op(MPID_Win * win_ptr, MPIDI_RMA_Op_t ** e) #define FUNCNAME MPIDI_CH3I_RMA_Ops_append #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) -static inline void MPIDI_CH3I_RMA_Ops_append(MPIDI_RMA_Ops_list_t * list, - MPIDI_RMA_Ops_list_t * list_tail, - MPIDI_RMA_Op_t * elem) +static inline void MPIDI_CH3I_RMA_Ops_append(MPIDI_RMA_Ops_list_t * list, MPIDI_RMA_Op_t * elem) { - MPL_LL_APPEND(*list, *list_tail, elem); + MPL_DL_APPEND(*list, elem); } @@ -628,11 +622,9 @@ static inline void MPIDI_CH3I_RMA_Ops_append(MPIDI_RMA_Ops_list_t * list, #define FUNCNAME MPIDI_CH3I_RMA_Ops_unlink #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) -static inline void MPIDI_CH3I_RMA_Ops_unlink(MPIDI_RMA_Ops_list_t * list, - MPIDI_RMA_Ops_list_t * list_tail, - MPIDI_RMA_Op_t * elem) +static inline void MPIDI_CH3I_RMA_Ops_unlink(MPIDI_RMA_Ops_list_t * list, MPIDI_RMA_Op_t * elem) { - MPL_LL_DELETE(*list, *list_tail, elem); + MPL_DL_DELETE(*list, elem); } @@ -646,14 +638,13 @@ static inline void MPIDI_CH3I_RMA_Ops_unlink(MPIDI_RMA_Ops_list_t * list, #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) static inline void MPIDI_CH3I_RMA_Ops_free_elem(MPID_Win * win_ptr, MPIDI_RMA_Ops_list_t * list, - MPIDI_RMA_Ops_list_t * list_tail, MPIDI_RMA_Op_t * curr_ptr) { MPIDI_RMA_Op_t *tmp_ptr = curr_ptr; MPIU_Assert(curr_ptr != NULL); - MPL_LL_DELETE(*list, *list_tail, curr_ptr); + MPL_DL_DELETE(*list, curr_ptr); MPIDI_CH3I_Win_op_free(win_ptr, tmp_ptr); } diff --git a/src/mpid/ch3/include/mpid_rma_types.h b/src/mpid/ch3/include/mpid_rma_types.h index cdb2897..c384a9d 100644 --- a/src/mpid/ch3/include/mpid_rma_types.h +++ b/src/mpid/ch3/include/mpid_rma_types.h @@ -31,6 +31,7 @@ typedef enum MPIDI_RMA_Pool_type { /* for keeping track of RMA ops, which will be executed at the next sync call */ typedef struct MPIDI_RMA_Op { struct MPIDI_RMA_Op *next; /* pointer to next element in list */ + struct MPIDI_RMA_Op *prev; /* pointer to prev element in list */ void *origin_addr; int origin_count; @@ -62,12 +63,13 @@ typedef struct MPIDI_RMA_Op { } MPIDI_RMA_Op_t; typedef struct MPIDI_RMA_Target { - struct MPIDI_RMA_Op *issued_read_op_list_head, *issued_read_op_list_tail; - struct MPIDI_RMA_Op *issued_write_op_list_head, *issued_write_op_list_tail; - struct MPIDI_RMA_Op *issued_dt_op_list_head, *issued_dt_op_list_tail; - struct MPIDI_RMA_Op *pending_op_list_head, *pending_op_list_tail; + struct MPIDI_RMA_Op *issued_read_op_list_head; + struct MPIDI_RMA_Op *issued_write_op_list_head; + struct MPIDI_RMA_Op *issued_dt_op_list_head; + struct MPIDI_RMA_Op *pending_op_list_head; struct MPIDI_RMA_Op *next_op_to_issue; struct MPIDI_RMA_Target *next; + struct MPIDI_RMA_Target *prev; int target_rank; enum MPIDI_RMA_states access_state; int lock_type; /* NONE, SHARED, EXCLUSIVE */ @@ -99,18 +101,19 @@ typedef struct MPIDI_RMA_Target { typedef struct MPIDI_RMA_Slot { struct MPIDI_RMA_Target *target_list_head; - struct MPIDI_RMA_Target *target_list_tail; } MPIDI_RMA_Slot_t; typedef struct MPIDI_RMA_Win_list { MPID_Win *win_ptr; struct MPIDI_RMA_Win_list *next; + struct MPIDI_RMA_Win_list *prev; } MPIDI_RMA_Win_list_t; -extern MPIDI_RMA_Win_list_t *MPIDI_RMA_Win_list, *MPIDI_RMA_Win_list_tail; +extern MPIDI_RMA_Win_list_t *MPIDI_RMA_Win_list; typedef struct MPIDI_RMA_Target_lock_entry { struct MPIDI_RMA_Target_lock_entry *next; + struct MPIDI_RMA_Target_lock_entry *prev; MPIDI_CH3_Pkt_t pkt; /* all information for this request packet */ MPIDI_VC_t *vc; void *data; /* for queued PUTs / ACCs / GACCs, data is copied here */ diff --git a/src/mpid/ch3/include/mpidpre.h b/src/mpid/ch3/include/mpidpre.h index e6bdadc..2f7d3ea 100644 --- a/src/mpid/ch3/include/mpidpre.h +++ b/src/mpid/ch3/include/mpidpre.h @@ -316,17 +316,13 @@ typedef struct MPIDI_Win_basic_info { * (none, shared, exclusive) */ \ volatile int shared_lock_ref_cnt; \ struct MPIDI_RMA_Target_lock_entry volatile *target_lock_queue_head; /* list of unsatisfied locks */ \ - struct MPIDI_RMA_Target_lock_entry volatile *target_lock_queue_tail; /* tail of unstaisfied locks. */ \ - \ struct MPIDI_Win_info_args info_args; \ int shm_allocated; /* flag: TRUE iff this window has a shared memory \ region associated with it */ \ struct MPIDI_RMA_Op *op_pool_start; /* start pointer used for freeing */\ struct MPIDI_RMA_Op *op_pool_head; /* pool of operations */ \ - struct MPIDI_RMA_Op *op_pool_tail; /* tail pointer to pool of operations. */ \ struct MPIDI_RMA_Target *target_pool_start; /* start pointer used for freeing */\ struct MPIDI_RMA_Target *target_pool_head; /* pool of targets */ \ - struct MPIDI_RMA_Target *target_pool_tail; /* tail pointer to pool of targets */\ struct MPIDI_RMA_Slot *slots; \ int num_slots; \ struct { \ @@ -348,7 +344,6 @@ typedef struct MPIDI_Win_basic_info { of number of locks not being granted yet. */ \ struct MPIDI_RMA_Target_lock_entry *target_lock_entry_pool_start; \ struct MPIDI_RMA_Target_lock_entry *target_lock_entry_pool_head; \ - struct MPIDI_RMA_Target_lock_entry *target_lock_entry_pool_tail; \ int current_target_lock_data_bytes; \ int dangling_request_cnt; /* This counter tracks number of \ ibarrier requests (used in \ diff --git a/src/mpid/ch3/include/mpidrma.h b/src/mpid/ch3/include/mpidrma.h index a05b2ff..4f86910 100644 --- a/src/mpid/ch3/include/mpidrma.h +++ b/src/mpid/ch3/include/mpidrma.h @@ -333,7 +333,9 @@ static inline int enqueue_lock_origin(MPID_Win * win_ptr, MPIDI_VC_t * vc, new_ptr = MPIDI_CH3I_Win_target_lock_entry_alloc(win_ptr, pkt); if (new_ptr != NULL) { - MPL_LL_APPEND(win_ptr->target_lock_queue_head, win_ptr->target_lock_queue_tail, new_ptr); + MPIDI_RMA_Target_lock_entry_t **head_ptr = + (MPIDI_RMA_Target_lock_entry_t **) (&(win_ptr->target_lock_queue_head)); + MPL_DL_APPEND((*head_ptr), new_ptr); new_ptr->vc = vc; } else { @@ -645,15 +647,13 @@ static inline int adjust_op_piggybacked_with_lock(MPID_Win * win_ptr, if (op->reqs_size == 0) { MPIU_Assert(op->single_req == NULL && op->multi_reqs == NULL); - MPIDI_CH3I_RMA_Ops_free_elem(win_ptr, &(target->pending_op_list_head), - &(target->pending_op_list_tail), op); + MPIDI_CH3I_RMA_Ops_free_elem(win_ptr, &(target->pending_op_list_head), op); } else { MPI_Datatype target_datatype; int is_derived = FALSE; - MPIDI_CH3I_RMA_Ops_unlink(&(target->pending_op_list_head), - &(target->pending_op_list_tail), op); + MPIDI_CH3I_RMA_Ops_unlink(&(target->pending_op_list_head), op); MPIDI_CH3_PKT_RMA_GET_TARGET_DATATYPE(op->pkt, target_datatype, mpi_errno); @@ -667,19 +667,16 @@ static inline int adjust_op_piggybacked_with_lock(MPID_Win * win_ptr, } if (is_derived) { - MPIDI_CH3I_RMA_Ops_append(&(target->issued_dt_op_list_head), - &(target->issued_dt_op_list_tail), op); + MPIDI_CH3I_RMA_Ops_append(&(target->issued_dt_op_list_head), op); } else if (op->pkt.type == MPIDI_CH3_PKT_PUT || op->pkt.type == MPIDI_CH3_PKT_PUT_IMMED || op->pkt.type == MPIDI_CH3_PKT_ACCUMULATE || op->pkt.type == MPIDI_CH3_PKT_ACCUMULATE_IMMED) { - MPIDI_CH3I_RMA_Ops_append(&(target->issued_write_op_list_head), - &(target->issued_write_op_list_tail), op); + MPIDI_CH3I_RMA_Ops_append(&(target->issued_write_op_list_head), op); } else { - MPIDI_CH3I_RMA_Ops_append(&(target->issued_read_op_list_head), - &(target->issued_read_op_list_tail), op); + MPIDI_CH3I_RMA_Ops_append(&(target->issued_read_op_list_head), op); } } } @@ -753,6 +750,8 @@ static inline int acquire_local_lock(MPID_Win * win_ptr, int lock_type) MPIDI_CH3_Pkt_lock_t *lock_pkt = &pkt.lock; MPIDI_RMA_Target_lock_entry_t *new_ptr = NULL; MPIDI_VC_t *my_vc; + MPIDI_RMA_Target_lock_entry_t **head_ptr = + (MPIDI_RMA_Target_lock_entry_t **) (&(win_ptr->target_lock_queue_head)); MPIDI_Pkt_init(lock_pkt, MPIDI_CH3_PKT_LOCK); lock_pkt->flags = MPIDI_CH3_PKT_FLAG_NONE; @@ -771,7 +770,7 @@ static inline int acquire_local_lock(MPID_Win * win_ptr, int lock_type) MPIU_ERR_POP(mpi_errno); goto fn_exit; } - MPL_LL_APPEND(win_ptr->target_lock_queue_head, win_ptr->target_lock_queue_tail, new_ptr); + MPL_DL_APPEND((*head_ptr), new_ptr); MPIDI_Comm_get_vc_set_active(win_ptr->comm_ptr, win_ptr->comm_ptr->rank, &my_vc); new_ptr->vc = my_vc; diff --git a/src/mpid/ch3/src/ch3u_handle_recv_req.c b/src/mpid/ch3/src/ch3u_handle_recv_req.c index a1f13e3..5b3923e 100644 --- a/src/mpid/ch3/src/ch3u_handle_recv_req.c +++ b/src/mpid/ch3/src/ch3u_handle_recv_req.c @@ -1950,8 +1950,7 @@ int MPIDI_CH3I_Release_lock(MPID_Win * win_ptr) } if (MPIDI_CH3I_Try_acquire_win_lock(win_ptr, requested_lock) == 1) { /* dequeue entry from lock queue */ - MPL_LL_DELETE(win_ptr->target_lock_queue_head, - win_ptr->target_lock_queue_tail, target_lock_entry); + MPL_DL_DELETE(win_ptr->target_lock_queue_head, target_lock_entry); /* perform this OP */ mpi_errno = perform_op_in_lock_queue(win_ptr, target_lock_entry); @@ -2052,8 +2051,7 @@ int MPIDI_CH3_ReqHandler_PiggybackLockOpRecvComplete(MPIDI_VC_t * vc, if (MPIDI_CH3I_Try_acquire_win_lock(win_ptr, requested_lock) == 1) { /* dequeue entry from lock queue */ - MPL_LL_DELETE(win_ptr->target_lock_queue_head, win_ptr->target_lock_queue_tail, - target_lock_queue_entry); + MPL_DL_DELETE(win_ptr->target_lock_queue_head, target_lock_queue_entry); /* perform this OP */ mpi_errno = perform_op_in_lock_queue(win_ptr, target_lock_queue_entry); diff --git a/src/mpid/ch3/src/ch3u_rma_progress.c b/src/mpid/ch3/src/ch3u_rma_progress.c index 66a2611..7c3d393 100644 --- a/src/mpid/ch3/src/ch3u_rma_progress.c +++ b/src/mpid/ch3/src/ch3u_rma_progress.c @@ -439,8 +439,7 @@ static inline int issue_ops_target(MPID_Win * win_ptr, MPIDI_RMA_Target_t * targ if (curr_op->reqs_size == 0) { MPIU_Assert(curr_op->single_req == NULL && curr_op->multi_reqs == NULL); /* Sending is completed immediately. */ - MPIDI_CH3I_RMA_Ops_free_elem(win_ptr, &(target->pending_op_list_head), - &(target->pending_op_list_tail), curr_op); + MPIDI_CH3I_RMA_Ops_free_elem(win_ptr, &(target->pending_op_list_head), curr_op); } else { MPI_Datatype target_datatype; @@ -448,8 +447,7 @@ static inline int issue_ops_target(MPID_Win * win_ptr, MPIDI_RMA_Target_t * targ /* Sending is not completed immediately. */ - MPIDI_CH3I_RMA_Ops_unlink(&(target->pending_op_list_head), - &(target->pending_op_list_tail), curr_op); + MPIDI_CH3I_RMA_Ops_unlink(&(target->pending_op_list_head), curr_op); MPIDI_CH3_PKT_RMA_GET_TARGET_DATATYPE(curr_op->pkt, target_datatype, mpi_errno); @@ -463,19 +461,16 @@ static inline int issue_ops_target(MPID_Win * win_ptr, MPIDI_RMA_Target_t * targ } if (is_derived) { - MPIDI_CH3I_RMA_Ops_append(&(target->issued_dt_op_list_head), - &(target->issued_dt_op_list_tail), curr_op); + MPIDI_CH3I_RMA_Ops_append(&(target->issued_dt_op_list_head), curr_op); } else if (curr_op->pkt.type == MPIDI_CH3_PKT_PUT || curr_op->pkt.type == MPIDI_CH3_PKT_PUT_IMMED || curr_op->pkt.type == MPIDI_CH3_PKT_ACCUMULATE || curr_op->pkt.type == MPIDI_CH3_PKT_ACCUMULATE_IMMED) { - MPIDI_CH3I_RMA_Ops_append(&(target->issued_write_op_list_head), - &(target->issued_write_op_list_tail), curr_op); + MPIDI_CH3I_RMA_Ops_append(&(target->issued_write_op_list_head), curr_op); } else { - MPIDI_CH3I_RMA_Ops_append(&(target->issued_read_op_list_head), - &(target->issued_read_op_list_tail), curr_op); + MPIDI_CH3I_RMA_Ops_append(&(target->issued_read_op_list_head), curr_op); } @@ -569,7 +564,7 @@ int MPIDI_CH3I_RMA_Free_ops_before_completion(MPID_Win * win_ptr) { MPIDI_RMA_Op_t *curr_op = NULL; MPIDI_RMA_Target_t *curr_target = NULL; - MPIDI_RMA_Op_t **op_list_head = NULL, **op_list_tail = NULL; + MPIDI_RMA_Op_t **op_list_head = NULL; int read_flag = 0; int i, made_progress = 0; int mpi_errno = MPI_SUCCESS; @@ -620,7 +615,6 @@ int MPIDI_CH3I_RMA_Free_ops_before_completion(MPID_Win * win_ptr) curr_target->sync.upgrade_flush_local = 1; op_list_head = &curr_target->issued_read_op_list_head; - op_list_tail = &curr_target->issued_read_op_list_tail; read_flag = 1; curr_op = *op_list_head; @@ -650,12 +644,11 @@ int MPIDI_CH3I_RMA_Free_ops_before_completion(MPID_Win * win_ptr) curr_op->multi_reqs = NULL; curr_op->reqs_size = 0; } - MPIDI_CH3I_RMA_Ops_free_elem(win_ptr, op_list_head, op_list_tail, curr_op); + MPIDI_CH3I_RMA_Ops_free_elem(win_ptr, op_list_head, curr_op); } else { if (read_flag == 1) { op_list_head = &curr_target->issued_write_op_list_head; - op_list_tail = &curr_target->issued_write_op_list_tail; read_flag = 0; } else { diff --git a/src/mpid/ch3/src/mpid_rma.c b/src/mpid/ch3/src/mpid_rma.c index 65dce1b..b4e5595 100644 --- a/src/mpid/ch3/src/mpid_rma.c +++ b/src/mpid/ch3/src/mpid_rma.c @@ -41,7 +41,7 @@ cvars: MPIU_THREADSAFE_INIT_DECL(initRMAoptions); -MPIDI_RMA_Win_list_t *MPIDI_RMA_Win_list = NULL, *MPIDI_RMA_Win_list_tail = NULL; +MPIDI_RMA_Win_list_t *MPIDI_RMA_Win_list = NULL; static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, MPID_Info * info, MPID_Comm * comm_ptr, MPID_Win ** win_ptr); @@ -286,7 +286,6 @@ static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, (*win_ptr)->current_lock_type = MPID_LOCK_NONE; (*win_ptr)->shared_lock_ref_cnt = 0; (*win_ptr)->target_lock_queue_head = NULL; - (*win_ptr)->target_lock_queue_tail = NULL; (*win_ptr)->shm_allocated = FALSE; (*win_ptr)->states.access_state = MPIDI_RMA_NONE; (*win_ptr)->states.exposure_state = MPIDI_RMA_NONE; @@ -320,11 +319,9 @@ static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, sizeof(MPIDI_RMA_Op_t) * MPIR_CVAR_CH3_RMA_OP_WIN_POOL_SIZE, mpi_errno, "RMA op pool"); (*win_ptr)->op_pool_head = NULL; - (*win_ptr)->op_pool_tail = NULL; for (i = 0; i < MPIR_CVAR_CH3_RMA_OP_WIN_POOL_SIZE; i++) { (*win_ptr)->op_pool_start[i].pool_type = MPIDI_RMA_POOL_WIN; - MPL_LL_APPEND((*win_ptr)->op_pool_head, (*win_ptr)->op_pool_tail, - &((*win_ptr)->op_pool_start[i])); + MPL_DL_APPEND((*win_ptr)->op_pool_head, &((*win_ptr)->op_pool_start[i])); } win_target_pool_size = @@ -333,11 +330,9 @@ static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, sizeof(MPIDI_RMA_Target_t) * win_target_pool_size, mpi_errno, "RMA target pool"); (*win_ptr)->target_pool_head = NULL; - (*win_ptr)->target_pool_tail = NULL; for (i = 0; i < win_target_pool_size; i++) { (*win_ptr)->target_pool_start[i].pool_type = MPIDI_RMA_POOL_WIN; - MPL_LL_APPEND((*win_ptr)->target_pool_head, (*win_ptr)->target_pool_tail, - &((*win_ptr)->target_pool_start[i])); + MPL_DL_APPEND((*win_ptr)->target_pool_head, &((*win_ptr)->target_pool_start[i])); } (*win_ptr)->num_slots = MPIR_MIN(MPIR_CVAR_CH3_RMA_SLOTS_SIZE, MPIR_Comm_size(win_comm_ptr)); @@ -345,7 +340,6 @@ static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, sizeof(MPIDI_RMA_Slot_t) * (*win_ptr)->num_slots, mpi_errno, "RMA slots"); for (i = 0; i < (*win_ptr)->num_slots; i++) { (*win_ptr)->slots[i].target_list_head = NULL; - (*win_ptr)->slots[i].target_list_tail = NULL; } MPIU_CHKPMEM_MALLOC((*win_ptr)->target_lock_entry_pool_start, @@ -354,10 +348,8 @@ static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, MPIR_CVAR_CH3_RMA_TARGET_LOCK_ENTRY_WIN_POOL_SIZE, mpi_errno, "RMA lock entry pool"); (*win_ptr)->target_lock_entry_pool_head = NULL; - (*win_ptr)->target_lock_entry_pool_tail = NULL; for (i = 0; i < MPIR_CVAR_CH3_RMA_TARGET_LOCK_ENTRY_WIN_POOL_SIZE; i++) { - MPL_LL_APPEND((*win_ptr)->target_lock_entry_pool_head, - (*win_ptr)->target_lock_entry_pool_tail, + MPL_DL_APPEND((*win_ptr)->target_lock_entry_pool_head, &((*win_ptr)->target_lock_entry_pool_start[i])); } @@ -371,7 +363,7 @@ static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, if (mpi_errno) MPIU_ERR_POP(mpi_errno); } - MPL_LL_APPEND(MPIDI_RMA_Win_list, MPIDI_RMA_Win_list_tail, win_elem); + MPL_DL_APPEND(MPIDI_RMA_Win_list, win_elem); if (MPIDI_CH3U_Win_hooks.win_init != NULL) { mpi_errno = diff --git a/src/mpid/ch3/src/mpidi_rma.c b/src/mpid/ch3/src/mpidi_rma.c index 3182cfe..a62db0f 100644 --- a/src/mpid/ch3/src/mpidi_rma.c +++ b/src/mpid/ch3/src/mpidi_rma.c @@ -79,10 +79,8 @@ cvars: */ -MPIDI_RMA_Op_t *global_rma_op_pool_head = NULL, *global_rma_op_pool_tail = - NULL, *global_rma_op_pool_start = NULL; -MPIDI_RMA_Target_t *global_rma_target_pool_head = NULL, *global_rma_target_pool_tail = - NULL, *global_rma_target_pool_start = NULL; +MPIDI_RMA_Op_t *global_rma_op_pool_head = NULL, *global_rma_op_pool_start = NULL; +MPIDI_RMA_Target_t *global_rma_target_pool_head = NULL, *global_rma_target_pool_start = NULL; #undef FUNCNAME #define FUNCNAME MPIDI_RMA_init @@ -103,8 +101,7 @@ int MPIDI_RMA_init(void) mpi_errno, "RMA op pool"); for (i = 0; i < MPIR_CVAR_CH3_RMA_OP_GLOBAL_POOL_SIZE; i++) { global_rma_op_pool_start[i].pool_type = MPIDI_RMA_POOL_GLOBAL; - MPL_LL_APPEND(global_rma_op_pool_head, global_rma_op_pool_tail, - &(global_rma_op_pool_start[i])); + MPL_DL_APPEND(global_rma_op_pool_head, &(global_rma_op_pool_start[i])); } MPIU_CHKPMEM_MALLOC(global_rma_target_pool_start, MPIDI_RMA_Target_t *, @@ -112,8 +109,7 @@ int MPIDI_RMA_init(void) mpi_errno, "RMA target pool"); for (i = 0; i < MPIR_CVAR_CH3_RMA_TARGET_GLOBAL_POOL_SIZE; i++) { global_rma_target_pool_start[i].pool_type = MPIDI_RMA_POOL_GLOBAL; - MPL_LL_APPEND(global_rma_target_pool_head, global_rma_target_pool_tail, - &(global_rma_target_pool_start[i])); + MPL_DL_APPEND(global_rma_target_pool_head, &(global_rma_target_pool_start[i])); } fn_exit: @@ -208,7 +204,7 @@ int MPID_Win_free(MPID_Win ** win_ptr) for (win_elem = MPIDI_RMA_Win_list; win_elem && win_elem->win_ptr != *win_ptr; win_elem = win_elem->next); MPIU_ERR_CHKANDJUMP(win_elem == NULL, mpi_errno, MPI_ERR_RMA_SYNC, "**rmasync"); - MPL_LL_DELETE(MPIDI_RMA_Win_list, MPIDI_RMA_Win_list_tail, win_elem); + MPL_DL_DELETE(MPIDI_RMA_Win_list, win_elem); MPIU_Free(win_elem); if (MPIDI_RMA_Win_list == NULL) http://git.mpich.org/mpich.git/commitdiff/225141c377295a2c4c0176faa10bd11560... commit 225141c377295a2c4c0176faa10bd1156098b28e Author: Xin Zhao <[email protected]> Date: Mon Jul 20 10:35:58 2015 -0500 fix name in state decl Signed-off-by: Pavan Balaji <[email protected]> diff --git a/src/mpid/ch3/include/mpid_rma_issue.h b/src/mpid/ch3/include/mpid_rma_issue.h index c2f8834..c9e01a3 100644 --- a/src/mpid/ch3/include/mpid_rma_issue.h +++ b/src/mpid/ch3/include/mpid_rma_issue.h @@ -107,8 +107,8 @@ static int init_accum_ext_pkt(MPIDI_CH3_Pkt_flags_t flags, void *dataloop_ptr = NULL; int mpi_errno = MPI_SUCCESS; - MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_INIT_ACCUM_EXT_PKT); - MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_CH3_INIT_ACCUM_EXT_PKT); + MPIDI_STATE_DECL(MPID_STATE_INIT_ACCUM_EXT_PKT); + MPIDI_FUNC_ENTER(MPID_STATE_INIT_ACCUM_EXT_PKT); if ((flags & MPIDI_CH3_PKT_FLAG_RMA_STREAM) && target_dtp != NULL) { MPIDI_CH3_Ext_pkt_accum_stream_derived_t *_ext_hdr_ptr = NULL; @@ -168,7 +168,7 @@ static int init_accum_ext_pkt(MPIDI_CH3_Pkt_flags_t flags, (*ext_hdr_sz) = _total_sz; fn_exit: - MPIDI_FUNC_EXIT(MPID_STATE_MPIDI_CH3_INIT_ACCUM_EXT_PKT); + MPIDI_FUNC_EXIT(MPID_STATE_INIT_ACCUM_EXT_PKT); return mpi_errno; fn_fail: if ((*ext_hdr_ptr)) @@ -188,8 +188,8 @@ static int init_get_accum_ext_pkt(MPIDI_CH3_Pkt_flags_t flags, { int mpi_errno = MPI_SUCCESS; - MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_INIT_GET_ACCUM_EXT_PKT); - MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_CH3_INIT_GET_ACCUM_EXT_PKT); + MPIDI_STATE_DECL(MPID_STATE_INIT_GET_ACCUM_EXT_PKT); + MPIDI_FUNC_ENTER(MPID_STATE_INIT_GET_ACCUM_EXT_PKT); /* Check if get_accum still reuses accum' extended packet header. */ MPIU_Assert(sizeof(MPIDI_CH3_Ext_pkt_accum_stream_derived_t) == @@ -201,7 +201,7 @@ static int init_get_accum_ext_pkt(MPIDI_CH3_Pkt_flags_t flags, mpi_errno = init_accum_ext_pkt(flags, target_dtp, stream_offset, ext_hdr_ptr, ext_hdr_sz); - MPIDI_FUNC_EXIT(MPID_STATE_MPIDI_CH3_INIT_GET_ACCUM_EXT_PKT); + MPIDI_FUNC_EXIT(MPID_STATE_INIT_GET_ACCUM_EXT_PKT); return mpi_errno; } ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/include/mpid_rma_issue.h | 12 +++--- src/mpid/ch3/include/mpid_rma_lockqueue.h | 6 +-- src/mpid/ch3/include/mpid_rma_oplist.h | 57 ++++++++++++----------------- src/mpid/ch3/include/mpid_rma_types.h | 15 +++++--- src/mpid/ch3/include/mpidpre.h | 5 --- src/mpid/ch3/include/mpidrma.h | 23 ++++++------ src/mpid/ch3/src/ch3u_handle_recv_req.c | 6 +-- src/mpid/ch3/src/ch3u_rma_progress.c | 25 +++++-------- src/mpid/ch3/src/mpid_rma.c | 20 +++------- src/mpid/ch3/src/mpidi_rma.c | 18 ++++------ 10 files changed, 76 insertions(+), 111 deletions(-) hooks/post-receive -- MPICH primary repository