[mpich2-commits] r6696 - in mpich2/trunk: maint src/util/param

[goodell at mcs.anl.gov]

Author: goodell
Date: 2010-05-20 22:34:37 -0500 (Thu, 20 May 2010)
New Revision: 6696

Modified:
   mpich2/trunk/maint/genparams
   mpich2/trunk/src/util/param/params.yml
Log:
use the MPICH namespace by default as well as MPIR_PARAM

No reviewer.

Modified: mpich2/trunk/maint/genparams
===================================================================
--- mpich2/trunk/maint/genparams	2010-05-21 03:34:34 UTC (rev 6695)
+++ mpich2/trunk/maint/genparams	2010-05-21 03:34:37 UTC (rev 6696)
@@ -33,6 +33,9 @@
 
 # namespace prefix for variable and type names
 my $ns = "MPIR_Param";
+# an alternative namespace used for environment variables, unused if set
+# to ""
+my $alt_ns = "MPICH";
 
 # parameter description file
 my $param_file = "src/util/param/params.yml";
@@ -45,6 +48,7 @@
     "help!"       => \&print_usage_and_exit,
     "debug!"      => \$debug,
     "namespace=s" => \$ns,
+    "alt-namespace=s" => \$alt_ns,
     "param-file"  => \$param_file,
     "header=s"    => \$header_file,
     "c-file=s"    => \$c_file,
@@ -315,7 +319,9 @@
 
     # process extra envs first so the primary always wins
     push @env_names, @{$p->{'abs-alt-env'}} if $p->{'abs-alt-env'};
+    push @env_names, map { "${alt_ns}_$_" } @{$p->{'alt-env'}};
     push @env_names, map { "${uc_ns}_$_" } @{$p->{'alt-env'}};
+    push @env_names, "${alt_ns}_" . $p->{name};
     push @env_names, "${uc_ns}_" . $p->{name};
 
     foreach my $env_name (@env_names) {

Modified: mpich2/trunk/src/util/param/params.yml
===================================================================
--- mpich2/trunk/src/util/param/params.yml	2010-05-21 03:34:34 UTC (rev 6695)
+++ mpich2/trunk/src/util/param/params.yml	2010-05-21 03:34:37 UTC (rev 6696)
@@ -4,11 +4,15 @@
 # the inline list or map forms and don't try to use any really fancy
 # features like tagging or anchors.
 #
+# It is used to generate parameter-handling code for MPICH2.
+# See the maint/genparams script for more information.
+#
 # The only tricky bit is that long reflowed text (such as a description)
 # should use ">-" to both fold newlines and remove the trailing newline.
 #
-# It is used to generate parameter-handling code for MPICH2.
-# See the maint/genparams script for more information.
+# Listing "FOO" as a parameter name will cause two environment variables
+# to be examined by default: MPIR_PARAM_FOO and MPICH_FOO, with the
+# MPIR_PARAM value having priority.
 categories:
     - name        : collective
       description : parameters that control collective communication behavior
@@ -52,9 +56,6 @@
       name        : NOLOCAL
       alt-env     :
                     - NO_LOCAL
-      abs-alt-env :
-                    - MPICH_NOLOCAL
-                    - MPICH_NO_LOCAL
       type        : boolean
       default     : false
       description : >-
@@ -66,16 +67,13 @@
       name        : NESTCHECK
       alt-env     :
                     - NEST_CHECK
-      abs-alt-env :
-                    - MPICH_NESTCHECK
       type        : boolean
       default     : true
       description : >-
         If true, sanity check nesting levels at MPI_Finalize.
+
     - category    : developer
       name        : MEMDUMP
-      abs-alt-env :
-                    - MPICH_MEMDUMP
       type        : boolean
       default     : true
       description : >-