[mpich2-commits] r8072 - in mpich2/branches/release/mpich2-1.3.x: . confdb maint src/include src/mpi/errhan src/mpi/rma src/mpid src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp src/mpid/ch3/src src/mpl/src src/pm/hydra src/pm/hydra/examples src/pm/hydra/include src/pm/hydra/pm src/pm/hydra/tools src/pm/hydra/tools/bootstrap/external src/pm/hydra/tools/bootstrap/src src/pm/hydra/ui src/pm/hydra/utils
gropp at mcs.anl.gov
gropp at mcs.anl.gov
Mon Feb 28 11:53:56 CST 2011
Author: gropp
Date: 2011-02-28 11:53:56 -0600 (Mon, 28 Feb 2011)
New Revision: 8072
Modified:
mpich2/branches/release/mpich2-1.3.x/
mpich2/branches/release/mpich2-1.3.x/confdb/
mpich2/branches/release/mpich2-1.3.x/maint/Version
mpich2/branches/release/mpich2-1.3.x/src/include/mpiimpl.h
mpich2/branches/release/mpich2-1.3.x/src/mpi/errhan/errnames.txt
mpich2/branches/release/mpich2-1.3.x/src/mpi/rma/win_create.c
mpich2/branches/release/mpich2-1.3.x/src/mpi/rma/win_free.c
mpich2/branches/release/mpich2-1.3.x/src/mpi/rma/win_lock.c
mpich2/branches/release/mpich2-1.3.x/src/mpi/rma/win_unlock.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/mpid/ch3/src/ch3u_rma_sync.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/mpich2prereq
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/
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/src/bsci_query_proxy_id.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/ui/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/utils/
mpich2/branches/release/mpich2-1.3.x/winconfigure.wsf
Log:
Merge r8069 and r8070
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,7919-7923,7925-7926,7929,7931-7932,7934-7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-8
008,8010-8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064
/mpich2/trunk/test/mpi/rma:7960
+ /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,7919-7923,7925-7926,7929,7931-7932,7934-7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-8
008,8010-8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064,8069-8070
/mpich2/trunk/test/mpi/rma:7960
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,7919-7923,7925-7926,7929,7931-7932,7934-7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003
,8005-8008,8010-8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064
+ /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,7919-7923,7925-7926,7929,7931-7932,7934-7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003
,8005-8008,8010-8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064,8069-8070
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,7919-7923,7925-7926,7929,7931-7932,7934-7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,80
38,8040,8044,8049,8051,8053-8056,8059,8062,8064
/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,7919-7923,7925-7926,7929,7931-7932,7934-7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,80
38,8040,8044,8049,8051,8053-8056,8059,8062,8064,8069-8070
/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/mpiimpl.h
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/include/mpiimpl.h 2011-02-28 16:49:32 UTC (rev 8071)
+++ mpich2/branches/release/mpich2-1.3.x/src/include/mpiimpl.h 2011-02-28 17:53:56 UTC (rev 8072)
@@ -1513,6 +1513,8 @@
MPID_Comm *comm_ptr; /* Pointer to comm of window (dup) */
int myrank; /* Rank of this process in comm (used to
detect operations on self) */
+ int lockRank; /* If within an MPI_Win_lock epoch,
+ the rank that we locked */
#ifdef USE_THREADED_WINDOW_CODE
/* These were causing compilation errors. We need to figure out how to
integrate threads into MPICH2 before including these fields. */
Modified: mpich2/branches/release/mpich2-1.3.x/src/mpi/errhan/errnames.txt
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/mpi/errhan/errnames.txt 2011-02-28 16:49:32 UTC (rev 8071)
+++ mpich2/branches/release/mpich2-1.3.x/src/mpi/errhan/errnames.txt 2011-02-28 17:53:56 UTC (rev 8072)
@@ -367,8 +367,23 @@
**rmasize %d:Invalid size argument in RMA call (value is %d)
**rmadisp:Invalid displacement argument in RMA call
**assert:Invalid assert argument
+**lockassertval:Invalid assert argument passed to MPI_Win_lock
+**lockassertval %d: Invalid assert argument (%d) passed to MPI_Win_lock
**winunlockrank:Invalid rank argument
**winunlockrank %d %d:Invalid rank argument %d, should be %d
+**mismatchedlockrank:Rank to unlock in MPI_Win_unlock was not locked with \
+ MPI_Win_lock
+**mismatchedlockrank %d %d:Rank to unlock (%d) in MPI_Win_unlock was not \
+ locked with MPI_Win_lock (rank %d was locked)
+**winunlockwithoutlock: Attempt to unlock in MPI_Win_unlock without \
+ first locking with MPI_Win_lock
+**winfreewhilelocked: MPI_Win_free called while holding an MPI_Win_lock on \
+ a window
+**winfreewhilelocked %d: MPI_Win_free called while holding an MPI_Win_lock on \
+ the process with rank %d
+**lockwhilelocked: Attempt to lock a process while holding a lock
+**lockwhilelocked %d: Attempt to lock a process while holding a lock on \
+ process %d
**nomemreq:failure occurred while allocating memory for a request object
**nomemuereq %d:Failed to allocate memory for an unexpected message. %d \
unexpected messages queued.
@@ -395,6 +410,7 @@
# Duplicates?
#**argnull:Invalid null parameter
#**argnull %s:Invalid null parameter %s
+**commstack:Internal overflow in stack used for MPI_Comm_split
**cond_create:MPIU_Thread_cond_create failed
**cond_create %s:MPIU_Thread_cond_create failed: %s
Modified: mpich2/branches/release/mpich2-1.3.x/src/mpi/rma/win_create.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/mpi/rma/win_create.c 2011-02-28 16:49:32 UTC (rev 8071)
+++ mpich2/branches/release/mpich2-1.3.x/src/mpi/rma/win_create.c 2011-02-28 17:53:56 UTC (rev 8072)
@@ -47,9 +47,11 @@
.N Errors
.N MPI_SUCCESS
+.N MPI_ERR_ARG
.N MPI_ERR_COMM
.N MPI_ERR_INFO
.N MPI_ERR_OTHER
+.N MPI_ERR_SIZE
@*/
int MPI_Win_create(void *base, MPI_Aint size, int disp_unit, MPI_Info info,
MPI_Comm comm, MPI_Win *win)
@@ -119,6 +121,7 @@
/* Initialize a few fields that have specific defaults */
win_ptr->name[0] = 0;
win_ptr->errhandler = 0;
+ win_ptr->lockRank = -1;
/* return the handle of the window object to the user */
MPIU_OBJ_PUBLISH_HANDLE(*win, win_ptr->handle);
Modified: mpich2/branches/release/mpich2-1.3.x/src/mpi/rma/win_free.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/mpi/rma/win_free.c 2011-02-28 16:49:32 UTC (rev 8071)
+++ mpich2/branches/release/mpich2-1.3.x/src/mpi/rma/win_free.c 2011-02-28 17:53:56 UTC (rev 8072)
@@ -45,6 +45,7 @@
.N Errors
.N MPI_SUCCESS
.N MPI_ERR_WIN
+.N MPI_ERR_OTHER
@*/
int MPI_Win_free(MPI_Win *win)
{
@@ -83,6 +84,12 @@
/* If win_ptr is not valid, it will be reset to null */
if (mpi_errno) goto fn_fail;
+ /* Check for unterminated lock epoch */
+ if (win_ptr->lockRank != -1) {
+ MPIU_ERR_SET1(mpi_errno,MPI_ERR_OTHER,
+ "**winfreewhilelocked",
+ "**winfreewhilelocked %d", win_ptr->lockRank);
+ }
}
MPID_END_ERROR_CHECKS;
}
Modified: mpich2/branches/release/mpich2-1.3.x/src/mpi/rma/win_lock.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/mpi/rma/win_lock.c 2011-02-28 16:49:32 UTC (rev 8071)
+++ mpich2/branches/release/mpich2-1.3.x/src/mpi/rma/win_lock.c 2011-02-28 17:53:56 UTC (rev 8072)
@@ -52,9 +52,9 @@
be used portably only in such memory.
The 'assert' argument is used to indicate special conditions for the
- fence that an implementation may use to optimize the 'MPI_Win_fence'
+ fence that an implementation may use to optimize the 'MPI_Win_lock'
operation. The value zero is always correct. Other assertion values
- may be or''ed together. Assertions that are valid for 'MPI_Win_fence' are\:
+ may be or''ed together. Assertions that are valid for 'MPI_Win_lock' are\:
. MPI_MODE_NOCHECK - no other process holds, or will attempt to acquire a
conflicting lock, while the caller holds the window lock. This is useful
@@ -70,6 +70,7 @@
.N MPI_SUCCESS
.N MPI_ERR_RANK
.N MPI_ERR_WIN
+.N MPI_ERR_OTHER
@*/
int MPI_Win_lock(int lock_type, int rank, int assert, MPI_Win win)
{
@@ -110,13 +111,22 @@
/* If win_ptr is not value, it will be reset to null */
if (mpi_errno) goto fn_fail;
- if (lock_type != MPI_LOCK_SHARED && lock_type != MPI_LOCK_EXCLUSIVE)
- mpi_errno = MPIR_Err_create_code( MPI_SUCCESS,
- MPIR_ERR_RECOVERABLE,
- FCNAME, __LINE__,
- MPI_ERR_OTHER,
- "**locktype", 0 );
+ if (assert != 0 && assert != MPI_MODE_NOCHECK) {
+ MPIU_ERR_SET1(mpi_errno,MPI_ERR_ARG,
+ "**lockassertval",
+ "**lockassertval %d", assert );
+ if (mpi_errno) goto fn_fail;
+ }
+ if (lock_type != MPI_LOCK_SHARED &&
+ lock_type != MPI_LOCK_EXCLUSIVE) {
+ MPIU_ERR_SET(mpi_errno,MPI_ERR_OTHER, "**locktype" );
+ }
+ if (win_ptr->lockRank != -1) {
+ MPIU_ERR_SET1(mpi_errno,MPI_ERR_OTHER,
+ "**lockwhilelocked",
+ "**lockwhilelocked %d", win_ptr->lockRank );
+ }
comm_ptr = win_ptr->comm_ptr;
MPIR_ERRTEST_SEND_RANK(comm_ptr, rank, mpi_errno);
@@ -131,6 +141,8 @@
mpi_errno = MPIU_RMA_CALL(win_ptr,
Win_lock(lock_type, rank, assert, win_ptr));
if (mpi_errno != MPI_SUCCESS) goto fn_fail;
+ /* If the lock succeeded, remember which one with locked */
+ win_ptr->lockRank = rank;
/* ... end of body of routine ... */
Modified: mpich2/branches/release/mpich2-1.3.x/src/mpi/rma/win_unlock.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/mpi/rma/win_unlock.c 2011-02-28 16:49:32 UTC (rev 8071)
+++ mpich2/branches/release/mpich2-1.3.x/src/mpi/rma/win_unlock.c 2011-02-28 17:53:56 UTC (rev 8072)
@@ -89,8 +89,19 @@
comm_ptr = win_ptr->comm_ptr;
MPIR_ERRTEST_SEND_RANK(comm_ptr, rank, mpi_errno);
-
if (mpi_errno) goto fn_fail;
+ /* Test that the rank we are unlocking is the rank that we locked */
+ if (win_ptr->lockRank != rank) {
+ if (win_ptr->lockRank < 0) {
+ MPIU_ERR_SET(mpi_errno,MPI_ERR_RANK,"**winunlockwithoutlock");
+ }
+ else {
+ MPIU_ERR_SET2(mpi_errno,MPI_ERR_RANK,
+ "**mismatchedlockrank",
+ "**mismatchedlockrank %d %d", rank, win_ptr->lockRank );
+ }
+ if (mpi_errno) goto fn_fail;
+ }
}
MPID_END_ERROR_CHECKS;
}
@@ -100,6 +111,9 @@
mpi_errno = MPIU_RMA_CALL(win_ptr,Win_unlock(rank, win_ptr));
if (mpi_errno != MPI_SUCCESS) goto fn_fail;
+ /* Clear the lockRank on success with the unlock */
+ /* FIXME: Should this always be cleared, even on failure? */
+ win_ptr->lockRank = -1;
/* ... end of body of routine ... */
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,7919-7923,7925-7926,7929,7931-7932,7934-7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,80
05-8008,8010-8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064
+ /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,7919-7923,7925-7926,7929,7931-7932,7934-7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,80
05-8008,8010-8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064,8069-8070
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,7919-7923,7925-7926,7929,7931-7932,7934-7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,
7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064
+ /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,7919-7923,7925-7926,7929,7931-7932,7934-7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,
7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064,8069-8070
Modified: mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/src/ch3u_rma_sync.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/src/ch3u_rma_sync.c 2011-02-28 16:49:32 UTC (rev 8071)
+++ mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/src/ch3u_rma_sync.c 2011-02-28 17:53:56 UTC (rev 8072)
@@ -26,11 +26,13 @@
MPIU_INSTR_DURATION_DECL(wincomplete_issue);
MPIU_INSTR_DURATION_DECL(wincomplete_complete);
MPIU_INSTR_DURATION_DECL(wincomplete_recvsync);
+MPIU_INSTR_DURATION_DECL(wincomplete_block);
MPIU_INSTR_DURATION_DECL(winwait_wait);
MPIU_INSTR_DURATION_DECL(winlock_getlocallock);
MPIU_INSTR_DURATION_DECL(winunlock_getlock);
MPIU_INSTR_DURATION_DECL(winunlock_issue);
MPIU_INSTR_DURATION_DECL(winunlock_complete);
+MPIU_INSTR_DURATION_DECL(winunlock_block);
MPIU_INSTR_DURATION_DECL(lockqueue_alloc);
MPIU_INSTR_DURATION_DECL(rmapkt_acc);
MPIU_INSTR_DURATION_DECL(rmapkt_acc_predef);
@@ -53,11 +55,13 @@
MPIU_INSTR_DURATION_INIT(wincomplete_recvsync,1,"WIN_COMPLETE:Recv sync messages");
MPIU_INSTR_DURATION_INIT(wincomplete_issue,2,"WIN_COMPLETE:Issue RMA ops");
MPIU_INSTR_DURATION_INIT(wincomplete_complete,1,"WIN_COMPLETE:Complete RMA ops");
+ MPIU_INSTR_DURATION_INIT(wincomplete_block,0,"WIN_COMPLETE:Wait for any progress");
MPIU_INSTR_DURATION_INIT(winwait_wait,1,"WIN_WAIT:Wait for ops from other processes");
MPIU_INSTR_DURATION_INIT(winlock_getlocallock,0,"WIN_LOCK:Get local lock");
MPIU_INSTR_DURATION_INIT(winunlock_issue,2,"WIN_UNLOCK:Issue RMA ops");
MPIU_INSTR_DURATION_INIT(winunlock_complete,1,"WIN_UNLOCK:Complete RMA ops");
MPIU_INSTR_DURATION_INIT(winunlock_getlock,0,"WIN_UNLOCK:Acquire lock");
+ MPIU_INSTR_DURATION_INIT(winunlock_block,0,"WIN_UNLOCK:Wait for any progress");
MPIU_INSTR_DURATION_INIT(rmapkt_acc,0,"RMA:PKTHANDLER for Accumulate");
MPIU_INSTR_DURATION_INIT(rmapkt_acc_predef,0,"RMA:PKTHANDLER for Accumulate: predef dtype");
MPIU_INSTR_DURATION_INIT(rmapkt_acc_immed,0,"RMA:PKTHANDLER for Accum immed");
@@ -1508,7 +1512,7 @@
there was an incomplete request. */
curr_ptr = win_ptr->rma_ops_list_head;
if (curr_ptr && !MPID_Request_is_complete(curr_ptr->request) ) {
- MPIU_INSTR_DURATION_START(winfence_block);
+ MPIU_INSTR_DURATION_START(wincomplete_block);
mpi_errno = MPID_Progress_wait(&progress_state);
/* --BEGIN ERROR HANDLING-- */
if (mpi_errno != MPI_SUCCESS) {
@@ -1516,7 +1520,7 @@
MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**winnoprogress");
}
/* --END ERROR HANDLING-- */
- MPIU_INSTR_DURATION_END(winfence_block);
+ MPIU_INSTR_DURATION_END(wincomplete_block);
}
} /* While list of rma operation is non-empty */
@@ -1639,7 +1643,7 @@
if (dest == MPI_PROC_NULL) goto fn_exit;
comm_ptr = win_ptr->comm_ptr;
-
+
if (dest == win_ptr->myrank) {
/* The target is this process itself. We must block until the lock
* is acquired. */
@@ -1667,7 +1671,6 @@
/* local lock acquired. local puts, gets, accumulates will be done
directly without queueing. */
}
-
else {
/* target is some other process. add the lock request to rma_ops_list */
MPIU_INSTR_DURATION_START(rmaqueue_alloc);
@@ -1675,6 +1678,7 @@
mpi_errno, "RMA operation entry");
MPIU_INSTR_DURATION_END(rmaqueue_alloc);
+ MPIU_Assert( !win_ptr->rma_ops_list_head );
win_ptr->rma_ops_list_head = new_ptr;
win_ptr->rma_ops_list_tail = new_ptr;
@@ -1714,17 +1718,18 @@
if (dest == MPI_PROC_NULL) goto fn_exit;
- comm_ptr = win_ptr->comm_ptr;
-
if (dest == win_ptr->myrank) {
/* local lock. release the lock on the window, grant the next one
* in the queue, and return. */
+ MPIU_Assert(!win_ptr->rma_ops_list_head);
mpi_errno = MPIDI_CH3I_Release_lock(win_ptr);
if (mpi_errno != MPI_SUCCESS) goto fn_exit;
mpi_errno = MPID_Progress_poke();
goto fn_exit;
}
+ comm_ptr = win_ptr->comm_ptr;
+
rma_op = win_ptr->rma_ops_list_head;
/* win_lock was not called. return error */
@@ -1749,20 +1754,21 @@
single_op_opt = 0;
MPIDI_Comm_get_vc_set_active(comm_ptr, dest, &vc);
-
+
if (rma_op->next->next == NULL) {
/* Single put, get, or accumulate between the lock and unlock. If it
* is of small size and predefined datatype at the target, we
* do an optimization where the lock and the RMA operation are
* sent in a single packet. Otherwise, we send a separate lock
* request first. */
-
+
curr_op = rma_op->next;
MPID_Datatype_get_size_macro(curr_op->origin_datatype, type_size);
MPIDI_CH3I_DATATYPE_IS_PREDEFINED(curr_op->target_datatype, predefined);
+ /* msg_sz typically = 65480 */
if ( predefined &&
(type_size * curr_op->origin_count <= vc->eager_max_msg_sz) ) {
single_op_opt = 1;
@@ -1869,6 +1875,7 @@
win_ptr->lock_granted = 0;
fn_exit:
+ MPIU_Assert( !win_ptr->rma_ops_list_head );
MPIDI_RMA_FUNC_EXIT(MPID_STATE_MPIDI_WIN_UNLOCK);
return mpi_errno;
/* --BEGIN ERROR HANDLING-- */
@@ -2076,7 +2083,7 @@
there was an incomplete request. */
curr_ptr = win_ptr->rma_ops_list_head;
if (curr_ptr && !MPID_Request_is_complete(curr_ptr->request) ) {
- MPIU_INSTR_DURATION_START(winfence_block);
+ MPIU_INSTR_DURATION_START(winunlock_block);
mpi_errno = MPID_Progress_wait(&progress_state);
/* --BEGIN ERROR HANDLING-- */
if (mpi_errno != MPI_SUCCESS) {
@@ -2084,7 +2091,7 @@
MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**winnoprogress");
}
/* --END ERROR HANDLING-- */
- MPIU_INSTR_DURATION_END(winfence_block);
+ MPIU_INSTR_DURATION_END(winunlock_block);
}
} /* While list of rma operation is non-empty */
@@ -2192,6 +2199,7 @@
iov[0].MPID_IOV_LEN = sizeof(*lock_accum_unlock_pkt);
}
else {
+ /* FIXME: Error return */
printf( "expected short accumulate...\n" );
/* */
}
@@ -3016,6 +3024,9 @@
}
}
mpi_errno = MPIDI_CH3I_Release_lock(win_ptr);
+ /* Without the following signal_completion call, we
+ sometimes hang */
+ MPIDI_CH3_Progress_signal_completion();
}
}
@@ -3063,6 +3074,7 @@
/* queue the lock information */
MPIDI_Win_lock_queue *curr_ptr, *prev_ptr, *new_ptr;
+ /* Note: This code is reached by the fechandadd rma tests */
/* FIXME: MT: This may need to be done atomically. */
/* FIXME: Since we need to add to the tail of the list,
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,7919-7923,7925-7926,7929,7931-7932,7934-7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,
7996,8001,8003,8005-8008,8010-8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064
+ /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,7919-7923,7925-7926,7929,7931-7932,7934-7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,
7996,8001,8003,8005-8008,8010-8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064,8069-8070
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*,7919-7920*,7931-7932*,7934*,7937-7944*,7946*,7953-7954*,7956-7957*,7
960*,7968*,7971*,7975*,7979*,7981*,7984-7985*,7988*,7991-7992*,7994*,7996*,8001*,8003*,8005-8008*,8010-8012*,8016*,8018-8019*,8021*,8023-8024*,8026*,8028*,8030-8031*,8033*,8038*,8040*,8044*,8049*,8051*,8053-8056*,8059*,8062*,8064*
+ /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*,7919-7920*,7931-7932*,7934*,7937-7944*,7946*,7953-7954*,7956-7957*,7
960*,7968*,7971*,7975*,7979*,7981*,7984-7985*,7988*,7991-7992*,7994*,7996*,8001*,8003*,8005-8008*,8010-8012*,8016*,8018-8019*,8021*,8023-8024*,8026*,8028*,8030-8031*,8033*,8038*,8040*,8044*,8049*,8051*,8053-8056*,8059*,8062*,8064*,8069-8070*
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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8
012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064
+ /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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8
012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064,8069-8070
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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012,8
016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064
+ /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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012,8
016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064,8069-8070
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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-80
12,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064
+ /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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-80
12,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064,8069-8070
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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-
8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064
+ /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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-
8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064,8069-8070
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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012
,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064
+ /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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012
,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064,8069-8070
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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-80
08,8010-8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064
+ /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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-80
08,8010-8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064,8069-8070
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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-
8008,8010-8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064
+ /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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-
8008,8010-8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064,8069-8070
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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,
8005-8008,8010-8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064
+ /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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,
8005-8008,8010-8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064,8069-8070
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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012,8016,
8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064
+ /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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012,8016,
8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064,8069-8070
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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012,80
16,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064
+ /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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012,80
16,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064,8069-8070
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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,
7994,7996,8001,8003,8005-8008,8010-8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064
+ /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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,
7994,7996,8001,8003,8005-8008,8010-8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064,8069-8070
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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7
996,8001,8003,8005-8008,8010-8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064
+ /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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7
996,8001,8003,8005-8008,8010-8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064,8069-8070
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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012,8016,
8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064
+ /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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012,8016,
8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064,8069-8070
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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012,80
16,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064
+ /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,7919-7920,7931-7932,7934,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012,80
16,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064,8069-8070
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/test/mpi/rma/winconfigure.wsf:7960
/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,7919-7923,7925-7926,7929,7931-7932,7934-7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996
,8001,8003,8005-8008,8010-8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064
+ /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/test/mpi/rma/winconfigure.wsf:7960
/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,7919-7923,7925-7926,7929,7931-7932,7934-7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,7979,7981,7984-7985,7988,7991-7992,7994,7996
,8001,8003,8005-8008,8010-8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056,8059,8062,8064,8069-8070
More information about the mpich2-commits
mailing list