[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.0.4-338-g828b0b4

[mysql vizuser]

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  828b0b4d46f0a499560123f2f3797b197c07abea (commit)
      from  7d44307f269cae96118beb19760221aff99bd74a (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/828b0b4d46f0a499560123f2f3797b197c07abea

commit 828b0b4d46f0a499560123f2f3797b197c07abea
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date:   Tue Jul 16 12:25:43 2013 -0500

    Correct bad parameter names.
    
    We were using MPIR_PARAM_NEMESIS_ENABLE_CKPOINT in some cases and
    MPIR_PARAM_ENABLE_CKPOINT in some cases.  This patch makes the names
    consistent.
    
    Signed-off-by: Ken Raffenetti <raffenet at mcs.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 19810fe..4535325 100644
--- a/src/mpid/ch3/channels/nemesis/src/ch3_progress.c
+++ b/src/mpid/ch3/channels/nemesis/src/ch3_progress.c
@@ -310,7 +310,7 @@ int MPIDI_CH3I_Progress (MPID_Progress_state *progress_state, int is_blocking)
     }
     
 #ifdef ENABLE_CHECKPOINTING
-    if (MPIR_PARAM_ENABLE_CKPOINT) {
+    if (MPIR_PARAM_NEMESIS_ENABLE_CKPOINT) {
         if (MPIDI_nem_ckpt_start_checkpoint) {
             MPIDI_nem_ckpt_start_checkpoint = FALSE;
             mpi_errno = MPIDI_nem_ckpt_start();
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 e45eb20..1f74e85 100644
--- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_ckpt.c
+++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_ckpt.c
@@ -146,7 +146,7 @@ int MPIDI_nem_ckpt_init(void)
 
     MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_NEM_CKPT_INIT);
 
-    if (!MPIR_PARAM_ENABLE_CKPOINT)
+    if (!MPIR_PARAM_NEMESIS_ENABLE_CKPOINT)
         goto fn_exit;
     
     client_id = cr_init();
diff --git a/src/pm/hydra/ui/mpich/utils.c b/src/pm/hydra/ui/mpich/utils.c
index f012374..2a10515 100644
--- a/src/pm/hydra/ui/mpich/utils.c
+++ b/src/pm/hydra/ui/mpich/utils.c
@@ -1742,7 +1742,7 @@ HYD_status HYD_uii_mpx_get_parameters(char **t_argv)
     /* If the user set the checkpoint prefix, set env var to enable
      * checkpointing on the processes  */
     if (HYD_server_info.user_global.ckpoint_prefix)
-        HYDU_append_env_to_list("MPIR_PARAM_ENABLE_CKPOINT", "1",
+        HYDU_append_env_to_list("MPIR_PARAM_NEMESIS_ENABLE_CKPOINT", "1",
                                 &HYD_server_info.user_global.global_env.system);
 
     /* Preset common environment options for disabling STDIO buffering

-----------------------------------------------------------------------

Summary of changes:
 src/mpid/ch3/channels/nemesis/src/ch3_progress.c  |    2 +-
 src/mpid/ch3/channels/nemesis/src/mpid_nem_ckpt.c |    2 +-
 src/pm/hydra/ui/mpich/utils.c                     |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
MPICH primary repository