[mpich2-commits] r6693 - in mpich2/trunk: maint src/include src/mpi/errhan src/mpi/init src/util/param

[goodell at mcs.anl.gov]

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

Modified:
   mpich2/trunk/maint/updatefiles
   mpich2/trunk/src/include/Makefile.sm
   mpich2/trunk/src/include/mpiimpl.h
   mpich2/trunk/src/mpi/errhan/errnames.txt
   mpich2/trunk/src/mpi/init/initthread.c
   mpich2/trunk/src/util/param/Makefile.sm
Log:
build system and glue code for the new parameter functionality

Modified: mpich2/trunk/maint/updatefiles
===================================================================
--- mpich2/trunk/maint/updatefiles	2010-05-21 03:34:24 UTC (rev 6692)
+++ mpich2/trunk/maint/updatefiles	2010-05-21 03:34:27 UTC (rev 6693)
@@ -26,7 +26,7 @@
 # depend choices are dynamic, static, no
 do_depend=dynamic
 do_geterrmsgs=yes
-do_getparms=no
+do_getparms=yes
 do_bindings=yes
 do_f77=yes
 do_f77tof90=yes
@@ -604,9 +604,15 @@
     echo "Creating the enumeration of logging states into src/include/mpiallstates.h"
     maint/extractstates
 fi
-if [ -x maint/extractparms -a $do_getparms = "yes" ] ; then
-    maint/extractparms -outfile=parms.htm
+#if [ -x maint/extractparms -a $do_getparms = "yes" ] ; then
+#    maint/extractparms -outfile=parms.htm
+#fi
+# new parameter code
+if test -x maint/genparams -a "$do_getparms" = "yes" ; then
+    echo "generating parameter handling code"
+    ./maint/genparams
 fi
+
 # Create and/or update the f90 tests
 if [ -x maint/f77tof90 -a $do_f77tof90 = "yes" ] ; then
     echo "Create or update the Fortran 90 tests derived from the Fortran 77 tests"

Modified: mpich2/trunk/src/include/Makefile.sm
===================================================================
--- mpich2/trunk/src/include/Makefile.sm	2010-05-21 03:34:24 UTC (rev 6692)
+++ mpich2/trunk/src/include/Makefile.sm	2010-05-21 03:34:27 UTC (rev 6693)
@@ -2,4 +2,4 @@
 HEADERS = mpi.h mpiimpl.h mpiatomic.h mpichtimer.h mpierror.h mpierrs.h \
 	mpihandlemem.h mpimem.h mpistates.h mpisysstates.h mpitimerimpl.h \
 	mpitypedefs.h mpiutil.h nmpi.h  mpiallstates.h mpiimplthread.h \
-	mpiiov.h mpiu_monitors.h mpichtimer.h
+	mpiiov.h mpiu_monitors.h mpichtimer.h mpich_param_vals.h

Modified: mpich2/trunk/src/include/mpiimpl.h
===================================================================
--- mpich2/trunk/src/include/mpiimpl.h	2010-05-21 03:34:24 UTC (rev 6692)
+++ mpich2/trunk/src/include/mpiimpl.h	2010-05-21 03:34:27 UTC (rev 6693)
@@ -3174,6 +3174,9 @@
 /* For pipelined collectives */
 #define MPIR_ALLGATHERV_PIPELINE_MSGSIZE   32768
 
+/* TODO convert all cut-over constants above to parameters */
+#include "mpich_param_vals.h"
+
 /* Tags for point to point operations which implement collective operations */
 #define MPIR_BARRIER_TAG               1
 #define MPIR_BCAST_TAG                 2

Modified: mpich2/trunk/src/mpi/errhan/errnames.txt
===================================================================
--- mpich2/trunk/src/mpi/errhan/errnames.txt	2010-05-21 03:34:24 UTC (rev 6692)
+++ mpich2/trunk/src/mpi/errhan/errnames.txt	2010-05-21 03:34:27 UTC (rev 6693)
@@ -866,6 +866,9 @@
 
 **blcr_mod:BLCR kernel module not present
 
+**envvarparse:Unable to parse environment variable
+**envvarparse %s:Unable to parse environment variable (%s)
+
 #
 # mpi functions
 #

Modified: mpich2/trunk/src/mpi/init/initthread.c
===================================================================
--- mpich2/trunk/src/mpi/init/initthread.c	2010-05-21 03:34:24 UTC (rev 6692)
+++ mpich2/trunk/src/mpi/init/initthread.c	2010-05-21 03:34:27 UTC (rev 6693)
@@ -259,6 +259,9 @@
     }
 #   endif
 
+    mpi_errno = MPIR_Param_init_params();
+    if (mpi_errno) MPIU_ERR_POP(mpi_errno);
+
 #if 0
     /* This should never happen */
     if (MPIR_Version_device == 0) {

Modified: mpich2/trunk/src/util/param/Makefile.sm
===================================================================
--- mpich2/trunk/src/util/param/Makefile.sm	2010-05-21 03:34:24 UTC (rev 6692)
+++ mpich2/trunk/src/util/param/Makefile.sm	2010-05-21 03:34:27 UTC (rev 6693)
@@ -1,4 +1,4 @@
-lib${MPILIBNAME}_a_SOURCES = param.c
+lib${MPILIBNAME}_a_SOURCES = param.c param_vals.c
 HEADERS = param.h
 INCLUDES = -I../../include -I${top_srcdir}/src/include