[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1.3-157-gd69855f
Service Account
noreply at mpich.org
Fri Nov 7 12:42:57 CST 2014
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 d69855feff25ccc0a7b2cd9292454425613e03a8 (commit)
via a4223bc3688d8b9fb6b4d39d223096e6a14c8085 (commit)
from 848a0f312ef9418aa2bca4d63464b71441c59beb (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/d69855feff25ccc0a7b2cd9292454425613e03a8
commit d69855feff25ccc0a7b2cd9292454425613e03a8
Author: Xin Zhao <xinzhao3 at illinois.edu>
Date: Thu Nov 6 17:19:06 2014 -0600
Bug-fix: unset progress flag in branch that does not make progress.
Signed-off-by: Min Si <msi at il.is.s.u-tokyo.ac.jp>
diff --git a/src/mpid/ch3/src/ch3u_rma_oplist.c b/src/mpid/ch3/src/ch3u_rma_oplist.c
index 10bc147..5c06650 100644
--- a/src/mpid/ch3/src/ch3u_rma_oplist.c
+++ b/src/mpid/ch3/src/ch3u_rma_oplist.c
@@ -237,6 +237,8 @@ static inline int issue_ops_target(MPID_Win * win_ptr, MPIDI_RMA_Target_t *targe
mpi_errno = send_flush_msg(target->target_rank, win_ptr);
if (mpi_errno != MPI_SUCCESS) MPIU_ERR_POP(mpi_errno);
}
+ (*made_progress) = 1;
+ goto finish_issue;
}
else if (target->sync.sync_flag == MPIDI_RMA_SYNC_UNLOCK) {
if (target->target_rank == rank) {
@@ -249,9 +251,9 @@ static inline int issue_ops_target(MPID_Win * win_ptr, MPIDI_RMA_Target_t *targe
mpi_errno = send_unlock_msg(target->target_rank, win_ptr);
if (mpi_errno != MPI_SUCCESS) MPIU_ERR_POP(mpi_errno);
}
+ (*made_progress) = 1;
+ goto finish_issue;
}
- (*made_progress) = 1;
- goto finish_issue;
}
/* Issue out operations in the list. */
http://git.mpich.org/mpich.git/commitdiff/a4223bc3688d8b9fb6b4d39d223096e6a14c8085
commit a4223bc3688d8b9fb6b4d39d223096e6a14c8085
Author: Xin Zhao <xinzhao3 at illinois.edu>
Date: Thu Nov 6 16:29:57 2014 -0600
Move definition of global window counters to nemesis / sock.
num_active_issued_win and num_passive_win are counters of
windows in active ISSUED mode and in passive mode.
It is modified in CH3 and is used in progress engine of
nemesis / sock to skip windows that do not need to make
progress on. Here we define them in mpidi_ch3_pre.h in
nemesis / sock so that they can be exposed to upper layers.
Signed-off-by: Min Si <msi at il.is.s.u-tokyo.ac.jp>
diff --git a/src/mpid/ch3/channels/nemesis/include/mpid_nem_inline.h b/src/mpid/ch3/channels/nemesis/include/mpid_nem_inline.h
index f858ac3..4d2dadd 100644
--- a/src/mpid/ch3/channels/nemesis/include/mpid_nem_inline.h
+++ b/src/mpid/ch3/channels/nemesis/include/mpid_nem_inline.h
@@ -16,8 +16,6 @@
extern int MPID_nem_lmt_shm_pending;
extern MPID_nem_cell_ptr_t MPID_nem_prefetched_cell;
-extern int num_active_issued_win;
-extern int num_passive_win;
static inline int MPID_nem_mpich_send_header (void* buf, int size, MPIDI_VC_t *vc, int *again);
static inline int MPID_nem_mpich_sendv (MPID_IOV **iov, int *n_iov, MPIDI_VC_t *vc, int *again);
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 96c43f9..8ab69cb 100644
--- a/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_pre.h
+++ b/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_pre.h
@@ -228,6 +228,8 @@ MPIDI_CH3I_Progress_state;
#define MPIDI_CH3_PROGRESS_STATE_DECL MPIDI_CH3I_Progress_state ch;
extern OPA_int_t MPIDI_CH3I_progress_completion_count;
+extern int num_active_issued_win, num_passive_win;
+
#define MPIDI_CH3I_INCR_PROGRESS_COMPLETION_COUNT do { \
OPA_write_barrier(); \
OPA_incr_int(&MPIDI_CH3I_progress_completion_count); \
diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_progress.c b/src/mpid/ch3/channels/nemesis/src/ch3_progress.c
index 569cfa1..21fb2d2 100644
--- a/src/mpid/ch3/channels/nemesis/src/ch3_progress.c
+++ b/src/mpid/ch3/channels/nemesis/src/ch3_progress.c
@@ -46,6 +46,7 @@ extern MPID_Request ** const MPID_Recvq_unexpected_tail_ptr;
#endif
OPA_int_t MPIDI_CH3I_progress_completion_count = OPA_INT_T_INITIALIZER(0);
+int num_active_issued_win = 0, num_passive_win = 0;
/* NEMESIS MULTITHREADING: Extra Data Structures Added */
#ifdef MPICH_IS_THREADED
diff --git a/src/mpid/ch3/channels/sock/include/mpidi_ch3_impl.h b/src/mpid/ch3/channels/sock/include/mpidi_ch3_impl.h
index e1689c9..71475dc 100644
--- a/src/mpid/ch3/channels/sock/include/mpidi_ch3_impl.h
+++ b/src/mpid/ch3/channels/sock/include/mpidi_ch3_impl.h
@@ -10,9 +10,6 @@
#include "mpidimpl.h"
#include "ch3usock.h"
-extern int num_active_issued_win;
-extern int num_passive_win;
-
/* This is all socket connection definitions */
/* MT - not thread safe! */
diff --git a/src/mpid/ch3/channels/sock/include/mpidi_ch3_pre.h b/src/mpid/ch3/channels/sock/include/mpidi_ch3_pre.h
index c0d43ad..ad8b39b 100644
--- a/src/mpid/ch3/channels/sock/include/mpidi_ch3_pre.h
+++ b/src/mpid/ch3/channels/sock/include/mpidi_ch3_pre.h
@@ -79,6 +79,7 @@ MPIDI_CH3I_Progress_state;
and must be available to the routines in src/mpi */
extern volatile unsigned int MPIDI_CH3I_progress_completion_count;
+extern int num_active_issued_win, num_passive_win;
/* MPICH_IS_THREADED isn't defined yet (handled by mpiimplthread.h) */
#if (MPICH_THREAD_LEVEL == MPI_THREAD_MULTIPLE)
diff --git a/src/mpid/ch3/channels/sock/src/ch3_progress.c b/src/mpid/ch3/channels/sock/src/ch3_progress.c
index ead5e47..6c649db 100644
--- a/src/mpid/ch3/channels/sock/src/ch3_progress.c
+++ b/src/mpid/ch3/channels/sock/src/ch3_progress.c
@@ -22,6 +22,8 @@ static int MPIDI_CH3i_Progress_test(void);
/* FIXME: Move thread stuff into some set of abstractions in order to remove
ifdefs */
volatile unsigned int MPIDI_CH3I_progress_completion_count = 0;
+int num_active_issued_win = 0, num_passive_win = 0;
+
#ifdef MPICH_IS_THREADED
volatile int MPIDI_CH3I_progress_blocked = FALSE;
volatile int MPIDI_CH3I_progress_wakeup_signalled = FALSE;
diff --git a/src/mpid/ch3/include/mpid_rma_oplist.h b/src/mpid/ch3/include/mpid_rma_oplist.h
index 45dec03..7d5b58c 100644
--- a/src/mpid/ch3/include/mpid_rma_oplist.h
+++ b/src/mpid/ch3/include/mpid_rma_oplist.h
@@ -18,8 +18,6 @@ int MPIDI_CH3I_RMA_Make_progress_win(MPID_Win * win_ptr, int *made_progress);
extern struct MPIDI_RMA_Op *global_rma_op_pool, *global_rma_op_pool_tail, *global_rma_op_pool_start;
extern struct MPIDI_RMA_Target *global_rma_target_pool, *global_rma_target_pool_tail, *global_rma_target_pool_start;
-extern int num_active_issued_win;
-extern int num_passive_win;
MPIR_T_PVAR_DOUBLE_TIMER_DECL_EXTERN(RMA, rma_rmaqueue_alloc);
diff --git a/src/mpid/ch3/src/mpid_rma.c b/src/mpid/ch3/src/mpid_rma.c
index 210be92..83a5b35 100644
--- a/src/mpid/ch3/src/mpid_rma.c
+++ b/src/mpid/ch3/src/mpid_rma.c
@@ -30,8 +30,6 @@ cvars:
MPIU_THREADSAFE_INIT_DECL(initRMAoptions);
MPIDI_RMA_Win_list_t *MPIDI_RMA_Win_list = NULL, *MPIDI_RMA_Win_list_tail = NULL;
-int num_active_issued_win = 0;
-int num_passive_win = 0;
static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model,
MPID_Comm * comm_ptr, MPID_Win ** win_ptr);
-----------------------------------------------------------------------
Summary of changes:
.../ch3/channels/nemesis/include/mpid_nem_inline.h | 2 --
.../ch3/channels/nemesis/include/mpidi_ch3_pre.h | 2 ++
src/mpid/ch3/channels/nemesis/src/ch3_progress.c | 1 +
.../ch3/channels/sock/include/mpidi_ch3_impl.h | 3 ---
src/mpid/ch3/channels/sock/include/mpidi_ch3_pre.h | 1 +
src/mpid/ch3/channels/sock/src/ch3_progress.c | 2 ++
src/mpid/ch3/include/mpid_rma_oplist.h | 2 --
src/mpid/ch3/src/ch3u_rma_oplist.c | 6 ++++--
src/mpid/ch3/src/mpid_rma.c | 2 --
9 files changed, 10 insertions(+), 11 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list