[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b4-131-g856802f
Service Account
noreply at mpich.org
Sun Aug 16 18:49:27 CDT 2015
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 856802f0b035301eb8c16b92cbdfef9a59a2d65f (commit)
via 114d97887d40e5f1448b7c1d382a6c22a4bfa468 (commit)
via 924ea84be19734285324c74282160e0626021bdb (commit)
via 0cf7410f1285de9c33fe3a97936ce3fab653de67 (commit)
from 1824f816119012e0ca94a1d293f27d56c60bec70 (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/856802f0b035301eb8c16b92cbdfef9a59a2d65f
commit 856802f0b035301eb8c16b92cbdfef9a59a2d65f
Author: Xin Zhao <xinzhao3 at illinois.edu>
Date: Thu Aug 13 10:35:38 2015 -0500
Set MAX_PROGRESS_HOOKS to 4 to reduce overhead of progress engine.
Signed-off-by: Pavan Balaji <balaji at anl.gov>
diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_progress.c b/src/mpid/ch3/channels/nemesis/src/ch3_progress.c
index 5b2758c..e3c80aa 100644
--- a/src/mpid/ch3/channels/nemesis/src/ch3_progress.c
+++ b/src/mpid/ch3/channels/nemesis/src/ch3_progress.c
@@ -84,7 +84,7 @@ typedef struct qn_ent
static qn_ent_t *qn_head = NULL;
-#define MAX_PROGRESS_HOOKS 16
+#define MAX_PROGRESS_HOOKS 4
typedef int (*progress_func_ptr_t) (int* made_progress);
typedef struct progress_hook_slot {
diff --git a/src/mpid/ch3/channels/sock/src/ch3_progress.c b/src/mpid/ch3/channels/sock/src/ch3_progress.c
index bbbccf2..460c81f 100644
--- a/src/mpid/ch3/channels/sock/src/ch3_progress.c
+++ b/src/mpid/ch3/channels/sock/src/ch3_progress.c
@@ -45,7 +45,7 @@ static inline int connection_post_recv_pkt(MPIDI_CH3I_Connection_t * conn);
static int adjust_iov(MPL_IOV ** iovp, int * countp, MPIU_Size_t nb);
-#define MAX_PROGRESS_HOOKS 16
+#define MAX_PROGRESS_HOOKS 4
typedef int (*progress_func_ptr_t) (int* made_progress);
typedef struct progress_hook_slot {
diff --git a/src/mpid/pamid/src/mpid_progress.c b/src/mpid/pamid/src/mpid_progress.c
index 8b6d88a..6f28d76 100644
--- a/src/mpid/pamid/src/mpid_progress.c
+++ b/src/mpid/pamid/src/mpid_progress.c
@@ -21,7 +21,7 @@
*/
#include <mpidimpl.h>
-#define MAX_PROGRESS_HOOKS 16
+#define MAX_PROGRESS_HOOKS 4
typedef int (*progress_func_ptr_t) (int* made_progress);
typedef struct progress_hook_slot {
http://git.mpich.org/mpich.git/commitdiff/114d97887d40e5f1448b7c1d382a6c22a4bfa468
commit 114d97887d40e5f1448b7c1d382a6c22a4bfa468
Author: Xin Zhao <xinzhao3 at illinois.edu>
Date: Thu Aug 13 10:34:21 2015 -0500
Revert "Add missed optimization for sock and pamid."
This reverts commit 98d4b47ab463e3371c372e6621a72ca244d547bf.
Signed-off-by: Pavan Balaji <balaji at anl.gov>
diff --git a/src/mpid/ch3/channels/sock/src/ch3_progress.c b/src/mpid/ch3/channels/sock/src/ch3_progress.c
index e6b4f2f..bbbccf2 100644
--- a/src/mpid/ch3/channels/sock/src/ch3_progress.c
+++ b/src/mpid/ch3/channels/sock/src/ch3_progress.c
@@ -54,7 +54,6 @@ typedef struct progress_hook_slot {
} progress_hook_slot_t;
static progress_hook_slot_t progress_hooks[MAX_PROGRESS_HOOKS];
-static int total_progress_hook_cnt = 0; /* Keep track of how many progress hooks are currently activated */
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3i_Progress_test
@@ -66,7 +65,6 @@ static int MPIDI_CH3i_Progress_test(void)
int mpi_errno = MPI_SUCCESS;
int made_progress;
int i;
- int called_progress_hook_cnt;
MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_PROGRESS_TEST);
MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_CH3I_PROGRESS_TEST);
@@ -98,16 +96,11 @@ static int MPIDI_CH3i_Progress_test(void)
}
# endif
- called_progress_hook_cnt = 0;
for (i = 0; i < MAX_PROGRESS_HOOKS; i++) {
if (progress_hooks[i].active == TRUE) {
MPIU_Assert(progress_hooks[i].func_ptr != NULL);
mpi_errno = progress_hooks[i].func_ptr(&made_progress);
if (mpi_errno) MPIR_ERR_POP(mpi_errno);
-
- called_progress_hook_cnt++;
- if (called_progress_hook_cnt == total_progress_hook_cnt)
- break;
}
}
@@ -199,9 +192,7 @@ static int MPIDI_CH3i_Progress_wait(MPID_Progress_state * progress_state)
{
int made_progress = FALSE;
int i;
- int called_progress_hook_cnt;
- called_progress_hook_cnt = 0;
for (i = 0; i < MAX_PROGRESS_HOOKS; i++) {
if (progress_hooks[i].active == TRUE) {
MPIU_Assert(progress_hooks[i].func_ptr != NULL);
@@ -211,10 +202,6 @@ static int MPIDI_CH3i_Progress_wait(MPID_Progress_state * progress_state)
MPIDI_CH3_Progress_signal_completion();
break; /* break the for loop */
}
-
- called_progress_hook_cnt++;
- if (called_progress_hook_cnt == total_progress_hook_cnt)
- break;
}
}
if (made_progress) break; /* break the do loop */
@@ -1058,9 +1045,6 @@ int MPIDI_CH3I_Progress_activate_hook(int id)
progress_hooks[id].active == FALSE && progress_hooks[id].func_ptr != NULL);
progress_hooks[id].active = TRUE;
- total_progress_hook_cnt++;
- MPIU_Assert(total_progress_hook_cnt <= MAX_PROGRESS_HOOKS);
-
fn_exit:
MPID_THREAD_CS_EXIT(POBJ, MPIR_THREAD_GLOBAL_MUTEX);
MPIDI_FUNC_EXIT(MPID_STATE_MPIDI_CH3I_PROGRESS_ACTIVATE_HOOK);
@@ -1087,9 +1071,6 @@ int MPIDI_CH3I_Progress_deactivate_hook(int id)
progress_hooks[id].active == TRUE && progress_hooks[id].func_ptr != NULL);
progress_hooks[id].active = FALSE;
- total_progress_hook_cnt--;
- MPIU_Assert(total_progress_hook_cnt >= 0);
-
fn_exit:
MPID_THREAD_CS_EXIT(POBJ, MPIR_THREAD_GLOBAL_MUTEX);
MPIDI_FUNC_EXIT(MPID_STATE_MPIDI_CH3I_PROGRESS_DEACTIVATE_HOOK);
diff --git a/src/mpid/pamid/src/mpid_progress.c b/src/mpid/pamid/src/mpid_progress.c
index c47c642..8b6d88a 100644
--- a/src/mpid/pamid/src/mpid_progress.c
+++ b/src/mpid/pamid/src/mpid_progress.c
@@ -30,7 +30,6 @@ typedef struct progress_hook_slot {
} progress_hook_slot_t;
static progress_hook_slot_t progress_hooks[MAX_PROGRESS_HOOKS];
-static int total_progress_hook_cnt = 0; /* Keep track of how many progress hooks are currently activated */
#undef FUNCNAME
#define FUNCNAME MPIDI_Progress_register_hook
@@ -112,9 +111,6 @@ int MPIDI_CH3I_Progress_activate_hook(int id)
progress_hooks[id].active == FALSE && progress_hooks[id].func_ptr != NULL);
progress_hooks[id].active = TRUE;
- total_progress_hook_cnt++;
- MPIU_Assert(total_progress_hook_cnt <= MAX_PROGRESS_HOOKS);
-
fn_exit:
MPIU_THREAD_CS_EXIT(MPIDCOMM,);
MPIDI_FUNC_EXIT(MPID_STATE_MPIDI_CH3I_PROGRESS_ACTIVATE_HOOK);
@@ -141,9 +137,6 @@ int MPIDI_CH3I_Progress_deactivate_hook(int id)
progress_hooks[id].active == TRUE && progress_hooks[id].func_ptr != NULL);
progress_hooks[id].active = FALSE;
- total_progress_hook_cnt--;
- MPIU_Assert(total_progress_hook_cnt >= 0);
-
fn_exit:
MPIU_THREAD_CS_EXIT(MPIDCOMM,);
MPIDI_FUNC_EXIT(MPID_STATE_MPIDI_CH3I_PROGRESS_DEACTIVATE_HOOK);
@@ -294,7 +287,6 @@ MPIDI_Progress_async_poll (pami_context_t context, void *cookie)
pami_result_t rc;
int loop_count=100;
int i, made_progress;
- int called_progress_hook_cnt;
/* In the "global" mpich lock mode all application threads must acquire the
* ALLFUNC global lock upon entry to the API. The async progress thread
@@ -304,15 +296,10 @@ MPIDI_Progress_async_poll (pami_context_t context, void *cookie)
*/
if (MPIU_THREAD_CS_TRY(ALLFUNC,)) /* (0==try_acquire(0)) */
{
- called_progress_hook_cnt = 0;
for (i = 0; i < MAX_PROGRESS_HOOKS; i++) {
if (progress_hooks[i].active == TRUE) {
MPIU_Assert(progress_hooks[i].func_ptr != NULL);
progress_hooks[i].func_ptr(&made_progress);
-
- called_progress_hook_cnt++;
- if (called_progress_hook_cnt == total_progress_hook_cnt)
- break;
}
}
@@ -340,16 +327,11 @@ MPIDI_Progress_async_poll_perobj (pami_context_t context, void *cookie)
pami_result_t rc;
int loop_count=100;
int i, made_progress;
- int called_progress_hook_cnt = 0;
for (i = 0; i < MAX_PROGRESS_HOOKS; i++) {
if (progress_hooks[i].active == TRUE) {
MPIU_Assert(progress_hooks[i].func_ptr != NULL);
progress_hooks[i].func_ptr(&made_progress);
-
- called_progress_hook_cnt++;
- if (called_progress_hook_cnt == total_progress_hook_cnt)
- break;
}
}
http://git.mpich.org/mpich.git/commitdiff/924ea84be19734285324c74282160e0626021bdb
commit 924ea84be19734285324c74282160e0626021bdb
Author: Xin Zhao <xinzhao3 at illinois.edu>
Date: Thu Aug 13 10:31:18 2015 -0500
Revert "Keep track of how many progress hooks are currently registered."
This reverts commit 4551de14b1d752a9c7be49df4a9e70776addd02f.
Signed-off-by: Pavan Balaji <balaji at anl.gov>
diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_progress.c b/src/mpid/ch3/channels/nemesis/src/ch3_progress.c
index b2e5d21..5b2758c 100644
--- a/src/mpid/ch3/channels/nemesis/src/ch3_progress.c
+++ b/src/mpid/ch3/channels/nemesis/src/ch3_progress.c
@@ -93,7 +93,6 @@ typedef struct progress_hook_slot {
} progress_hook_slot_t;
static progress_hook_slot_t progress_hooks[MAX_PROGRESS_HOOKS];
-static int total_progress_hook_cnt = 0; /* Keep track of how many progress hooks are currently activated */
#ifdef HAVE_SIGNAL
static void sigusr1_handler(int sig)
@@ -374,9 +373,6 @@ int MPIDI_CH3I_Progress_activate_hook(int id)
progress_hooks[id].active == FALSE && progress_hooks[id].func_ptr != NULL);
progress_hooks[id].active = TRUE;
- total_progress_hook_cnt++;
- MPIU_Assert(total_progress_hook_cnt <= MAX_PROGRESS_HOOKS);
-
fn_exit:
MPID_THREAD_CS_EXIT(POBJ, MPIR_THREAD_GLOBAL_MUTEX);
MPIDI_FUNC_EXIT(MPID_STATE_MPIDI_CH3I_PROGRESS_ACTIVATE_HOOK);
@@ -403,9 +399,6 @@ int MPIDI_CH3I_Progress_deactivate_hook(int id)
progress_hooks[id].active == TRUE && progress_hooks[id].func_ptr != NULL);
progress_hooks[id].active = FALSE;
- total_progress_hook_cnt--;
- MPIU_Assert(total_progress_hook_cnt >= 0);
-
fn_exit:
MPID_THREAD_CS_EXIT(POBJ, MPIR_THREAD_GLOBAL_MUTEX);
MPIDI_FUNC_EXIT(MPID_STATE_MPIDI_CH3I_PROGRESS_DEACTIVATE_HOOK);
@@ -499,7 +492,6 @@ int MPIDI_CH3I_Progress (MPID_Progress_state *progress_state, int is_blocking)
int in_fbox = 0;
MPIDI_VC_t *vc;
int i;
- int called_progress_hook_cnt = 0;
do /* receive progress */
{
@@ -599,7 +591,6 @@ int MPIDI_CH3I_Progress (MPID_Progress_state *progress_state, int is_blocking)
if (mpi_errno) MPIR_ERR_POP(mpi_errno);
}
- called_progress_hook_cnt = 0;
for (i = 0; i < MAX_PROGRESS_HOOKS; i++) {
if (progress_hooks[i].active == TRUE) {
MPIU_Assert(progress_hooks[i].func_ptr != NULL);
@@ -607,10 +598,6 @@ int MPIDI_CH3I_Progress (MPID_Progress_state *progress_state, int is_blocking)
if (mpi_errno) MPIR_ERR_POP(mpi_errno);
if (made_progress)
MPIDI_CH3_Progress_signal_completion();
-
- called_progress_hook_cnt++;
- if (called_progress_hook_cnt == total_progress_hook_cnt)
- break;
}
}
http://git.mpich.org/mpich.git/commitdiff/0cf7410f1285de9c33fe3a97936ce3fab653de67
commit 0cf7410f1285de9c33fe3a97936ce3fab653de67
Author: Xin Zhao <xinzhao3 at illinois.edu>
Date: Sun Aug 16 10:35:22 2015 -0500
Increase time limit of some GACC-based RMA tests to 4 min.
Same with 6f020c71b5f6349b3b616280ba9c24ed7988de40.
Signed-off-by: Pavan Balaji <balaji at anl.gov>
diff --git a/test/mpi/rma/testlist.in b/test/mpi/rma/testlist.in
index de7b025..3f1c6a5 100644
--- a/test/mpi/rma/testlist.in
+++ b/test/mpi/rma/testlist.in
@@ -31,12 +31,12 @@ lockopts 2
lock_dt 2
lock_dt_flush 2
lock_dt_flushlocal 2
-lockall_dt 4
+lockall_dt 4 timeLimit=240
lockall_dt_flush 4 timeLimit=240
lockall_dt_flushall 4 timeLimit=240
lockall_dt_flushlocal 4 timeLimit=240
lockall_dt_flushlocalall 4 timeLimit=240
-lock_contention_dt 4
+lock_contention_dt 4 timeLimit=240
transpose4 2
fetchandadd 7
fetchandadd_tree 7
-----------------------------------------------------------------------
Summary of changes:
src/mpid/ch3/channels/nemesis/src/ch3_progress.c | 15 +--------------
src/mpid/ch3/channels/sock/src/ch3_progress.c | 21 +--------------------
src/mpid/pamid/src/mpid_progress.c | 20 +-------------------
test/mpi/rma/testlist.in | 4 ++--
4 files changed, 5 insertions(+), 55 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list