[mpich2-commits] r7945 - in mpich2/branches/release/mpich2-1.3.x: . confdb maint src/include src/mpi/errhan src/mpid src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp src/mpl/src src/pm/hydra src/pm/hydra/examples src/pm/hydra/include src/pm/hydra/pm src/pm/hydra/pm/pmiserv src/pm/hydra/tools src/pm/hydra/tools/bind src/pm/hydra/tools/bootstrap/external src/pm/hydra/tools/bootstrap/include src/pm/hydra/tools/bootstrap/src src/pm/hydra/tools/ckpoint src/pm/hydra/ui src/pm/hydra/ui/mpich src/pm/hydra/utils src/pm/hydra/utils/sock
balaji at mcs.anl.gov
balaji at mcs.anl.gov
Fri Feb 11 17:36:33 CST 2011
Author: balaji
Date: 2011-02-11 17:36:33 -0600 (Fri, 11 Feb 2011)
New Revision: 7945
Modified:
mpich2/branches/release/mpich2-1.3.x/
mpich2/branches/release/mpich2-1.3.x/confdb/
mpich2/branches/release/mpich2-1.3.x/configure.in
mpich2/branches/release/mpich2-1.3.x/maint/Version
mpich2/branches/release/mpich2-1.3.x/src/include/mpitypedefs.h
mpich2/branches/release/mpich2-1.3.x/src/mpi/errhan/errutil.c
mpich2/branches/release/mpich2-1.3.x/src/mpid/
mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c
mpich2/branches/release/mpich2-1.3.x/src/mpl/src/mplstr.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/Makefile.am
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/README
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/autogen.sh
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/configure.in
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/examples/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/hydra-doxygen.cfg.in
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/include/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/include/hydra.h
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/mpich2prereq
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/common.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/common.h
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip_utils.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_cb.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v1.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v2.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_utils.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/bind.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/external_launch.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/include/bsci.h
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/src/bsci_finalize.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/src/bsci_init.c.in
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/ckpoint/ckpoint.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/ui/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/ui/mpich/utils.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/utils/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/utils/sock/sock.c
mpich2/branches/release/mpich2-1.3.x/winconfigure.wsf
Log:
Merging r7937 r7938 r7939 r7940 r7941 r7942 r7943 r7944 from trunk
Property changes on: mpich2/branches/release/mpich2-1.3.x
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt:5050
/mpich2/branches/dev/ckpt2:5057-6537
/mpich2/branches/dev/coll-err-ret:7771-7802
/mpich2/branches/dev/error-return:7662-7670
/mpich2/branches/dev/ftb:5661-5730
/mpich2/branches/dev/lapi:5817
/mpich2/branches/dev/wintcp_async_progress:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2:5406
/mpich2/trunk:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923,7925-7926,7929,7931-7932,7935
+ /mpich2/branches/dev/ckpt:5050
/mpich2/branches/dev/ckpt2:5057-6537
/mpich2/branches/dev/coll-err-ret:7771-7802
/mpich2/branches/dev/error-return:7662-7670
/mpich2/branches/dev/ftb:5661-5730
/mpich2/branches/dev/lapi:5817
/mpich2/branches/dev/wintcp_async_progress:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2:5406
/mpich2/trunk:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923,7925-7926,7929,7931-7932,7935,7937-7944
Property changes on: mpich2/branches/release/mpich2-1.3.x/confdb
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt2/confdb:5180,5182,5196,5198
/mpich2/branches/dev/coll-err-ret/confdb:7771-7802
/mpich2/branches/dev/error-return/confdb:7662-7670
/mpich2/branches/dev/ftb/confdb:5661-5730
/mpich2/branches/dev/lapi/confdb:5817
/mpich2/branches/dev/wintcp_async_progress/confdb:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/confdb:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/confdb:5406
/mpich2/trunk/confdb:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923,7925-7926,7929,7931-7932,7935
+ /mpich2/branches/dev/ckpt2/confdb:5180,5182,5196,5198
/mpich2/branches/dev/coll-err-ret/confdb:7771-7802
/mpich2/branches/dev/error-return/confdb:7662-7670
/mpich2/branches/dev/ftb/confdb:5661-5730
/mpich2/branches/dev/lapi/confdb:5817
/mpich2/branches/dev/wintcp_async_progress/confdb:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/confdb:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/confdb:5406
/mpich2/trunk/confdb:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923,7925-7926,7929,7931-7932,7935,7937-7944
Modified: mpich2/branches/release/mpich2-1.3.x/configure.in
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/configure.in 2011-02-11 23:34:33 UTC (rev 7944)
+++ mpich2/branches/release/mpich2-1.3.x/configure.in 2011-02-11 23:36:33 UTC (rev 7945)
@@ -3336,12 +3336,28 @@
AC_DEFINE(HAVE_UINT64_T,1,[Define if uint64_t is supported by the C compiler])
fi
-# Other C99 types. stdbool.h and complex.h are not needed for the raw _Bool
-# and _Complex types, only to get the macros "bool" and "complex".
-AC_CHECK_SIZEOF([_Bool])
-AC_CHECK_SIZEOF([float _Complex])
-AC_CHECK_SIZEOF([double _Complex])
-AC_CHECK_SIZEOF([long double _Complex])
+# Other C99 types.
+AC_CHECK_HEADERS([stdbool.h complex.h])
+AC_CHECK_SIZEOF([_Bool],0,[
+#ifdef HAVE_STDBOOL_H
+#include <stdbool.h>
+#endif
+])
+AC_CHECK_SIZEOF([float _Complex],0,[
+#ifdef HAVE_COMPLEX_H
+#include <complex.h>
+#endif
+])
+AC_CHECK_SIZEOF([double _Complex],0,[
+#ifdef HAVE_COMPLEX_H
+#include <complex.h>
+#endif
+])
+AC_CHECK_SIZEOF([long double _Complex],0,[
+#ifdef HAVE_COMPLEX_H
+#include <complex.h>
+#endif
+])
# we need really could just use the result of AC_CHECK_SIZEOF, but having a
# HAVE_typename macro is useful for consistency
AC_CHECK_TYPES([_Bool, float _Complex, double _Complex, long double _Complex])
@@ -4620,11 +4636,32 @@
AC_LANG_CPLUSPLUS
AC_CHECK_SIZEOF(bool)
- if test "$ac_cv_type__Bool" = "yes" -a "$ac_cv_sizeof__Bool" = "$ac_cv_sizeof_bool" ; then
- AC_DEFINE_UNQUOTED([MPIR_CXX_BOOL_CTYPE],[_Bool],[a C type used to compute C++ bool reductions])
- else
- AC_MSG_ERROR([unable to determine matching C type for C++ bool])
- fi
+ # Find a C type that matches the size of the C++ boolean type
+ case "$ac_cv_sizeof_bool" in
+ $ac_cv_sizeof__Bool)
+ bool_type=_Bool
+ ;;
+ $ac_cv_sizeof_unsigned_char)
+ bool_type="unsigned char"
+ ;;
+ $ac_cv_sizeof_unsigned_short)
+ bool_type="unsigned short"
+ ;;
+ $ac_cv_sizeof_unsigned_int)
+ bool_type="unsigned int"
+ ;;
+ $ac_cv_sizeof_unsigned_long)
+ bool_type="unsigned long"
+ ;;
+ $ac_cv_sizeof_unsigned_long_long)
+ bool_type="unsigned long long"
+ ;;
+ *)
+ AC_MSG_ERROR([unable to determine matching C type for C++ bool])
+ ;;
+ esac
+ AC_DEFINE_UNQUOTED([MPIR_CXX_BOOL_CTYPE],[$bool_type],
+ [a C type used to compute C++ bool reductions])
AC_CHECK_HEADER(complex)
if test "$ac_cv_header_complex" = "yes" ; then
Property changes on: mpich2/branches/release/mpich2-1.3.x/maint/Version
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/maint/Version:5050
/mpich2/branches/dev/ckpt2/maint/Version:5057-6537
/mpich2/branches/dev/coll-err-ret/maint/Version:7771-7802
/mpich2/branches/dev/ftb/maint/Version:5661-5730
/mpich2/branches/dev/lapi/maint/Version:5817
/mpich2/branches/dev/wintcp_async_progress/maint/Version:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/maint/Version:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/maint/Version:5406
/mpich2/trunk/maint/Version:7422-7425,7429-7433,7435,7437-7438,7442-7447,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7676-7678,7681,7684,7686,7688,7690-7692,7694,7696,7700,7705,7707-7710,7712,7714,7719,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923,7925-7926,7929,7931-7932,7935
/mpich2/trunk/src/pm/hydra/VERSION:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7447,7604,7671,7674,7683,7685,7687,7701-7702,7720,7722
+ /mpich2/branches/dev/ckpt/maint/Version:5050
/mpich2/branches/dev/ckpt2/maint/Version:5057-6537
/mpich2/branches/dev/coll-err-ret/maint/Version:7771-7802
/mpich2/branches/dev/ftb/maint/Version:5661-5730
/mpich2/branches/dev/lapi/maint/Version:5817
/mpich2/branches/dev/wintcp_async_progress/maint/Version:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/maint/Version:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/maint/Version:5406
/mpich2/trunk/maint/Version:7422-7425,7429-7433,7435,7437-7438,7442-7447,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7676-7678,7681,7684,7686,7688,7690-7692,7694,7696,7700,7705,7707-7710,7712,7714,7719,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923,7925-7926,7929,7931-7932,7935,7937-7944
/mpich2/trunk/src/pm/hydra/VERSION:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7447,7604,7671,7674,7683,7685,7687,7701-7702,7720,7722
Modified: mpich2/branches/release/mpich2-1.3.x/src/include/mpitypedefs.h
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/include/mpitypedefs.h 2011-02-11 23:34:33 UTC (rev 7944)
+++ mpich2/branches/release/mpich2-1.3.x/src/include/mpitypedefs.h 2011-02-11 23:36:33 UTC (rev 7945)
@@ -25,6 +25,14 @@
#ifdef HAVE_STDINT_H
#include <stdint.h>
#endif
+/* stdbool.h gives us the C boolean type */
+#ifdef HAVE_STDBOOL_H
+#include <stdbool.h>
+#endif
+/* complex.h gives us the C complex type */
+#ifdef HAVE_COMPLEX_H
+#include <complex.h>
+#endif
#ifdef HAVE_WINDOWS_H
#include <winsock2.h>
Modified: mpich2/branches/release/mpich2-1.3.x/src/mpi/errhan/errutil.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/mpi/errhan/errutil.c 2011-02-11 23:34:33 UTC (rev 7944)
+++ mpich2/branches/release/mpich2-1.3.x/src/mpi/errhan/errutil.c 2011-02-11 23:36:33 UTC (rev 7945)
@@ -1135,7 +1135,7 @@
char *begin, *end, *fmt;
size_t len;
MPI_Comm C;
- MPI_Info I;
+ MPI_Info info;
MPI_Datatype D;
MPI_Win W;
MPI_Group G;
@@ -1267,14 +1267,14 @@
}
break;
case (int)'I':
- I = va_arg(list, MPI_Info);
- if (I == MPI_INFO_NULL)
+ info = va_arg(list, MPI_Info);
+ if (info == MPI_INFO_NULL)
{
MPIU_Strncpy(str, "MPI_INFO_NULL", maxlen);
}
else
{
- MPIU_Snprintf(str, maxlen, "info=0x%x", I);
+ MPIU_Snprintf(str, maxlen, "info=0x%x", info);
}
break;
case (int)'D':
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/mpid
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/mpid:5050
/mpich2/branches/dev/ckpt2/src/mpid:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpid:7771-7802
/mpich2/branches/dev/error-return/src/mpid:7405-7603,7662-7670
/mpich2/branches/dev/ftb/src/mpid:5661-5730
/mpich2/branches/dev/lapi/src/mpid:5817
/mpich2/branches/dev/wintcp_async_progress/src/mpid:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpid:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpid:5406
/mpich2/trunk/src/mpid:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923,7925-7926,7929,7931-7932,7935
+ /mpich2/branches/dev/ckpt/src/mpid:5050
/mpich2/branches/dev/ckpt2/src/mpid:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpid:7771-7802
/mpich2/branches/dev/error-return/src/mpid:7405-7603,7662-7670
/mpich2/branches/dev/ftb/src/mpid:5661-5730
/mpich2/branches/dev/lapi/src/mpid:5817
/mpich2/branches/dev/wintcp_async_progress/src/mpid:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpid:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpid:5406
/mpich2/trunk/src/mpid:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923,7925-7926,7929,7931-7932,7935,7937-7944
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5050
/mpich2/branches/dev/ckpt2/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:7771-7802
/mpich2/branches/dev/error-return/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:7405-7603,7662-7670
/mpich2/branches/dev/ftb/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5661-5730
/mpich2/branches/dev/lapi/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5817
/mpich2/branches/dev/win_rrvm/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:6416,6428
/mpich2/branches/dev/wintcp_async_progress/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5406
/mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923,7925-7926,7929,7931-7932,7935
+ /mpich2/branches/dev/ckpt/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5050
/mpich2/branches/dev/ckpt2/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:7771-7802
/mpich2/branches/dev/error-return/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:7405-7603,7662-7670
/mpich2/branches/dev/ftb/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5661-5730
/mpich2/branches/dev/lapi/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5817
/mpich2/branches/dev/win_rrvm/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:6416,6428
/mpich2/branches/dev/wintcp_async_progress/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5406
/mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923,7925-7926,7929,7931-7932,7935,7937-7944
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/mpl/src/mplstr.c
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt2/src/mpl/src/string/mplstr.c:5182,5196,5198
/mpich2/branches/dev/coll-err-ret/src/mpl/src/mplstr.c:7771-7802
/mpich2/branches/dev/error-return/src/mpl/src/mplstr.c:7662-7670
/mpich2/branches/dev/ftb/src/mpl/src/mplstr.c:5661-5730
/mpich2/branches/dev/lapi/src/mpl/src/mplstr.c:5817
/mpich2/branches/release/mpich2-1.1.1/src/mpl/src/string/mplstr.c:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpl/src/string/mplstr.c:5406
/mpich2/trunk/src/mpl/src/mplstr.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923,7925-7926,7929,7931-7932,7935
+ /mpich2/branches/dev/ckpt2/src/mpl/src/string/mplstr.c:5182,5196,5198
/mpich2/branches/dev/coll-err-ret/src/mpl/src/mplstr.c:7771-7802
/mpich2/branches/dev/error-return/src/mpl/src/mplstr.c:7662-7670
/mpich2/branches/dev/ftb/src/mpl/src/mplstr.c:5661-5730
/mpich2/branches/dev/lapi/src/mpl/src/mplstr.c:5817
/mpich2/branches/release/mpich2-1.1.1/src/mpl/src/string/mplstr.c:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpl/src/string/mplstr.c:5406
/mpich2/trunk/src/mpl/src/mplstr.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923,7925-7926,7929,7931-7932,7935,7937-7944
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra:7771-7802*
/mpich2/branches/dev/error-return/src/pm/hydra:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra:5406
/mpich2/trunk/src/pm/hydra:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671*,7674*,7676-7678,7681,7683*,7684,7685*,7686,7687*,7688,7690-7692,7694,7696,7700,7701-7702*,7705,7707-7710,7712,7714,7719,7720*,7722*,7724-7725*,7728-7729*,7733*,7735-7737*,7739*,7741*,7744-7748*,7751-7754*,7758-7759*,7761-7762*,7766*,7772*,7774*,7779-7781*,7788*,7793*,7799-7801*,7803*,7807-7808*,7811*,7813*,7815-7816*,7819*,7821*,7829-7831*,7833*,7835-7837*,7839-7843*,7852*,7858*,7860*,7862*,7866*,7872-7874*,7879-7880*,7882*,7884*,7886-7888*,7890*,7895*,7897*,7899*,7903-7904*,7906*,7908*,7910*,7912*,7931-7932*
+ /mpich2/branches/dev/ckpt/src/pm/hydra:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra:7771-7802*
/mpich2/branches/dev/error-return/src/pm/hydra:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra:5406
/mpich2/trunk/src/pm/hydra:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671*,7674*,7676-7678,7681,7683*,7684,7685*,7686,7687*,7688,7690-7692,7694,7696,7700,7701-7702*,7705,7707-7710,7712,7714,7719,7720*,7722*,7724-7725*,7728-7729*,7733*,7735-7737*,7739*,7741*,7744-7748*,7751-7754*,7758-7759*,7761-7762*,7766*,7772*,7774*,7779-7781*,7788*,7793*,7799-7801*,7803*,7807-7808*,7811*,7813*,7815-7816*,7819*,7821*,7829-7831*,7833*,7835-7837*,7839-7843*,7852*,7858*,7860*,7862*,7866*,7872-7874*,7879-7880*,7882*,7884*,7886-7888*,7890*,7895*,7897*,7899*,7903-7904*,7906*,7908*,7910*,7912*,7931-7932*,7937-7944*
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/Makefile.am
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/Makefile.am:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/Makefile.am:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/Makefile.am:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/Makefile.am:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/Makefile.am:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/Makefile.am:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/Makefile.am:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/Makefile.am:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/Makefile.am:5406
/mpich2/trunk/src/pm/hydra/Makefile.am:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932
+ /mpich2/branches/dev/ckpt/src/pm/hydra/Makefile.am:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/Makefile.am:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/Makefile.am:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/Makefile.am:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/Makefile.am:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/Makefile.am:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/Makefile.am:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/Makefile.am:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/Makefile.am:5406
/mpich2/trunk/src/pm/hydra/Makefile.am:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/README
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/README:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/README:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/README:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/README:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/README:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/README:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/README:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/README:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/README:5406
/mpich2/trunk/src/pm/hydra/README:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932
+ /mpich2/branches/dev/ckpt/src/pm/hydra/README:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/README:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/README:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/README:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/README:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/README:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/README:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/README:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/README:5406
/mpich2/trunk/src/pm/hydra/README:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/autogen.sh
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/autogen.sh:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/autogen.sh:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/autogen.sh:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/autogen.sh:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/autogen.sh:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/autogen.sh:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/autogen.sh:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/autogen.sh:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/autogen.sh:5406
/mpich2/trunk/src/pm/hydra/autogen.sh:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932
+ /mpich2/branches/dev/ckpt/src/pm/hydra/autogen.sh:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/autogen.sh:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/autogen.sh:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/autogen.sh:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/autogen.sh:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/autogen.sh:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/autogen.sh:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/autogen.sh:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/autogen.sh:5406
/mpich2/trunk/src/pm/hydra/autogen.sh:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/configure.in
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/configure.in:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/configure.in:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/configure.in:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/configure.in:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/configure.in:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/configure.in:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/configure.in:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/configure.in:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/configure.in:5406
/mpich2/trunk/src/pm/hydra/configure.in:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932
+ /mpich2/branches/dev/ckpt/src/pm/hydra/configure.in:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/configure.in:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/configure.in:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/configure.in:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/configure.in:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/configure.in:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/configure.in:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/configure.in:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/configure.in:5406
/mpich2/trunk/src/pm/hydra/configure.in:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/examples
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/examples:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/examples:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/examples:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/examples:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/examples:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/examples:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/examples:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/examples:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/examples:5406
/mpich2/trunk/src/pm/hydra/examples:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932
+ /mpich2/branches/dev/ckpt/src/pm/hydra/examples:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/examples:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/examples:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/examples:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/examples:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/examples:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/examples:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/examples:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/examples:5406
/mpich2/trunk/src/pm/hydra/examples:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/hydra-doxygen.cfg.in
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/hydra-doxygen.cfg.in:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/hydra-doxygen.cfg.in:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/hydra-doxygen.cfg.in:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/hydra-doxygen.cfg.in:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/hydra-doxygen.cfg.in:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/hydra-doxygen.cfg.in:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/hydra-doxygen.cfg.in:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/hydra-doxygen.cfg.in:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/hydra-doxygen.cfg.in:5406
/mpich2/trunk/src/pm/hydra/hydra-doxygen.cfg.in:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932
+ /mpich2/branches/dev/ckpt/src/pm/hydra/hydra-doxygen.cfg.in:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/hydra-doxygen.cfg.in:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/hydra-doxygen.cfg.in:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/hydra-doxygen.cfg.in:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/hydra-doxygen.cfg.in:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/hydra-doxygen.cfg.in:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/hydra-doxygen.cfg.in:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/hydra-doxygen.cfg.in:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/hydra-doxygen.cfg.in:5406
/mpich2/trunk/src/pm/hydra/hydra-doxygen.cfg.in:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/include
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/include:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/include:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/include:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/include:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/include:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/include:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/include:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/include:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/include:5406
/mpich2/trunk/src/pm/hydra/include:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932
+ /mpich2/branches/dev/ckpt/src/pm/hydra/include:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/include:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/include:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/include:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/include:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/include:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/include:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/include:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/include:5406
/mpich2/trunk/src/pm/hydra/include:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/include/hydra.h
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/include/hydra.h 2011-02-11 23:34:33 UTC (rev 7944)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/include/hydra.h 2011-02-11 23:36:33 UTC (rev 7945)
@@ -553,6 +553,7 @@
#define HYDU_MALLOC(p, type, size, status) \
{ \
+ HYDU_ASSERT(size, status); \
(p) = (type) HYDU_malloc((size)); \
if ((p) == NULL) \
HYDU_ERR_SETANDJUMP((status), HYD_NO_MEM, \
@@ -578,16 +579,6 @@
} \
}
-#define HYD_GET_ENV_STR_VAL(lvalue_, env_var_name_, default_val_) \
- do { \
- if (lvalue_ == NULL) { \
- const char *tmp_ = (default_val_); \
- MPL_env2str(env_var_name_, (const char **) &tmp_); \
- if (tmp_) \
- lvalue_ = HYDU_strdup(tmp_); \
- } \
- } while (0)
-
HYD_status HYDU_list_append_strlist(char **exec, char **client_arg);
HYD_status HYDU_print_strlist(char **args);
void HYDU_free_strlist(char **args);
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/mpich2prereq
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/mpich2prereq:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/mpich2prereq:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/mpich2prereq:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/mpich2prereq:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/mpich2prereq:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/mpich2prereq:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/mpich2prereq:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/mpich2prereq:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/mpich2prereq:5406
/mpich2/trunk/src/pm/hydra/mpich2prereq:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932
+ /mpich2/branches/dev/ckpt/src/pm/hydra/mpich2prereq:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/mpich2prereq:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/mpich2prereq:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/mpich2prereq:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/mpich2prereq:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/mpich2prereq:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/mpich2prereq:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/mpich2prereq:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/mpich2prereq:5406
/mpich2/trunk/src/pm/hydra/mpich2prereq:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/pm:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/pm:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/pm:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/pm:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/pm:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/pm:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/pm:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/pm:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/pm:5406
/mpich2/trunk/src/pm/hydra/pm:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932
+ /mpich2/branches/dev/ckpt/src/pm/hydra/pm:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/pm:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/pm:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/pm:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/pm:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/pm:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/pm:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/pm:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/pm:5406
/mpich2/trunk/src/pm/hydra/pm:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/common.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/common.c 2011-02-11 23:34:33 UTC (rev 7944)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/common.c 2011-02-11 23:36:33 UTC (rev 7945)
@@ -184,7 +184,7 @@
HYDU_FUNC_ENTER();
HYDU_MALLOC(*kvs, struct HYD_pmcd_pmi_kvs *, sizeof(struct HYD_pmcd_pmi_kvs), status);
- HYDU_snprintf((*kvs)->kvs_name, MAXNAMELEN, "kvs_%d_%d", (int) getpid(), pgid);
+ HYDU_snprintf((*kvs)->kvs_name, PMI_MAXKVSLEN, "kvs_%d_%d", (int) getpid(), pgid);
(*kvs)->key_pair = NULL;
fn_exit:
@@ -222,8 +222,8 @@
HYDU_MALLOC(key_pair, struct HYD_pmcd_pmi_kvs_pair *, sizeof(struct HYD_pmcd_pmi_kvs_pair),
status);
- HYDU_snprintf(key_pair->key, MAXKEYLEN, "%s", key);
- HYDU_snprintf(key_pair->val, MAXVALLEN, "%s", val);
+ HYDU_snprintf(key_pair->key, PMI_MAXKEYLEN, "%s", key);
+ HYDU_snprintf(key_pair->val, PMI_MAXVALLEN, "%s", val);
key_pair->next = NULL;
*ret = 0;
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/common.h
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/common.h 2011-02-11 23:34:33 UTC (rev 7944)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/common.h 2011-02-11 23:36:33 UTC (rev 7945)
@@ -10,20 +10,18 @@
#include "hydra.h"
/* Generic definitions */
-#define MAXKEYLEN 64 /* max length of key in keyval space */
-/* FIXME: PMI-1 uses 256, PMI-2 uses 1024; we use the MAX */
-#define MAXVALLEN 1024 /* max length of value in keyval space */
-#define MAXNAMELEN 256 /* max length of various names */
-#define MAXKVSNAME MAXNAMELEN /* max length of a kvsname */
+#define PMI_MAXKEYLEN (64) /* max length of key in keyval space */
+#define PMI_MAXVALLEN (1024) /* max length of value in keyval space */
+#define PMI_MAXKVSLEN (256) /* max length of various names */
struct HYD_pmcd_pmi_kvs_pair {
- char key[MAXKEYLEN];
- char val[MAXVALLEN];
+ char key[PMI_MAXKEYLEN];
+ char val[PMI_MAXVALLEN];
struct HYD_pmcd_pmi_kvs_pair *next;
};
struct HYD_pmcd_pmi_kvs {
- char kvs_name[MAXNAMELEN]; /* Name of this kvs */
+ char kvs_name[PMI_MAXKVSLEN]; /* Name of this kvs */
struct HYD_pmcd_pmi_kvs_pair *key_pair;
};
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c 2011-02-11 23:34:33 UTC (rev 7944)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c 2011-02-11 23:36:33 UTC (rev 7945)
@@ -188,11 +188,11 @@
i = 0;
tmp[i++] = HYDU_strdup("cmd=maxes kvsname_max=");
- tmp[i++] = HYDU_int_to_str(MAXKVSNAME);
+ tmp[i++] = HYDU_int_to_str(PMI_MAXKVSLEN);
tmp[i++] = HYDU_strdup(" keylen_max=");
- tmp[i++] = HYDU_int_to_str(MAXKEYLEN);
+ tmp[i++] = HYDU_int_to_str(PMI_MAXKEYLEN);
tmp[i++] = HYDU_strdup(" vallen_max=");
- tmp[i++] = HYDU_int_to_str(MAXVALLEN);
+ tmp[i++] = HYDU_int_to_str(PMI_MAXVALLEN);
tmp[i++] = HYDU_strdup("\n");
tmp[i++] = NULL;
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip_utils.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip_utils.c 2011-02-11 23:34:33 UTC (rev 7944)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip_utils.c 2011-02-11 23:36:33 UTC (rev 7945)
@@ -115,7 +115,7 @@
static HYD_status pmi_kvsname_fn(char *arg, char ***argv)
{
- HYDU_snprintf(HYD_pmcd_pmip.local.kvs->kvs_name, MAXNAMELEN, "%s", **argv);
+ HYDU_snprintf(HYD_pmcd_pmip.local.kvs->kvs_name, PMI_MAXKVSLEN, "%s", **argv);
(*argv)++;
return HYD_SUCCESS;
@@ -125,9 +125,9 @@
{
HYD_status status = HYD_SUCCESS;
- HYDU_MALLOC(HYD_pmcd_pmip.local.spawner_kvs_name, char *, MAXNAMELEN, status);
+ HYDU_MALLOC(HYD_pmcd_pmip.local.spawner_kvs_name, char *, PMI_MAXKVSLEN, status);
- HYDU_snprintf(HYD_pmcd_pmip.local.spawner_kvs_name, MAXNAMELEN, "%s", **argv);
+ HYDU_snprintf(HYD_pmcd_pmip.local.spawner_kvs_name, PMI_MAXKVSLEN, "%s", **argv);
(*argv)++;
fn_exit:
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_cb.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_cb.c 2011-02-11 23:34:33 UTC (rev 7944)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_cb.c 2011-02-11 23:36:33 UTC (rev 7945)
@@ -264,8 +264,8 @@
if (pg_scratch->dead_process_count == 1) {
/* This is the first dead process */
HYDU_FREE(pg_scratch->dead_processes);
- HYDU_MALLOC(pg_scratch->dead_processes, char *, MAXVALLEN, status);
- HYDU_snprintf(pg_scratch->dead_processes, MAXVALLEN, "%d", hdr.pid);
+ HYDU_MALLOC(pg_scratch->dead_processes, char *, PMI_MAXVALLEN, status);
+ HYDU_snprintf(pg_scratch->dead_processes, PMI_MAXVALLEN, "%d", hdr.pid);
}
else {
/* FIXME: If the list of dead processes does not fit
@@ -350,18 +350,19 @@
str = NULL;
for (e = list; e; e = e->next) {
- HYDU_MALLOC(run, char *, MAXVALLEN, status);
+ HYDU_MALLOC(run, char *, PMI_MAXVALLEN, status);
if (str) {
if (e->start == e->end)
- HYDU_snprintf(run, MAXVALLEN, "%s,%d", str, e->start);
+ HYDU_snprintf(run, PMI_MAXVALLEN, "%s,%d", str, e->start);
else
- HYDU_snprintf(run, MAXVALLEN, "%s,%d-%d", str, e->start, e->end);
+ HYDU_snprintf(run, PMI_MAXVALLEN, "%s,%d-%d", str, e->start,
+ e->end);
}
else {
if (e->start == e->end)
- HYDU_snprintf(run, MAXVALLEN, "%d", e->start);
+ HYDU_snprintf(run, PMI_MAXVALLEN, "%d", e->start);
else
- HYDU_snprintf(run, MAXVALLEN, "%d-%d", e->start, e->end);
+ HYDU_snprintf(run, PMI_MAXVALLEN, "%d-%d", e->start, e->end);
}
if (str)
HYDU_FREE(str);
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v1.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v1.c 2011-02-11 23:34:33 UTC (rev 7944)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v1.c 2011-02-11 23:36:33 UTC (rev 7945)
@@ -268,7 +268,7 @@
struct HYD_exec *exec_list = NULL, *exec;
struct HYD_env *env;
- char key[MAXKEYLEN], *val;
+ char key[PMI_MAXKEYLEN], *val;
int nprocs, preput_num, info_num, ret;
char *execname, *path = NULL;
@@ -385,14 +385,14 @@
for (i = 0; i < info_num; i++) {
char *info_key, *info_val;
- HYDU_snprintf(key, MAXKEYLEN, "info_key_%d", i);
+ HYDU_snprintf(key, PMI_MAXKEYLEN, "info_key_%d", i);
val = HYD_pmcd_pmi_find_token_keyval(&tokens[segment_list[j].start_idx],
segment_list[j].token_count, key);
HYDU_ERR_CHKANDJUMP(status, val == NULL, HYD_INTERNAL_ERROR,
"unable to find token: %s\n", key);
info_key = val;
- HYDU_snprintf(key, MAXKEYLEN, "info_val_%d", i);
+ HYDU_snprintf(key, PMI_MAXKEYLEN, "info_val_%d", i);
val = HYD_pmcd_pmi_find_token_keyval(&tokens[segment_list[j].start_idx],
segment_list[j].token_count, key);
HYDU_ERR_CHKANDJUMP(status, val == NULL, HYD_INTERNAL_ERROR,
@@ -447,7 +447,7 @@
i = 0;
exec->exec[i++] = execname;
for (k = 0; k < argcnt; k++) {
- HYDU_snprintf(key, MAXKEYLEN, "arg%d", k + 1);
+ HYDU_snprintf(key, PMI_MAXKEYLEN, "arg%d", k + 1);
val = HYD_pmcd_pmi_find_token_keyval(&tokens[segment_list[j].start_idx],
segment_list[j].token_count, key);
HYDU_ERR_CHKANDJUMP(status, val == NULL, HYD_INTERNAL_ERROR,
@@ -483,13 +483,13 @@
for (i = 0; i < preput_num; i++) {
char *preput_key, *preput_val;
- HYDU_snprintf(key, MAXKEYLEN, "preput_key_%d", i);
+ HYDU_snprintf(key, PMI_MAXKEYLEN, "preput_key_%d", i);
val = HYD_pmcd_pmi_find_token_keyval(tokens, token_count, key);
HYDU_ERR_CHKANDJUMP(status, val == NULL, HYD_INTERNAL_ERROR,
"unable to find token: %s\n", key);
preput_key = val;
- HYDU_snprintf(key, MAXKEYLEN, "preput_val_%d", i);
+ HYDU_snprintf(key, PMI_MAXKEYLEN, "preput_val_%d", i);
val = HYD_pmcd_pmi_find_token_keyval(tokens, token_count, key);
HYDU_ERR_CHKANDJUMP(status, val == NULL, HYD_INTERNAL_ERROR,
"unable to find token: %s\n", key);
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v2.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v2.c 2011-02-11 23:34:33 UTC (rev 7944)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v2.c 2011-02-11 23:36:33 UTC (rev 7945)
@@ -462,7 +462,7 @@
struct HYD_env *env;
char *thrid;
- char key[MAXKEYLEN], *val;
+ char key[PMI_MAXKEYLEN], *val;
int maxprocs, preputcount, infokeycount, ret;
int ncmds;
char *execname, *path = NULL;
@@ -566,14 +566,14 @@
for (i = 0; i < infokeycount; i++) {
char *info_key, *info_val;
- HYDU_snprintf(key, MAXKEYLEN, "infokey%d", i);
+ HYDU_snprintf(key, PMI_MAXKEYLEN, "infokey%d", i);
val = HYD_pmcd_pmi_find_token_keyval(&tokens[segment_list[j].start_idx],
segment_list[j].token_count, key);
HYDU_ERR_CHKANDJUMP(status, val == NULL, HYD_INTERNAL_ERROR,
"unable to find token: %s\n", key);
info_key = val;
- HYDU_snprintf(key, MAXKEYLEN, "infoval%d", i);
+ HYDU_snprintf(key, PMI_MAXKEYLEN, "infoval%d", i);
val = HYD_pmcd_pmi_find_token_keyval(&tokens[segment_list[j].start_idx],
segment_list[j].token_count, key);
HYDU_ERR_CHKANDJUMP(status, val == NULL, HYD_INTERNAL_ERROR,
@@ -628,7 +628,7 @@
i = 0;
exec->exec[i++] = execname;
for (k = 0; k < argcnt; k++) {
- HYDU_snprintf(key, MAXKEYLEN, "argv%d", k);
+ HYDU_snprintf(key, PMI_MAXKEYLEN, "argv%d", k);
val = HYD_pmcd_pmi_find_token_keyval(&tokens[segment_list[j].start_idx],
segment_list[j].token_count, key);
HYDU_ERR_CHKANDJUMP(status, val == NULL, HYD_INTERNAL_ERROR,
@@ -664,13 +664,13 @@
for (i = 0; i < preputcount; i++) {
char *preput_key, *preput_val;
- HYDU_snprintf(key, MAXKEYLEN, "ppkey%d", i);
+ HYDU_snprintf(key, PMI_MAXKEYLEN, "ppkey%d", i);
val = HYD_pmcd_pmi_find_token_keyval(tokens, token_count, key);
HYDU_ERR_CHKANDJUMP(status, val == NULL, HYD_INTERNAL_ERROR,
"unable to find token: %s\n", key);
preput_key = val;
- HYDU_snprintf(key, MAXKEYLEN, "ppval%d", i);
+ HYDU_snprintf(key, PMI_MAXKEYLEN, "ppval%d", i);
val = HYD_pmcd_pmi_find_token_keyval(tokens, token_count, key);
HYDU_ERR_CHKANDJUMP(status, val == NULL, HYD_INTERNAL_ERROR,
"unable to find token: %s\n", key);
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_utils.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_utils.c 2011-02-11 23:34:33 UTC (rev 7944)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_utils.c 2011-02-11 23:36:33 UTC (rev 7945)
@@ -234,7 +234,7 @@
HYDU_ASSERT(mapping, status);
/* Make sure the mapping is within the size allowed by PMI */
- if (strlen(mapping) > MAXVALLEN) {
+ if (strlen(mapping) > PMI_MAXVALLEN) {
HYDU_FREE(mapping);
mapping = NULL;
}
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/tools:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/tools:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/tools:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/tools:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/tools:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/tools:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/tools:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/tools:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/tools:5406
/mpich2/trunk/src/pm/hydra/tools:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932
+ /mpich2/branches/dev/ckpt/src/pm/hydra/tools:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/tools:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/tools:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/tools:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/tools:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/tools:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/tools:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/tools:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/tools:5406
/mpich2/trunk/src/pm/hydra/tools:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/bind.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/bind.c 2011-02-11 23:34:33 UTC (rev 7944)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/bind.c 2011-02-11 23:36:33 UTC (rev 7945)
@@ -20,7 +20,7 @@
HYD_status HYDT_bind_init(char *user_binding, char *user_bindlib)
{
char *bindstr, *bindentry, *elem;
- char *binding = NULL, *bindlib = NULL;
+ const char *binding = NULL, *bindlib = NULL;
int i, j, k, use_topo_obj[HYDT_BIND_OBJ_END] = { 0 }, child_id;
int use_cache_level = 0, break_out;
HYDT_bind_obj_type_t topo_end = HYDT_BIND_OBJ_END;
@@ -31,19 +31,17 @@
if (user_binding)
binding = user_binding;
- else
- HYD_GET_ENV_STR_VAL(binding, "HYDRA_BINDING", NULL);
+ else if (MPL_env2str("HYDRA_BINDING", &binding) == 0)
+ binding = NULL;
if (user_bindlib)
bindlib = HYDU_strdup(user_bindlib);
- else
- HYD_GET_ENV_STR_VAL(bindlib, "HYDRA_BINDLIB", HYDRA_DEFAULT_BINDLIB);
+ else if (MPL_env2str("HYDRA_BINDLIB", &bindlib) == 0)
+ bindlib = HYDRA_DEFAULT_BINDLIB;
HYDT_bind_info.support_level = HYDT_BIND_SUPPORT_NONE;
- if (bindlib) {
+ if (bindlib)
HYDT_bind_info.bindlib = HYDU_strdup(bindlib);
- HYDU_FREE(bindlib);
- }
else
HYDT_bind_info.bindlib = NULL;
HYDT_bind_info.bindmap = NULL;
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/external_launch.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/external_launch.c 2011-02-11 23:34:33 UTC (rev 7944)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/external_launch.c 2011-02-11 23:36:33 UTC (rev 7945)
@@ -12,6 +12,91 @@
static int fd_stdout, fd_stderr;
+/* We use the following priority order for the executable path: (1)
+ * user-specified; (2) search in path; (3) Hard-coded location */
+static HYD_status ssh_get_path(char **path)
+{
+ if (HYDT_bsci_info.launcher_exec)
+ *path = HYDU_strdup(HYDT_bsci_info.launcher_exec);
+ if (*path == NULL)
+ *path = HYDU_find_full_path("ssh");
+ if (*path == NULL)
+ *path = HYDU_strdup("/usr/bin/ssh");
+
+ return HYD_SUCCESS;
+}
+
+static HYD_status rsh_get_path(char **path)
+{
+ if (HYDT_bsci_info.launcher_exec)
+ *path = HYDU_strdup(HYDT_bsci_info.launcher_exec);
+ if (*path == NULL)
+ *path = HYDU_find_full_path("rsh");
+ if (*path == NULL)
+ *path = HYDU_strdup("/usr/bin/rsh");
+
+ return HYD_SUCCESS;
+}
+
+static HYD_status lsf_get_path(char **path)
+{
+ char *bin_dir = NULL;
+ int length;
+ HYD_status status = HYD_SUCCESS;
+
+ if (HYDT_bsci_info.launcher_exec)
+ *path = HYDU_strdup(HYDT_bsci_info.launcher_exec);
+
+ if (*path == NULL) {
+ MPL_env2str("LSF_BINDIR", (const char **) &bin_dir);
+ if (bin_dir) {
+ length = strlen(bin_dir) + 2 + strlen("blaunch");
+ HYDU_MALLOC(*path, char *, length, status);
+ MPL_snprintf(*path, length, "%s/blaunch", bin_dir);
+ }
+ }
+ if (*path == NULL)
+ *path = HYDU_find_full_path("blaunch");
+ if (*path == NULL)
+ *path = HYDU_strdup("/usr/bin/blaunch");
+
+ fn_exit:
+ return status;
+
+ fn_fail:
+ goto fn_exit;
+}
+
+static HYD_status sge_get_path(char **path)
+{
+ char *sge_root = NULL, *arc = NULL;
+ int length;
+ HYD_status status = HYD_SUCCESS;
+
+ if (HYDT_bsci_info.launcher_exec)
+ *path = HYDU_strdup(HYDT_bsci_info.launcher_exec);
+
+ if (*path == NULL) {
+ MPL_env2str("SGE_ROOT", (const char **) &sge_root);
+ MPL_env2str("ARC", (const char **) &arc);
+ if (sge_root && arc) {
+ length = strlen(sge_root) + strlen("/bin/") + strlen(arc) + 1 + strlen("qrsh") + 1;
+ HYDU_MALLOC(*path, char *, length, status);
+ MPL_snprintf(*path, length, "%s/bin/%s/qrsh", sge_root, arc);
+ }
+ }
+ if (*path == NULL)
+ *path = HYDU_find_full_path("qrsh");
+ if (*path == NULL)
+ *path = HYDU_strdup("/usr/bin/qrsh");
+
+ fn_exit:
+ return status;
+
+ fn_fail:
+ goto fn_exit;
+}
+
HYD_status HYDT_bscd_external_launch_procs(char **args, struct HYD_node *node_list,
int *control_fd)
{
@@ -27,69 +112,31 @@
HYDU_FUNC_ENTER();
- /* We use the following priority order for the executable path:
- * (1) user-specified; (2) search in path; (3) Hard-coded
- * location */
- if (HYDT_bsci_info.launcher_exec)
- path = HYDU_strdup(HYDT_bsci_info.launcher_exec);
if (!strcmp(HYDT_bsci_info.launcher, "ssh")) {
- if (!path)
- path = HYDU_find_full_path("ssh");
- if (!path)
- path = HYDU_strdup("/usr/bin/ssh");
+ status = ssh_get_path(&path);
+ HYDU_ERR_POP(status, "unable to get path to the ssh executable\n");
}
else if (!strcmp(HYDT_bsci_info.launcher, "rsh")) {
- if (!path)
- path = HYDU_find_full_path("rsh");
- if (!path)
- path = HYDU_strdup("/usr/bin/rsh");
+ status = rsh_get_path(&path);
+ HYDU_ERR_POP(status, "unable to get path to the rsh executable\n");
}
+ else if (!strcmp(HYDT_bsci_info.launcher, "fork")) {
+ /* fork is not an external launcher */
+ }
else if (!strcmp(HYDT_bsci_info.launcher, "lsf")) {
- char *bin_dir = NULL;
- int length;
-
- MPL_env2str("LSF_BINDIR", (const char **) &bin_dir);
- if (bin_dir) {
- length = strlen(bin_dir) + 2 + strlen("blaunch");
- HYDU_MALLOC(path, char *, length, status);
- MPL_snprintf(path, length, "%s/blaunch", bin_dir);
- }
- if (!path)
- path = HYDU_find_full_path("blaunch");
- if (!path)
- path = HYDU_strdup("/usr/bin/blaunch");
+ status = lsf_get_path(&path);
+ HYDU_ERR_POP(status, "unable to get path to the blaunch executable\n");
}
else if (!strcmp(HYDT_bsci_info.launcher, "sge")) {
- char *sge_root = NULL, *arc = NULL;
- int length;
-
- MPL_env2str("SGE_ROOT", (const char **) &sge_root);
- MPL_env2str("ARC", (const char **) &arc);
- if (sge_root && arc) {
- length = strlen(sge_root) + strlen("/bin/") + strlen(arc) + 1 + strlen("qrsh") + 1;
- HYDU_MALLOC(path, char *, length, status);
- MPL_snprintf(path, length, "%s/bin/%s/qrsh", sge_root, arc);
- }
-
- if (!path)
- path = HYDU_find_full_path("qrsh");
- if (!path)
- path = HYDU_strdup("/usr/bin/qrsh");
+ status = sge_get_path(&path);
+ HYDU_ERR_POP(status, "unable to get path to the qrsh executable\n");
}
idx = 0;
if (path)
targs[idx++] = HYDU_strdup(path);
+ targs[idx] = NULL;
- MPL_env2str("HYDRA_LAUNCH_EXTRA_ARGS", (const char **) &extra_arg_list);
- if (extra_arg_list) {
- extra_arg = strtok(extra_arg_list, " ");
- while (extra_arg) {
- targs[idx++] = HYDU_strdup(extra_arg);
- extra_arg = strtok(NULL, " ");
- }
- }
-
/* Allow X forwarding only if explicitly requested */
if (!strcmp(HYDT_bsci_info.launcher, "ssh")) {
if (HYDT_bsci_info.enablex == 1)
@@ -107,6 +154,15 @@
targs[idx++] = HYDU_strdup("-V");
}
+ MPL_env2str("HYDRA_LAUNCH_EXTRA_ARGS", (const char **) &extra_arg_list);
+ if (extra_arg_list) {
+ extra_arg = strtok(extra_arg_list, " ");
+ while (extra_arg) {
+ targs[idx++] = HYDU_strdup(extra_arg);
+ extra_arg = strtok(NULL, " ");
+ }
+ }
+
host_idx = idx++; /* Hostname will come here */
targs[host_idx] = NULL;
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/coll-err-ret/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/tools/bootstrap/slurm/slurm_query_proxy_id.c:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/tools/bootstrap/slurm/slurm_query_proxy_id.c:5817
/mpich2/trunk/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932
+ /mpich2/branches/dev/coll-err-ret/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/tools/bootstrap/slurm/slurm_query_proxy_id.c:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/tools/bootstrap/slurm/slurm_query_proxy_id.c:5817
/mpich2/trunk/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/include/bsci.h
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/include/bsci.h 2011-02-11 23:34:33 UTC (rev 7944)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/include/bsci.h 2011-02-11 23:36:33 UTC (rev 7945)
@@ -27,10 +27,10 @@
const char *launcher_exec;
/** \brief Enable/disable X-forwarding */
- int enablex;
+ int enablex;
/** \brief Enable/disable debugging */
- int debug;
+ int debug;
};
/**
@@ -43,7 +43,7 @@
HYD_status(*query_native_int) (int *ret);
/** \brief Query for node list information */
- HYD_status(*query_node_list) (struct HYD_node **node_list);
+ HYD_status(*query_node_list) (struct HYD_node ** node_list);
/** \brief Query for job ID information */
HYD_status(*query_jobid) (char **jobid);
@@ -54,7 +54,7 @@
/* Launcher functions */
/** \brief Launch processes */
- HYD_status(*launch_procs) (char **args, struct HYD_node *node_list, int *control_fd);
+ HYD_status(*launch_procs) (char **args, struct HYD_node * node_list, int *control_fd);
/** \brief Finalize the bootstrap control device */
HYD_status(*launcher_finalize) (void);
@@ -89,8 +89,7 @@
* pointers in this function to be used by later BSCI calls.
*/
HYD_status HYDT_bsci_init(const char *rmk, const char *launcher,
- const char *launcher_exec, int enablex,
- int debug);
+ const char *launcher_exec, int enablex, int debug);
/**
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/src/bsci_finalize.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/src/bsci_finalize.c 2011-02-11 23:34:33 UTC (rev 7944)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/src/bsci_finalize.c 2011-02-11 23:36:33 UTC (rev 7945)
@@ -24,15 +24,6 @@
HYDU_ERR_POP(status, "RMK returned error while finalizing\n");
}
- if (HYDT_bsci_info.rmk)
- HYDU_FREE(HYDT_bsci_info.rmk);
-
- if (HYDT_bsci_info.launcher)
- HYDU_FREE(HYDT_bsci_info.launcher);
-
- if (HYDT_bsci_info.launcher_exec)
- HYDU_FREE(HYDT_bsci_info.launcher_exec);
-
fn_exit:
HYDU_FUNC_EXIT();
return status;
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/src/bsci_init.c.in
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/src/bsci_init.c.in 2011-02-11 23:34:33 UTC (rev 7944)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/src/bsci_init.c.in 2011-02-11 23:36:33 UTC (rev 7945)
@@ -11,10 +11,12 @@
struct HYDT_bsci_fns HYDT_bsci_fns = { 0 };
struct HYDT_bsci_info HYDT_bsci_info = { 0 };
+/* *INDENT-OFF* */
static const char *launcher_array[] = { @hydra_launcher_array@ };
static const char *rmk_array[] = { @hydra_rmk_array@ };
static HYD_status(*launcher_init_array[])(void) = { @hydra_launcher_init_array@ };
static HYD_status(*rmk_init_array[])(void) = { @hydra_rmk_init_array@ };
+/* *INDENT-ON* */
static void init_rmk_fns(void)
{
@@ -50,10 +52,10 @@
for (i = 0; rmk_array[i]; i++) {
init_rmk_fns();
- HYDT_bsci_info.rmk = HYDU_strdup(rmk_array[i]);
+ HYDT_bsci_info.rmk = rmk_array[i];
HYDT_bsci_info.debug = debug;
- status = (*rmk_init_array[i])();
+ status = (*rmk_init_array[i]) ();
HYDU_ERR_POP(status, "bootstrap device returned error initializing\n");
status = HYDT_bsci_query_native_int(&ret);
@@ -64,7 +66,6 @@
HYDU_ERR_POP(status, "unable to finalize bootstrap server\n");
}
- HYDU_FREE(HYDT_bsci_info.rmk);
init_rmk_fns();
if (ret)
@@ -73,7 +74,7 @@
fn_exit:
if (ret)
- return ((const char *) HYDU_strdup(rmk_array[i]));
+ return ((const char *) rmk_array[i]);
else
return NULL;
@@ -97,7 +98,7 @@
/* See if the user specified an RMK */
if (user_rmk)
- HYDT_bsci_info.rmk = HYDU_strdup(user_rmk);
+ HYDT_bsci_info.rmk = user_rmk;
if (HYDT_bsci_info.rmk == NULL)
MPL_env2str("HYDRA_RMK", (const char **) &HYDT_bsci_info.rmk);
@@ -112,7 +113,7 @@
/* See if the user specified a launcher */
if (user_launcher)
- HYDT_bsci_info.launcher = HYDU_strdup(user_launcher);
+ HYDT_bsci_info.launcher = user_launcher;
if (HYDT_bsci_info.launcher == NULL)
MPL_env2str("HYDRA_LAUNCHER", (const char **) &HYDT_bsci_info.launcher);
if (HYDT_bsci_info.launcher == NULL)
@@ -125,30 +126,12 @@
if (!strcmp(HYDT_bsci_info.rmk, launcher_array[i]))
break;
if (launcher_array[i])
- HYDT_bsci_info.launcher = HYDU_strdup(launcher_array[i]);
+ HYDT_bsci_info.launcher = launcher_array[i];
}
-
- /* If no RMK is provided or detected, use the default RMK */
- if (HYDT_bsci_info.rmk == NULL)
- HYDT_bsci_info.rmk = HYDU_strdup(HYDRA_DEFAULT_RMK);
-
- /* Initialize the RMK */
- for (i = 0; rmk_array[i]; i++) {
- if (!strcmp(HYDT_bsci_info.rmk, rmk_array[i])) {
- status = (*rmk_init_array[i])();
- HYDU_ERR_POP(status, "RMK init returned error\n");
- break;
- }
- }
- if (rmk_array[i] == NULL)
- HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR,
- "unrecognized RMK: %s\n", HYDT_bsci_info.rmk);
-
-
/* If no launcher is provided or detected, use the default launcher */
if (HYDT_bsci_info.launcher == NULL)
- HYDT_bsci_info.launcher = HYDU_strdup(HYDRA_DEFAULT_LAUNCHER);
+ HYDT_bsci_info.launcher = HYDRA_DEFAULT_LAUNCHER;
if (HYDT_bsci_info.launcher == NULL)
HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR, "no appropriate launcher found\n");
@@ -157,16 +140,20 @@
HYDT_bsci_info.enablex = enablex;
if (user_launcher_exec)
- HYDT_bsci_info.launcher_exec = HYDU_strdup(user_launcher_exec);
- if (HYDT_bsci_info.launcher_exec == NULL)
- HYD_GET_ENV_STR_VAL(HYDT_bsci_info.launcher_exec, "HYDRA_LAUNCHER_EXEC", NULL);
- if (HYDT_bsci_info.launcher_exec == NULL)
- HYD_GET_ENV_STR_VAL(HYDT_bsci_info.launcher_exec, "HYDRA_BOOTSTRAP_EXEC", NULL);
+ HYDT_bsci_info.launcher_exec = user_launcher_exec;
+ if (HYDT_bsci_info.launcher_exec == NULL) {
+ if (MPL_env2str("HYDRA_LAUNCHER_EXEC", &HYDT_bsci_info.launcher_exec) == 0)
+ HYDT_bsci_info.launcher_exec = NULL;
+ }
+ if (HYDT_bsci_info.launcher_exec == NULL) {
+ if (MPL_env2str("HYDRA_BOOTSTRAP_EXEC", &HYDT_bsci_info.launcher_exec) == 0)
+ HYDT_bsci_info.launcher_exec = NULL;
+ }
/* Make sure the launcher we found is valid */
for (i = 0; launcher_array[i]; i++) {
if (!strcmp(HYDT_bsci_info.launcher, launcher_array[i])) {
- status = (*launcher_init_array[i])();
+ status = (*launcher_init_array[i]) ();
HYDU_ERR_POP(status, "launcher init returned error\n");
break;
}
@@ -176,6 +163,23 @@
"unrecognized launcher: %s\n", HYDT_bsci_info.launcher);
+ /* If no RMK is provided or detected, use the default RMK */
+ if (HYDT_bsci_info.rmk == NULL)
+ HYDT_bsci_info.rmk = HYDRA_DEFAULT_RMK;
+
+ /* Initialize the RMK */
+ for (i = 0; rmk_array[i]; i++) {
+ if (!strcmp(HYDT_bsci_info.rmk, rmk_array[i])) {
+ status = (*rmk_init_array[i]) ();
+ HYDU_ERR_POP(status, "RMK init returned error\n");
+ break;
+ }
+ }
+ if (rmk_array[i] == NULL)
+ HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR,
+ "unrecognized RMK: %s\n", HYDT_bsci_info.rmk);
+
+
/* This function is mandatory */
if (HYDT_bsci_fns.launch_procs == NULL)
HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR,
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/coll-err-ret/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:5817
/mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932
+ /mpich2/branches/dev/coll-err-ret/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:5817
/mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/ckpoint/ckpoint.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/ckpoint/ckpoint.c 2011-02-11 23:34:33 UTC (rev 7944)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/ckpoint/ckpoint.c 2011-02-11 23:36:33 UTC (rev 7945)
@@ -24,14 +24,15 @@
if (user_ckpointlib)
HYDT_ckpoint_info.ckpointlib = user_ckpointlib;
- else
- HYD_GET_ENV_STR_VAL(HYDT_ckpoint_info.ckpointlib, "HYDRA_CKPOINTLIB",
- HYDRA_DEFAULT_CKPOINTLIB);
+ else if (MPL_env2str("HYDRA_CKPOINTLIB", (const char **) &HYDT_ckpoint_info.ckpointlib) ==
+ 0)
+ HYDT_ckpoint_info.ckpointlib = HYDRA_DEFAULT_CKPOINTLIB;
if (user_ckpoint_prefix)
HYDT_ckpoint_info.ckpoint_prefix = user_ckpoint_prefix;
- else
- HYD_GET_ENV_STR_VAL(HYDT_ckpoint_info.ckpoint_prefix, "HYDRA_CKPOINT_PREFIX", NULL);
+ else if (MPL_env2str("HYDRA_CKPOINT_PREFIX",
+ (const char **) &HYDT_ckpoint_info.ckpoint_prefix) == 0)
+ HYDT_ckpoint_info.ckpoint_prefix = NULL;
if (HYDT_ckpoint_info.ckpoint_prefix == NULL)
goto fn_exit;
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/ui
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/ui:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/ui:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/ui:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/ui:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/ui:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/ui:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/ui:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/ui:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/ui:5406
/mpich2/trunk/src/pm/hydra/ui:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932
+ /mpich2/branches/dev/ckpt/src/pm/hydra/ui:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/ui:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/ui:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/ui:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/ui:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/ui:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/ui:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/ui:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/ui:5406
/mpich2/trunk/src/pm/hydra/ui:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/ui/mpich/utils.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/ui/mpich/utils.c 2011-02-11 23:34:33 UTC (rev 7944)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/ui/mpich/utils.c 2011-02-11 23:36:33 UTC (rev 7945)
@@ -1078,7 +1078,8 @@
MPL_env2bool("HYDRA_DEBUG", &HYD_server_info.user_global.debug) == 0)
HYD_server_info.user_global.debug = 0;
- HYD_GET_ENV_STR_VAL(HYD_server_info.user_global.iface, "HYDRA_IFACE", NULL);
+ if (MPL_env2str("HYDRA_IFACE", (const char **) &HYD_server_info.user_global.iface) == 0)
+ HYD_server_info.user_global.iface = NULL;
if (HYD_server_info.node_list == NULL &&
MPL_env2str("HYDRA_HOST_FILE", (const char **) &tmp)) {
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/utils
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/utils:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/utils:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/utils:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/utils:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/utils:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/utils:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/utils:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/utils:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/utils:5406
/mpich2/trunk/src/pm/hydra/utils:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932
+ /mpich2/branches/dev/ckpt/src/pm/hydra/utils:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/utils:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/utils:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/utils:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/utils:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/utils:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/utils:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/utils:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/utils:5406
/mpich2/trunk/src/pm/hydra/utils:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/utils/sock/sock.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/utils/sock/sock.c 2011-02-11 23:34:33 UTC (rev 7944)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/utils/sock/sock.c 2011-02-11 23:36:33 UTC (rev 7945)
@@ -18,6 +18,37 @@
struct fwd_hash *next;
};
+static char localhost[MAX_HOSTNAME_LEN] = { 0 };
+static char shortlocal[MAX_HOSTNAME_LEN] = { 0 };
+
+static HYD_status sock_localhost_init(void)
+{
+ static int init = 1;
+ int i;
+ HYD_status status = HYD_SUCCESS;
+
+ if (init) {
+ init = 0;
+
+ status = HYDU_gethostname(localhost);
+ HYDU_ERR_POP(status, "unable to get local hostname\n");
+
+ strcpy(shortlocal, localhost);
+ for (i = 0; shortlocal[i]; i++) {
+ if (shortlocal[i] == '.') {
+ shortlocal[i] = 0;
+ break;
+ }
+ }
+ }
+
+ fn_exit:
+ return status;
+
+ fn_fail:
+ goto fn_exit;
+}
+
HYD_status HYDU_sock_listen(int *listen_fd, char *port_range, uint16_t * port)
{
struct sockaddr_in sa;
@@ -148,9 +179,12 @@
* return an error, but only print a warning message. The upper
* layer can decide what to do with the return status. */
if (connect(*fd, (struct sockaddr *) &sa, sizeof(sa)) < 0) {
- HYDU_error_printf("connect error (%s)\n", HYDU_strerror(errno));
- status = HYD_SOCK_ERROR;
- goto fn_fail;
+ status = sock_localhost_init();
+ HYDU_ERR_POP(status, "unable to initialize sock local information\n");
+
+ HYDU_ERR_SETANDJUMP(status, HYD_SOCK_ERROR,
+ "unable to connect from \"%s\" to \"%s\" (%s)\n",
+ localhost, host, HYDU_strerror(errno));
}
/* Disable nagle */
@@ -463,9 +497,6 @@
char *ip1 = NULL, *ip2 = NULL;
char buf1[INET_ADDRSTRLEN], buf2[INET_ADDRSTRLEN];
struct sockaddr_in *sa_ptr, sa;
- static int init = 1;
- static char localhost[MAX_HOSTNAME_LEN] = { 0 };
- static char shortlocal[MAX_HOSTNAME_LEN] = { 0 };
char shorthost[MAX_HOSTNAME_LEN] = { 0 };
int i;
@@ -516,22 +547,10 @@
#endif
/* Direct comparison of host names */
- if (init) {
- init = 0;
+ status = sock_localhost_init();
+ HYDU_ERR_POP(status, "unable to initialize sock local information\n");
- status = HYDU_gethostname(localhost);
- HYDU_ERR_POP(status, "unable to get local hostname\n");
-
- strcpy(shortlocal, localhost);
- for (i = 0; shortlocal[i]; i++) {
- if (shortlocal[i] == '.') {
- shortlocal[i] = 0;
- break;
- }
- }
- }
-
- if (!strcmp(host, localhost)) {
+ if (!strcmp(host, localhost) || !strcmp(host, "localhost")) {
*is_local = 1;
goto fn_exit;
}
@@ -548,7 +567,7 @@
}
}
- if (!strcmp(shorthost, shortlocal)) {
+ if (!strcmp(shorthost, shortlocal) || !strcmp(shorthost, "localhost")) {
*is_local = 1;
goto fn_exit;
}
Property changes on: mpich2/branches/release/mpich2-1.3.x/winconfigure.wsf
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/winconfigure.wsf:5050
/mpich2/branches/dev/ckpt2/winconfigure.wsf:5057-6537
/mpich2/branches/dev/coll-err-ret/winconfigure.wsf:7771-7802
/mpich2/branches/dev/error-return/winconfigure.wsf:7662-7670
/mpich2/branches/dev/ftb/winconfigure.wsf:5661-5730
/mpich2/branches/dev/lapi/winconfigure.wsf:5817
/mpich2/branches/dev/win_rrvm/winconfigure.wsf:6404,6407-6408,6420,6422-6423
/mpich2/branches/dev/wintcp_async_progress/winconfigure.wsf:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/winconfigure.wsf:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/winconfigure.wsf:5406
/mpich2/trunk/winconfigure.wsf:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923,7925-7926,7929,7931-7932,7935
+ /mpich2/branches/dev/ckpt/winconfigure.wsf:5050
/mpich2/branches/dev/ckpt2/winconfigure.wsf:5057-6537
/mpich2/branches/dev/coll-err-ret/winconfigure.wsf:7771-7802
/mpich2/branches/dev/error-return/winconfigure.wsf:7662-7670
/mpich2/branches/dev/ftb/winconfigure.wsf:5661-5730
/mpich2/branches/dev/lapi/winconfigure.wsf:5817
/mpich2/branches/dev/win_rrvm/winconfigure.wsf:6404,6407-6408,6420,6422-6423
/mpich2/branches/dev/wintcp_async_progress/winconfigure.wsf:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/winconfigure.wsf:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/winconfigure.wsf:5406
/mpich2/trunk/winconfigure.wsf:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923,7925-7926,7929,7931-7932,7935,7937-7944
More information about the mpich2-commits
mailing list