[mpich2-commits] r3983 - in mpich2/trunk: . src/include src/mpi/errhan src/mpid/ch3/channels/nemesis/nemesis/netmod/mx src/util/param

[buntinas at mcs.anl.gov]

Author: buntinas
Date: 2009-03-09 12:47:17 -0500 (Mon, 09 Mar 2009)
New Revision: 3983

Modified:
   mpich2/trunk/configure.in
   mpich2/trunk/src/include/mpiimpl.h
   mpich2/trunk/src/mpi/errhan/errnames.txt
   mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/mx/mx_init.c
   mpich2/trunk/src/util/param/param.c
Log:
replaced MPIU_SetEnv with MPIU_PutEnv, because it appears to be more portable.

Modified: mpich2/trunk/configure.in
===================================================================
--- mpich2/trunk/configure.in	2009-03-09 17:35:57 UTC (rev 3982)
+++ mpich2/trunk/configure.in	2009-03-09 17:47:17 UTC (rev 3983)
@@ -5100,10 +5100,10 @@
 if test "$ac_cv_func_fdopen" = "yes" ; then
     PAC_FUNC_NEEDS_DECL([#include <stdlib.h>],fdopen)
 fi
-# setenv() sets environment variable
-AC_HAVE_FUNCS(setenv)
-if test "$ac_cv_func_setenv" = "yes" ; then
-    PAC_FUNC_NEEDS_DECL([#include <stdlib.h>],setenv)
+# putenv() sets environment variable
+AC_HAVE_FUNCS(putenv)
+if test "$ac_cv_func_putenv" = "yes" ; then
+    PAC_FUNC_NEEDS_DECL([#include <stdlib.h>],putenv)
 fi
 
 

Modified: mpich2/trunk/src/include/mpiimpl.h
===================================================================
--- mpich2/trunk/src/include/mpiimpl.h	2009-03-09 17:35:57 UTC (rev 3982)
+++ mpich2/trunk/src/include/mpiimpl.h	2009-03-09 17:47:17 UTC (rev 3983)
@@ -681,7 +681,7 @@
 int MPIU_GetEnvRange( const char *envName, int *lowPtr, int *highPtr );
 int MPIU_GetEnvBool( const char *envName, int *val );
 int MPIU_GetEnvStr( const char *envName, const char **val );
-int MPIU_SetEnv( const char *name, const char *value, int overwrite );
+int MPIU_PutEnv( char *name_val );
 
 
 /* See mpishared.h as well */

Modified: mpich2/trunk/src/mpi/errhan/errnames.txt
===================================================================
--- mpich2/trunk/src/mpi/errhan/errnames.txt	2009-03-09 17:35:57 UTC (rev 3982)
+++ mpich2/trunk/src/mpi/errhan/errnames.txt	2009-03-09 17:47:17 UTC (rev 3983)
@@ -865,6 +865,7 @@
 **winRMArequest: RMA message operation failed; request returned error
 **open %s:open failed - %s
 **setenv:setenv failed
+**putenv:putenv failed
 **mx_close_endpoint: mx_close_endpoint failed
 **mx_close_endpoint %s:mx_close_endpoint failed (%s)
 **mx_finalize:mx_finalize failed

Modified: mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/mx/mx_init.c
===================================================================
--- mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/mx/mx_init.c	2009-03-09 17:35:57 UTC (rev 3982)
+++ mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/mx/mx_init.c	2009-03-09 17:47:17 UTC (rev 3983)
@@ -62,10 +62,10 @@
    int                mpi_errno = MPI_SUCCESS;
    int                r;
 
-   r = MPIU_SetEnv("MX_DISABLE_SHARED", "1", 1);
-   MPIU_ERR_CHKANDJUMP(r, mpi_errno, MPI_ERR_OTHER, "**setenv");
-   r = MPIU_SetEnv("MX_DISABLE_SELF", "1", 1);
-   MPIU_ERR_CHKANDJUMP(r, mpi_errno, MPI_ERR_OTHER, "**setenv");
+   r = MPIU_PutEnv("MX_DISABLE_SHARED=1");
+   MPIU_ERR_CHKANDJUMP(r, mpi_errno, MPI_ERR_OTHER, "**putenv");
+   r = MPIU_PutEnv("MX_DISABLE_SELF=1");
+   MPIU_ERR_CHKANDJUMP(r, mpi_errno, MPI_ERR_OTHER, "**putenv");
 
    ret = mx_init();
    MPIU_ERR_CHKANDJUMP1 (ret != MX_SUCCESS, mpi_errno, MPI_ERR_OTHER, "**mx_init", "**mx_init %s", mx_strerror (ret));

Modified: mpich2/trunk/src/util/param/param.c
===================================================================
--- mpich2/trunk/src/util/param/param.c	2009-03-09 17:35:57 UTC (rev 3982)
+++ mpich2/trunk/src/util/param/param.c	2009-03-09 17:47:17 UTC (rev 3983)
@@ -15,8 +15,8 @@
 #include <ctype.h>
 
 
-#if defined( HAVE_SETENV ) && defined( NEEDS_SETENV_DECL )
-extern int setenv(const char *name, const char *value, int overwrite);
+#if defined( HAVE_PUTENV ) && defined( NEEDS_PUTENV_DECL )
+extern int putenv(char *string);
 #endif
 
 #ifndef isascii
@@ -422,7 +422,7 @@
     return 0;
 }
 
-int MPIU_SetEnv( const char *name, const char *value, int overwrite )
+int MPIU_PutEnv( char *name_val )
 {
-    return setenv( name, value, overwrite );
+    return putenv( name_val );
 }