[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2-171-g14c326b

[Service Account]

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  14c326b77674d7215fc32d809a21048ebfcded6f (commit)
      from  14f0484f8f1d5db44c81d26c9e366f6008aab40e (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/14c326b77674d7215fc32d809a21048ebfcded6f

commit 14c326b77674d7215fc32d809a21048ebfcded6f
Author: Yanfei Guo <yguo at anl.gov>
Date:   Wed Dec 9 10:52:53 2015 -0600

    Make string CVAR case-insensitive
    
    This patch fix ticket #2206. Currently, MPIR_CVAR_NEMESIS_NETMOD is
    case-insensitive while MPIR_CVAR_DEFAULT_THREAD_LEVEL is not.  Replace
    strcmp with strcasecmp for MPIR_CVAR_DEFAULT_THREAD_LEVEL to make the
    comparison case-insensitive. Other CVAR of string type does not need to
    be case-insensitive as they are for path and interface names.
    
    Updating the description of case-insensitive CVARs.
    
    Signed-off-by: Pavan Balaji <balaji at anl.gov>

diff --git a/src/mpi/init/init.c b/src/mpi/init/init.c
index 5a43852..00ccf01 100644
--- a/src/mpi/init/init.c
+++ b/src/mpi/init/init.c
@@ -4,6 +4,8 @@
  *      See COPYRIGHT in top-level directory.
  */
 
+#include <strings.h>
+
 #include "mpiimpl.h"
 #include "mpi_init.h"
 
@@ -44,7 +46,8 @@ cvars:
       verbosity   : MPI_T_VERBOSITY_USER_BASIC
       scope       : MPI_T_SCOPE_ALL_EQ
       description : >-
-        Sets the default thread level to use when using MPI_INIT.
+        Sets the default thread level to use when using MPI_INIT. This variable
+        is case-insensitive.
 
 === END_MPI_T_CVAR_INFO_BLOCK ===
 */
@@ -154,13 +157,13 @@ int MPI_Init( int *argc, char ***argv )
 
     MPIR_T_env_init();
 
-    if (!strcmp(MPIR_CVAR_DEFAULT_THREAD_LEVEL, "MPI_THREAD_MULTIPLE"))
+    if (!strcasecmp(MPIR_CVAR_DEFAULT_THREAD_LEVEL, "MPI_THREAD_MULTIPLE"))
         threadLevel = MPI_THREAD_MULTIPLE;
-    else if (!strcmp(MPIR_CVAR_DEFAULT_THREAD_LEVEL, "MPI_THREAD_SERIALIZED"))
+    else if (!strcasecmp(MPIR_CVAR_DEFAULT_THREAD_LEVEL, "MPI_THREAD_SERIALIZED"))
         threadLevel = MPI_THREAD_SERIALIZED;
-    else if (!strcmp(MPIR_CVAR_DEFAULT_THREAD_LEVEL, "MPI_THREAD_FUNNELED"))
+    else if (!strcasecmp(MPIR_CVAR_DEFAULT_THREAD_LEVEL, "MPI_THREAD_FUNNELED"))
         threadLevel = MPI_THREAD_FUNNELED;
-    else if (!strcmp(MPIR_CVAR_DEFAULT_THREAD_LEVEL, "MPI_THREAD_SINGLE"))
+    else if (!strcasecmp(MPIR_CVAR_DEFAULT_THREAD_LEVEL, "MPI_THREAD_SINGLE"))
         threadLevel = MPI_THREAD_SINGLE;
     else {
         MPL_error_printf("Unrecognized thread level %s\n", MPIR_CVAR_DEFAULT_THREAD_LEVEL);
diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_network.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_network.c
index 636ffa1..1f5cc31 100644
--- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_network.c
+++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_network.c
@@ -22,7 +22,7 @@ cvars:
       scope       : MPI_T_SCOPE_ALL_EQ
       description : >-
         If non-empty, this cvar specifies which network module
-        should be used for communication.
+        should be used for communication. This variable is case-insensitive.
 
 === END_MPI_T_CVAR_INFO_BLOCK ===
 */

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

Summary of changes:
 src/mpi/init/init.c                                |   13 ++++++++-----
 .../ch3/channels/nemesis/src/mpid_nem_network.c    |    2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
MPICH primary repository