[mpich2-commits] r8057 - in mpich2/branches/release/mpich2-1.3.x: . confdb maint src/mpid src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp src/mpl/src src/pm/hydra src/pm/hydra/examples src/pm/hydra/include src/pm/hydra/pm src/pm/hydra/tools src/pm/hydra/tools/bootstrap/external src/pm/hydra/tools/bootstrap/src src/pm/hydra/ui src/pm/hydra/ui/mpich src/pm/hydra/utils test/mpi
balaji at mcs.anl.gov
balaji at mcs.anl.gov
Fri Feb 25 20:48:56 CST 2011
Author: balaji
Date: 2011-02-25 20:48:56 -0600 (Fri, 25 Feb 2011)
New Revision: 8057
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/mpid/
mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c
mpich2/branches/release/mpich2-1.3.x/src/mpl/src/mplstr.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/Makefile.am
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/README
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/autogen.sh
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/configure.in
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/examples/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/hydra-doxygen.cfg.in
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/include/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/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_launch.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/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/ui/mpich/mpiexec.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/utils/
mpich2/branches/release/mpich2-1.3.x/test/mpi/runtests.in
mpich2/branches/release/mpich2-1.3.x/winconfigure.wsf
Log:
Merging r8053 r8054 r8055 r8056 from trunk
Property changes on: mpich2/branches/release/mpich2-1.3.x
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt:5050
/mpich2/branches/dev/ckpt2:5057-6537
/mpich2/branches/dev/coll-err-ret:7771-7802
/mpich2/branches/dev/error-return:7662-7670
/mpich2/branches/dev/ftb:5661-5730
/mpich2/branches/dev/lapi:5817
/mpich2/branches/dev/wintcp_async_progress:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2:5406
/mpich2/trunk:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923,7925-7926,7929,7931-7932,7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,7979,7981,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
/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,7921-7923,7925-7926,7929,7931-7932,7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,7979,7981,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
/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,7921-7923,7925-7926,7929,7931-7932,7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,7979,7981,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
+ /mpich2/branches/dev/ckpt2/confdb:5180,5182,5196,5198
/mpich2/branches/dev/coll-err-ret/confdb:7771-7802
/mpich2/branches/dev/error-return/confdb:7662-7670
/mpich2/branches/dev/ftb/confdb:5661-5730
/mpich2/branches/dev/lapi/confdb:5817
/mpich2/branches/dev/wintcp_async_progress/confdb:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/confdb:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/confdb:5406
/mpich2/trunk/confdb:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923,7925-7926,7929,7931-7932,7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,7979,7981,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
Property changes on: mpich2/branches/release/mpich2-1.3.x/maint/Version
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/maint/Version:5050
/mpich2/branches/dev/ckpt2/maint/Version:5057-6537
/mpich2/branches/dev/coll-err-ret/maint/Version:7771-7802
/mpich2/branches/dev/ftb/maint/Version:5661-5730
/mpich2/branches/dev/lapi/maint/Version:5817
/mpich2/branches/dev/wintcp_async_progress/maint/Version:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/maint/Version:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/maint/Version:5406
/mpich2/trunk/maint/Version:7422-7425,7429-7433,7435,7437-7438,7442-7447,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7676-7678,7681,7684,7686,7688,7690-7692,7694,7696,7700,7705,7707-7710,7712,7714,7719,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923,7925-7926,7929,7931-7932,7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,7979,7981,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,80
49,8051
/mpich2/trunk/src/pm/hydra/VERSION:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7447,7604,7671,7674,7683,7685,7687,7701-7702,7720,7722
+ /mpich2/branches/dev/ckpt/maint/Version:5050
/mpich2/branches/dev/ckpt2/maint/Version:5057-6537
/mpich2/branches/dev/coll-err-ret/maint/Version:7771-7802
/mpich2/branches/dev/ftb/maint/Version:5661-5730
/mpich2/branches/dev/lapi/maint/Version:5817
/mpich2/branches/dev/wintcp_async_progress/maint/Version:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/maint/Version:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/maint/Version:5406
/mpich2/trunk/maint/Version:7422-7425,7429-7433,7435,7437-7438,7442-7447,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7676-7678,7681,7684,7686,7688,7690-7692,7694,7696,7700,7705,7707-7710,7712,7714,7719,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923,7925-7926,7929,7931-7932,7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,7979,7981,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,80
49,8051,8053-8056
/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
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/mpid
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/mpid:5050
/mpich2/branches/dev/ckpt2/src/mpid:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpid:7771-7802
/mpich2/branches/dev/error-return/src/mpid:7405-7603,7662-7670
/mpich2/branches/dev/ftb/src/mpid:5661-5730
/mpich2/branches/dev/lapi/src/mpid:5817
/mpich2/branches/dev/wintcp_async_progress/src/mpid:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpid:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpid:5406
/mpich2/trunk/src/mpid:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923,7925-7926,7929,7931-7932,7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,7979,7981,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
+ /mpich2/branches/dev/ckpt/src/mpid:5050
/mpich2/branches/dev/ckpt2/src/mpid:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpid:7771-7802
/mpich2/branches/dev/error-return/src/mpid:7405-7603,7662-7670
/mpich2/branches/dev/ftb/src/mpid:5661-5730
/mpich2/branches/dev/lapi/src/mpid:5817
/mpich2/branches/dev/wintcp_async_progress/src/mpid:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpid:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpid:5406
/mpich2/trunk/src/mpid:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923,7925-7926,7929,7931-7932,7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,7979,7981,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
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5050
/mpich2/branches/dev/ckpt2/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:7771-7802
/mpich2/branches/dev/error-return/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:7405-7603,7662-7670
/mpich2/branches/dev/ftb/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5661-5730
/mpich2/branches/dev/lapi/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5817
/mpich2/branches/dev/win_rrvm/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:6416,6428
/mpich2/branches/dev/wintcp_async_progress/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5406
/mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923,7925-7926,7929,7931-7932,7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,7979,
7981,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
+ /mpich2/branches/dev/ckpt/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5050
/mpich2/branches/dev/ckpt2/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:7771-7802
/mpich2/branches/dev/error-return/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:7405-7603,7662-7670
/mpich2/branches/dev/ftb/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5661-5730
/mpich2/branches/dev/lapi/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5817
/mpich2/branches/dev/win_rrvm/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:6416,6428
/mpich2/branches/dev/wintcp_async_progress/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5406
/mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923,7925-7926,7929,7931-7932,7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,7979,
7981,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
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/mpl/src/mplstr.c
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt2/src/mpl/src/string/mplstr.c:5182,5196,5198
/mpich2/branches/dev/coll-err-ret/src/mpl/src/mplstr.c:7771-7802
/mpich2/branches/dev/error-return/src/mpl/src/mplstr.c:7662-7670
/mpich2/branches/dev/ftb/src/mpl/src/mplstr.c:5661-5730
/mpich2/branches/dev/lapi/src/mpl/src/mplstr.c:5817
/mpich2/branches/release/mpich2-1.1.1/src/mpl/src/string/mplstr.c:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpl/src/string/mplstr.c:5406
/mpich2/trunk/src/mpl/src/mplstr.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923,7925-7926,7929,7931-7932,7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,7979,7981,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
+ /mpich2/branches/dev/ckpt2/src/mpl/src/string/mplstr.c:5182,5196,5198
/mpich2/branches/dev/coll-err-ret/src/mpl/src/mplstr.c:7771-7802
/mpich2/branches/dev/error-return/src/mpl/src/mplstr.c:7662-7670
/mpich2/branches/dev/ftb/src/mpl/src/mplstr.c:5661-5730
/mpich2/branches/dev/lapi/src/mpl/src/mplstr.c:5817
/mpich2/branches/release/mpich2-1.1.1/src/mpl/src/string/mplstr.c:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpl/src/string/mplstr.c:5406
/mpich2/trunk/src/mpl/src/mplstr.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923,7925-7926,7929,7931-7932,7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,7979,7981,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
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra:7771-7802*
/mpich2/branches/dev/error-return/src/pm/hydra:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra:5406
/mpich2/trunk/src/pm/hydra:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671*,7674*,7676-7678,7681,7683*,7684,7685*,7686,7687*,7688,7690-7692,7694,7696,7700,7701-7702*,7705,7707-7710,7712,7714,7719,7720*,7722*,7724-7725*,7728-7729*,7733*,7735-7737*,7739*,7741*,7744-7748*,7751-7754*,7758-7759*,7761-7762*,7766*,7772*,7774*,7779-7781*,7788*,7793*,7799-7801*,7803*,7807-7808*,7811*,7813*,7815-7816*,7819*,7821*,7829-7831*,7833*,7835-7837*,7839-7843*,7852*,7858*,7860*,7862*,7866*,7872-7874*,7879-7880*,7882*,7884*,7886-7888*,7890*,7895*,7897*,7899*,7903-7904*,7906*,7908*,7910*,7912*,7931-7932*,7937-7944*,7946*,7953-7954*,7956-7957*,7960*,7968*,7971*,
7975*,7979*,7981*,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*
+ /mpich2/branches/dev/ckpt/src/pm/hydra:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra:7771-7802*
/mpich2/branches/dev/error-return/src/pm/hydra:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra:5406
/mpich2/trunk/src/pm/hydra:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671*,7674*,7676-7678,7681,7683*,7684,7685*,7686,7687*,7688,7690-7692,7694,7696,7700,7701-7702*,7705,7707-7710,7712,7714,7719,7720*,7722*,7724-7725*,7728-7729*,7733*,7735-7737*,7739*,7741*,7744-7748*,7751-7754*,7758-7759*,7761-7762*,7766*,7772*,7774*,7779-7781*,7788*,7793*,7799-7801*,7803*,7807-7808*,7811*,7813*,7815-7816*,7819*,7821*,7829-7831*,7833*,7835-7837*,7839-7843*,7852*,7858*,7860*,7862*,7866*,7872-7874*,7879-7880*,7882*,7884*,7886-7888*,7890*,7895*,7897*,7899*,7903-7904*,7906*,7908*,7910*,7912*,7931-7932*,7937-7944*,7946*,7953-7954*,7956-7957*,7960*,7968*,7971*,
7975*,7979*,7981*,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*
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/Makefile.am
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/Makefile.am:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/Makefile.am:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/Makefile.am:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/Makefile.am:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/Makefile.am:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/Makefile.am:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/Makefile.am:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/Makefile.am:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/Makefile.am:5406
/mpich2/trunk/src/pm/hydra/Makefile.am:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012,8016,8018-8019,8021,8
023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051
+ /mpich2/branches/dev/ckpt/src/pm/hydra/Makefile.am:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/Makefile.am:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/Makefile.am:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/Makefile.am:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/Makefile.am:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/Makefile.am:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/Makefile.am:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/Makefile.am:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/Makefile.am:5406
/mpich2/trunk/src/pm/hydra/Makefile.am:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012,8016,8018-8019,8021,8
023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/README
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/README:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/README:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/README:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/README:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/README:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/README:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/README:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/README:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/README:5406
/mpich2/trunk/src/pm/hydra/README:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012,8016,8018-8019,8021,8023-8
024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051
+ /mpich2/branches/dev/ckpt/src/pm/hydra/README:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/README:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/README:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/README:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/README:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/README:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/README:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/README:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/README:5406
/mpich2/trunk/src/pm/hydra/README:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012,8016,8018-8019,8021,8023-8
024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/autogen.sh
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/autogen.sh:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/autogen.sh:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/autogen.sh:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/autogen.sh:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/autogen.sh:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/autogen.sh:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/autogen.sh:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/autogen.sh:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/autogen.sh:5406
/mpich2/trunk/src/pm/hydra/autogen.sh:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012,8016,8018-8019,8021,80
23-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051
+ /mpich2/branches/dev/ckpt/src/pm/hydra/autogen.sh:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/autogen.sh:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/autogen.sh:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/autogen.sh:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/autogen.sh:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/autogen.sh:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/autogen.sh:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/autogen.sh:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/autogen.sh:5406
/mpich2/trunk/src/pm/hydra/autogen.sh:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012,8016,8018-8019,8021,80
23-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/configure.in
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/configure.in:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/configure.in:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/configure.in:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/configure.in:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/configure.in:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/configure.in:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/configure.in:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/configure.in:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/configure.in:5406
/mpich2/trunk/src/pm/hydra/configure.in:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,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
+ /mpich2/branches/dev/ckpt/src/pm/hydra/configure.in:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/configure.in:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/configure.in:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/configure.in:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/configure.in:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/configure.in:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/configure.in:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/configure.in:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/configure.in:5406
/mpich2/trunk/src/pm/hydra/configure.in:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,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
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/examples
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/examples:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/examples:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/examples:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/examples:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/examples:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/examples:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/examples:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/examples:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/examples:5406
/mpich2/trunk/src/pm/hydra/examples:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,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
+ /mpich2/branches/dev/ckpt/src/pm/hydra/examples:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/examples:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/examples:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/examples:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/examples:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/examples:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/examples:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/examples:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/examples:5406
/mpich2/trunk/src/pm/hydra/examples:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,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
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/hydra-doxygen.cfg.in
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/hydra-doxygen.cfg.in:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/hydra-doxygen.cfg.in:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/hydra-doxygen.cfg.in:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/hydra-doxygen.cfg.in:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/hydra-doxygen.cfg.in:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/hydra-doxygen.cfg.in:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/hydra-doxygen.cfg.in:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/hydra-doxygen.cfg.in:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/hydra-doxygen.cfg.in:5406
/mpich2/trunk/src/pm/hydra/hydra-doxygen.cfg.in:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012,8016,8018-80
19,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051
+ /mpich2/branches/dev/ckpt/src/pm/hydra/hydra-doxygen.cfg.in:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/hydra-doxygen.cfg.in:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/hydra-doxygen.cfg.in:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/hydra-doxygen.cfg.in:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/hydra-doxygen.cfg.in:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/hydra-doxygen.cfg.in:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/hydra-doxygen.cfg.in:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/hydra-doxygen.cfg.in:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/hydra-doxygen.cfg.in:5406
/mpich2/trunk/src/pm/hydra/hydra-doxygen.cfg.in:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012,8016,8018-80
19,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/include
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/include:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/include:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/include:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/include:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/include:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/include:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/include:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/include:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/include:5406
/mpich2/trunk/src/pm/hydra/include:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,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
+ /mpich2/branches/dev/ckpt/src/pm/hydra/include:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/include:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/include:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/include:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/include:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/include:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/include:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/include:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/include:5406
/mpich2/trunk/src/pm/hydra/include:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,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
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/mpich2prereq
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/mpich2prereq:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/mpich2prereq:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/mpich2prereq:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/mpich2prereq:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/mpich2prereq:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/mpich2prereq:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/mpich2prereq:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/mpich2prereq:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/mpich2prereq:5406
/mpich2/trunk/src/pm/hydra/mpich2prereq:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,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
+ /mpich2/branches/dev/ckpt/src/pm/hydra/mpich2prereq:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/mpich2prereq:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/mpich2prereq:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/mpich2prereq:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/mpich2prereq:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/mpich2prereq:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/mpich2prereq:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/mpich2prereq:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/mpich2prereq:5406
/mpich2/trunk/src/pm/hydra/mpich2prereq:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,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
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/pm:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/pm:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/pm:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/pm:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/pm:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/pm:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/pm:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/pm:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/pm:5406
/mpich2/trunk/src/pm/hydra/pm:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,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
+ /mpich2/branches/dev/ckpt/src/pm/hydra/pm:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/pm:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/pm:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/pm:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/pm:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/pm:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/pm:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/pm:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/pm:5406
/mpich2/trunk/src/pm/hydra/pm:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,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
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/tools:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/tools:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/tools:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/tools:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/tools:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/tools:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/tools:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/tools:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/tools:5406
/mpich2/trunk/src/pm/hydra/tools:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012,8016,8018-8019,8021,8023-80
24,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051
+ /mpich2/branches/dev/ckpt/src/pm/hydra/tools:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/tools:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/tools:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/tools:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/tools:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/tools:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/tools:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/tools:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/tools:5406
/mpich2/trunk/src/pm/hydra/tools:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012,8016,8018-8019,8021,8023-80
24,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/slurm_launch.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/slurm_launch.c 2011-02-26 02:46:51 UTC (rev 8056)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/slurm_launch.c 2011-02-26 02:48:56 UTC (rev 8057)
@@ -62,10 +62,9 @@
HYD_status HYDT_bscd_slurm_launch_procs(char **args, struct HYD_proxy *proxy_list,
int *control_fd)
{
- int num_hosts, idx, i, exec_idx;
+ int num_hosts, idx, i;
int *pid, *fd_list;
- char *targs[HYD_NUM_TMP_STRINGS], *node_list_str = NULL,
- quoted_exec_string[HYD_TMP_STRLEN];
+ char *targs[HYD_NUM_TMP_STRINGS], *node_list_str = NULL;
char *path = NULL, *extra_arg_list = NULL, *extra_arg;
struct HYD_proxy *proxy;
struct HYDT_bind_cpuset_t cpuset;
@@ -86,7 +85,7 @@
idx = 0;
targs[idx++] = HYDU_strdup(path);
- if (!strcmp(HYDT_bsci_info.rmk, "slurm")) {
+ if (strcmp(HYDT_bsci_info.rmk, "slurm")) {
targs[idx++] = HYDU_strdup("--nodelist");
status = proxy_list_to_node_str(proxy_list, &node_list_str);
@@ -115,17 +114,11 @@
}
/* Fill in the remaining arguments */
- exec_idx = idx;
+ /* We do not need to create a quoted version of the string for
+ * SLURM. It seems to be internally quoting it anyway. */
for (i = 0; args[i]; i++)
targs[idx++] = HYDU_strdup(args[i]);
- /* Create a quoted version of the exec string, which is only used
- * when the executable is not launched directly, but through an
- * external launcher */
- HYDU_snprintf(quoted_exec_string, HYD_TMP_STRLEN, "\"%s\"", targs[exec_idx]);
- HYDU_FREE(targs[exec_idx]);
- targs[exec_idx] = quoted_exec_string;
-
/* Increase pid list to accommodate the new pid */
HYDU_MALLOC(pid, int *, (HYD_bscu_pid_count + 1) * sizeof(int), status);
for (i = 0; i < HYD_bscu_pid_count; i++)
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/coll-err-ret/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/tools/bootstrap/slurm/slurm_query_proxy_id.c:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/tools/bootstrap/slurm/slurm_query_proxy_id.c:5817
/mpich2/trunk/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,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
+ /mpich2/branches/dev/coll-err-ret/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/tools/bootstrap/slurm/slurm_query_proxy_id.c:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/tools/bootstrap/slurm/slurm_query_proxy_id.c:5817
/mpich2/trunk/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,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
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/coll-err-ret/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:5817
/mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7988,7991-7992,7994,7996,8001,8003,8005-8008,8
010-8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051
+ /mpich2/branches/dev/coll-err-ret/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:5817
/mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7988,7991-7992,7994,7996,8001,8003,8005-8008,8
010-8012,8016,8018-8019,8021,8023-8024,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/ui
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/ui:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/ui:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/ui:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/ui:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/ui:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/ui:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/ui:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/ui:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/ui:5406
/mpich2/trunk/src/pm/hydra/ui:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,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
+ /mpich2/branches/dev/ckpt/src/pm/hydra/ui:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/ui:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/ui:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/ui:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/ui:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/ui:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/ui:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/ui:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/ui:5406
/mpich2/trunk/src/pm/hydra/ui:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,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
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/ui/mpich/mpiexec.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/ui/mpich/mpiexec.c 2011-02-26 02:46:51 UTC (rev 8056)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/ui/mpich/mpiexec.c 2011-02-26 02:48:56 UTC (rev 8057)
@@ -440,11 +440,18 @@
return 0;
else if (status != HYD_SUCCESS)
return -1;
+ else if (WIFSIGNALED(exit_status)) {
+ printf("APPLICATION TERMINATED WITH THE EXIT STRING: %s (signal %d)\n",
+ strsignal(WTERMSIG(exit_status)), WTERMSIG(exit_status));
+ return exit_status;
+ }
+ else if (WIFEXITED(exit_status)) {
+ return WEXITSTATUS(exit_status);
+ }
+ else if (WIFSTOPPED(exit_status)) {
+ return WSTOPSIG(exit_status);
+ }
else {
- if (WIFSIGNALED(exit_status)) {
- printf("APPLICATION TERMINATED WITH THE EXIT STRING: %s (signal %d)\n",
- strsignal(WTERMSIG(exit_status)), WTERMSIG(exit_status));
- }
return exit_status;
}
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/utils
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/utils:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/utils:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/utils:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/utils:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/utils:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/utils:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/utils:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/utils:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/utils:5406
/mpich2/trunk/src/pm/hydra/utils:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012,8016,8018-8019,8021,8023-80
24,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051
+ /mpich2/branches/dev/ckpt/src/pm/hydra/utils:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/utils:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/utils:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/utils:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/utils:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/utils:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/utils:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/utils:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/utils:5406
/mpich2/trunk/src/pm/hydra/utils:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7447-7448,7462,7470,7473-7477,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7931-7932,7937-7944,7946,7953-7954,7956-7957,7960,7968,7971,7975,7979,7981,7988,7991-7992,7994,7996,8001,8003,8005-8008,8010-8012,8016,8018-8019,8021,8023-80
24,8026,8028,8030-8031,8033,8038,8040,8044,8049,8051,8053-8056
Modified: mpich2/branches/release/mpich2-1.3.x/test/mpi/runtests.in
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/test/mpi/runtests.in 2011-02-26 02:46:51 UTC (rev 8056)
+++ mpich2/branches/release/mpich2-1.3.x/test/mpi/runtests.in 2011-02-26 02:48:56 UTC (rev 8057)
@@ -632,7 +632,7 @@
$inline .= $_;
# ANY output is an error. We have the following output
# exception for the Hydra process manager.
- if (/\[mpiexec at .*\] ONE OF THE PROCESSES TERMINATED BADLY: CLEANING UP/) { next; }
+ if (/=*/) { last; }
if (! /^\s*$/) {
print STDERR "Unexpected output in $programname: $_";
if (!$found_error) {
@@ -677,7 +677,7 @@
if (/signaled with Interrupt/) { next; }
# Allow 'job ending due to env var MPIEXEC_TIMEOUT' (mpd)
if (/job ending due to env var MPIEXEC_TIMEOUT/) { next; }
- # Allow 'EXIT STRING: Terminated \(signal 15\)' (hydra)
+ # Allow 'APPLICATION TIMED OUT' (hydra)
if (/\[mpiexec at .*\] APPLICATION TIMED OUT/) { last; }
# ANY output is an error (other than timeout)
if (! /^\s*$/) {
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,7921-7923,7925-7926,7929,7931-7932,7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,7979,7981,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
+ /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,7921-7923,7925-7926,7929,7931-7932,7935,7937-7944,7946,7953-7954,7956-7958,7960,7968,7971,7975,7979,7981,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
More information about the mpich2-commits
mailing list