[mpich2-commits] r7480 - in mpich2/branches/release/mpich2-1.3.x: . confdb maint src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp src/mpl/src src/pm/hydra src/pm/hydra/examples src/pm/hydra/include src/pm/hydra/pm src/pm/hydra/pm/pmiserv src/pm/hydra/tools src/pm/hydra/tools/bootstrap/external src/pm/hydra/tools/bootstrap/include src/pm/hydra/tools/bootstrap/persist src/pm/hydra/tools/bootstrap/src src/pm/hydra/tools/bootstrap/utils src/pm/hydra/tools/ftb src/pm/hydra/ui src/pm/hydra/ui/utils src/pm/hydra/utils src/pm/hydra/utils/sock
balaji at mcs.anl.gov
balaji at mcs.anl.gov
Mon Nov 22 11:36:01 CST 2010
Author: balaji
Date: 2010-11-22 11:36:01 -0600 (Mon, 22 Nov 2010)
New Revision: 7480
Added:
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/ftb/hydt_ftb_dummy.c
Modified:
mpich2/branches/release/mpich2-1.3.x/
mpich2/branches/release/mpich2-1.3.x/README.vin
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/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c
mpich2/branches/release/mpich2-1.3.x/src/mpl/src/mplstr.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/Makefile.am
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/README
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/autogen.sh
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/configure.in
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/examples/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/hydra-doxygen.cfg.in
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/include/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/include/hydra.h
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/mpich2prereq
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmi_common.h
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip.h
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip_cb.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip_pmi_v2.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_cb.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_pmci.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v1.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v2.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/external.h
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/external_launch.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/ll.h
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/ll_launch.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/slurm.h
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/include/bsci.h.in
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/persist/persist_client.h
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/persist/persist_launch.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/src/bsci_launch.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/tools/bootstrap/utils/bscu.h
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/utils/bscu_cb.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/utils/bscu_query_proxy_id.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/ftb/Makefile.mk
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/ftb/hydt_ftb.h
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/ui/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/ui/utils/uiu.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/ui/utils/uiu.h
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/utils/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/utils/sock/sock.c
mpich2/branches/release/mpich2-1.3.x/winconfigure.wsf
Log:
Merging r7470, r7473, r7474, r7475, r7476 and r7477 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/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-7424,7429-7433,7435,7437-7438,7448
+ /mpich2/branches/dev/ckpt:5050
/mpich2/branches/dev/ckpt2:5057-6537
/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-7424,7429-7433,7435,7437-7438,7448,7470,7473-7477
Modified: mpich2/branches/release/mpich2-1.3.x/README.vin
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/README.vin 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/README.vin 2010-11-22 17:36:01 UTC (rev 7480)
@@ -547,7 +547,8 @@
---
MPD was the traditional process manager in MPICH2. The file
mpich2-%VERSION%/src/pm/mpd/README has more information about
-interactive commands for managing the ring of MPDs.
+interactive commands for managing the ring of MPDs. The MPD process
+manager is now deprecated.
smpd
----
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/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-7424,7429-7433,7435,7437-7438,7448
+ /mpich2/branches/dev/ckpt2/confdb:5180,5182,5196,5198
/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-7424,7429-7433,7435,7437-7438,7448,7470,7473-7477
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/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-7424,7429-7433,7435,7437-7438
/mpich2/trunk/src/pm/hydra/VERSION:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416
+ /mpich2/branches/dev/ckpt/maint/Version:5050
/mpich2/branches/dev/ckpt2/maint/Version:5057-6537
/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-7424,7429-7433,7435,7437-7438,7470,7473-7477
/mpich2/trunk/src/pm/hydra/VERSION:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416
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/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,7448
+ /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/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,7448,7470,7473-7477
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/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-7424,7429-7433,7435,7437-7438,7448
+ /mpich2/branches/dev/ckpt2/src/mpl/src/string/mplstr.c:5182,5196,5198
/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-7424,7429-7433,7435,7437-7438,7448,7470,7473-7477
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/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-7424*,7429-7433*,7435*,7437-7438,7448*
+ /mpich2/branches/dev/ckpt/src/pm/hydra:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra:5057-6537
/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-7424*,7429-7433*,7435*,7437-7438,7448*,7470*,7473-7477*
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/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-7424,7429-7433,7435,7437-7438,7448
+ /mpich2/branches/dev/ckpt/src/pm/hydra/Makefile.am:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/Makefile.am:5057-6537
/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-7424,7429-7433,7435,7437-7438,7448,7470,7473-7477
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/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-7424,7429-7433,7435,7437-7438,7448
+ /mpich2/branches/dev/ckpt/src/pm/hydra/README:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/README:5057-6537
/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-7424,7429-7433,7435,7437-7438,7448,7470,7473-7477
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/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-7424,7429-7433,7435,7437-7438,7448
+ /mpich2/branches/dev/ckpt/src/pm/hydra/autogen.sh:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/autogen.sh:5057-6537
/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-7424,7429-7433,7435,7437-7438,7448,7470,7473-7477
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/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-7424,7429-7433,7435,7437-7438,7448
+ /mpich2/branches/dev/ckpt/src/pm/hydra/configure.in:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/configure.in:5057-6537
/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-7424,7429-7433,7435,7437-7438,7448,7470,7473-7477
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/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-7424,7429-7433,7435,7437-7438,7448
+ /mpich2/branches/dev/ckpt/src/pm/hydra/examples:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/examples:5057-6537
/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-7424,7429-7433,7435,7437-7438,7448,7470,7473-7477
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/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-7424,7429-7433,7435,7437-7438,7448
+ /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/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-7424,7429-7433,7435,7437-7438,7448,7470,7473-7477
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/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-7424,7429-7433,7435,7437-7438,7448
+ /mpich2/branches/dev/ckpt/src/pm/hydra/include:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/include:5057-6537
/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-7424,7429-7433,7435,7437-7438,7448,7470,7473-7477
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/include/hydra.h
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/include/hydra.h 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/include/hydra.h 2010-11-22 17:36:01 UTC (rev 7480)
@@ -39,8 +39,8 @@
int ranks_per_proc;
- HYD_status(*stdout_cb) (void *buf, int buflen);
- HYD_status(*stderr_cb) (void *buf, int buflen);
+ HYD_status(*stdout_cb) (int pgid, int proxy_id, int rank, void *buf, int buflen);
+ HYD_status(*stderr_cb) (int pgid, int proxy_id, int rank, void *buf, int buflen);
/* All of the available nodes */
struct HYD_node *node_list;
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/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-7424,7429-7433,7435,7437-7438,7448
+ /mpich2/branches/dev/ckpt/src/pm/hydra/mpich2prereq:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/mpich2prereq:5057-6537
/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-7424,7429-7433,7435,7437-7438,7448,7470,7473-7477
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/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-7424,7429-7433,7435,7437-7438,7448
+ /mpich2/branches/dev/ckpt/src/pm/hydra/pm:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/pm:5057-6537
/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-7424,7429-7433,7435,7437-7438,7448,7470,7473-7477
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmi_common.h
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmi_common.h 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmi_common.h 2010-11-22 17:36:01 UTC (rev 7480)
@@ -28,26 +28,36 @@
struct HYD_pmcd_pmi_kvs_pair *key_pair;
};
-/* The set of commands supported */
-enum HYD_pmcd_pmi_cmd {
- INVALID_CMD = 0, /* for sanity testing */
+struct HYD_pmcd_hdr {
+ /* The set of commands supported */
+ enum {
+ INVALID_CMD = 0, /* for sanity testing */
- /* UI to proxy commands */
- PROC_INFO,
- CKPOINT,
- PMI_RESPONSE,
+ /* UI to proxy commands */
+ PROC_INFO,
+ CKPOINT,
+ PMI_RESPONSE,
- /* Proxy to UI commands */
- PID_LIST,
- EXIT_STATUS,
- ABORT,
- PMI_CMD
-};
+ /* Proxy to UI commands */
+ PID_LIST,
+ EXIT_STATUS,
+ ABORT,
+ PMI_CMD,
+ STDOUT,
+ STDERR
+ } cmd;
-struct HYD_pmcd_pmi_hdr {
+ /* Generic */
+ int buflen;
+
+ /* PMI_CMD */
int pid; /* ID of the requesting process */
int pmi_version; /* PMI version */
- int buflen;
+
+ /* STDOUT/STDERR */
+ int pgid;
+ int proxy_id;
+ int rank;
};
struct HYD_pmcd_token {
@@ -55,11 +65,6 @@
char *val;
};
-struct HYD_pmcd_stdio_hdr {
- int rank;
- int buflen;
-};
-
HYD_status HYD_pmcd_pmi_parse_pmi_cmd(char *buf, int pmi_version, char **pmi_cmd,
char *args[]);
HYD_status HYD_pmcd_pmi_args_to_tokens(char *args[], struct HYD_pmcd_token **tokens,
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip.c 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip.c 2010-11-22 17:36:01 UTC (rev 7480)
@@ -173,7 +173,7 @@
int main(int argc, char **argv)
{
int i, count, pid, ret_status, sent, closed, ret, done;
- enum HYD_pmcd_pmi_cmd cmd;
+ struct HYD_pmcd_hdr hdr;
HYD_status status = HYD_SUCCESS;
status = HYDU_dbg_init("proxy:unset");
@@ -264,9 +264,9 @@
}
/* Send the exit status upstream */
- cmd = EXIT_STATUS;
+ hdr.cmd = EXIT_STATUS;
status =
- HYDU_sock_write(HYD_pmcd_pmip.upstream.control, &cmd, sizeof(cmd), &sent, &closed);
+ HYDU_sock_write(HYD_pmcd_pmip.upstream.control, &hdr, sizeof(hdr), &sent, &closed);
HYDU_ERR_POP(status, "unable to send EXIT_STATUS command upstream\n");
if (closed)
goto fn_fail;
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip.h
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip.h 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip.h 2010-11-22 17:36:01 UTC (rev 7480)
@@ -11,25 +11,6 @@
#include "hydra_utils.h"
#include "pmi_common.h"
-#define HYD_pmcd_pmi_proxy_dump(_status, _fd, ...) \
- { \
- char _str[HYD_TMPBUF_SIZE]; \
- struct HYD_pmcd_stdio_hdr _hdr; \
- int _recvd, _closed; \
- MPL_snprintf(_str, HYD_TMPBUF_SIZE, "[%s] ", HYD_dbg_prefix); \
- MPL_snprintf(_str + strlen(_str), HYD_TMPBUF_SIZE - strlen(_str), __VA_ARGS__); \
- if (HYD_pmcd_pmip.user_global.prepend_rank) { \
- (_hdr).rank = -1; \
- (_hdr).buflen = strlen(_str); \
- (_status) = HYDU_sock_write((_fd), &(_hdr), sizeof((_hdr)), &(_recvd), &(_closed)); \
- HYDU_ERR_POP((_status), "sock write error\n"); \
- HYDU_ASSERT(!(_closed), (_status)); \
- } \
- (_status) = HYDU_sock_write((_fd), &(_str), strlen(_str), &(_recvd), &(_closed)); \
- HYDU_ERR_POP((_status), "sock write error\n"); \
- HYDU_ASSERT(!(_closed), (_status)); \
- }
-
struct HYD_pmcd_pmip {
struct HYD_user_global user_global;
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip_cb.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip_cb.c 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip_cb.c 2010-11-22 17:36:01 UTC (rev 7480)
@@ -24,7 +24,7 @@
{
int closed, i, sent, recvd, stdfd;
char buf[HYD_TMPBUF_SIZE];
- struct HYD_pmcd_stdio_hdr hdr;
+ struct HYD_pmcd_hdr hdr;
HYD_status status = HYD_SUCCESS;
HYDU_FUNC_ENTER();
@@ -53,11 +53,13 @@
if (recvd) {
if (stdfd == STDOUT_FILENO) {
+ hdr.cmd = STDOUT;
for (i = 0; i < HYD_pmcd_pmip.local.proxy_process_count; i++)
if (HYD_pmcd_pmip.downstream.out[i] == fd)
break;
}
else {
+ hdr.cmd = STDERR;
for (i = 0; i < HYD_pmcd_pmip.local.proxy_process_count; i++)
if (HYD_pmcd_pmip.downstream.err[i] == fd)
break;
@@ -65,16 +67,17 @@
HYDU_ASSERT(i < HYD_pmcd_pmip.local.proxy_process_count, status);
- if (HYD_pmcd_pmip.user_global.prepend_rank) {
- hdr.rank = HYD_pmcd_pmip.downstream.pmi_rank[i];
- hdr.buflen = recvd;
+ hdr.pgid = HYD_pmcd_pmip.local.pgid;
+ hdr.proxy_id = HYD_pmcd_pmip.local.id;
+ hdr.rank = HYD_pmcd_pmip.downstream.pmi_rank[i];
+ hdr.buflen = recvd;
- status = HYDU_sock_write(stdfd, &hdr, sizeof(hdr), &sent, &closed);
- HYDU_ERR_POP(status, "sock write error\n");
- HYDU_ASSERT(!closed, status);
- }
+ status = HYDU_sock_write(HYD_pmcd_pmip.upstream.control, &hdr, sizeof(hdr), &sent,
+ &closed);
+ HYDU_ERR_POP(status, "sock write error\n");
+ HYDU_ASSERT(!closed, status);
- status = HYDU_sock_write(stdfd, buf, recvd, &sent, &closed);
+ status = HYDU_sock_write(HYD_pmcd_pmip.upstream.control, buf, recvd, &sent, &closed);
HYDU_ERR_POP(status, "sock write error\n");
HYDU_ASSERT(!closed, status);
}
@@ -255,8 +258,7 @@
{
char *buf = NULL, *pmi_cmd, *args[HYD_NUM_TMP_STRINGS];
int closed, repeat, sent, i = -1;
- struct HYD_pmcd_pmi_hdr hdr;
- enum HYD_pmcd_pmi_cmd cmd;
+ struct HYD_pmcd_hdr hdr;
struct HYD_pmcd_pmip_pmi_handle *h;
char ftb_event_payload[HYDT_FTB_MAX_PAYLOAD_DATA];
HYD_status status = HYD_SUCCESS;
@@ -292,10 +294,10 @@
HYD_pmcd_pmip_killjob();
/* Need to send an abort notification to the user */
- cmd = ABORT;
+ hdr.cmd = ABORT;
status = HYDU_sock_write(HYD_pmcd_pmip.upstream.control,
- &cmd, sizeof(cmd), &sent, &closed);
- HYDU_ERR_POP(status, "unable to send EXIT_STATUS command upstream\n");
+ &hdr, sizeof(hdr), &sent, &closed);
+ HYDU_ERR_POP(status, "unable to send ABORT command upstream\n");
if (closed)
goto fn_fail;
}
@@ -327,8 +329,7 @@
HYDU_ERR_POP(status, "unable to parse PMI command\n");
if (HYD_pmcd_pmip.user_global.debug) {
- HYD_pmcd_pmi_proxy_dump(status, STDOUT_FILENO,
- "got pmi command (from %d): %s\n", fd, pmi_cmd);
+ HYDU_dump(stdout, "got pmi command (from %d): %s\n", fd, pmi_cmd);
HYDU_print_strlist(args);
}
@@ -343,18 +344,12 @@
}
if (HYD_pmcd_pmip.user_global.debug) {
- HYD_pmcd_pmi_proxy_dump(status, STDOUT_FILENO,
- "we don't understand this command %s; forwarding upstream\n",
- pmi_cmd);
+ HYDU_dump(stdout, "we don't understand this command %s; forwarding upstream\n",
+ pmi_cmd);
}
/* We don't understand the command; forward it upstream */
- cmd = PMI_CMD;
- status =
- HYDU_sock_write(HYD_pmcd_pmip.upstream.control, &cmd, sizeof(cmd), &sent, &closed);
- HYDU_ERR_POP(status, "unable to send PMI_CMD command\n");
- HYDU_ASSERT(!closed, status);
-
+ hdr.cmd = PMI_CMD;
hdr.pid = fd;
hdr.buflen = strlen(buf);
status =
@@ -379,9 +374,8 @@
goto fn_exit;
}
-static HYD_status handle_pmi_response(int fd)
+static HYD_status handle_pmi_response(int fd, struct HYD_pmcd_hdr hdr)
{
- struct HYD_pmcd_pmi_hdr hdr;
int count, closed, sent;
char *buf = NULL, *pmi_cmd, *args[HYD_NUM_TMP_STRINGS];
struct HYD_pmcd_pmip_pmi_handle *h;
@@ -389,10 +383,6 @@
HYDU_FUNC_ENTER();
- status = HYDU_sock_read(fd, &hdr, sizeof(hdr), &count, &closed, HYDU_SOCK_COMM_MSGWAIT);
- HYDU_ERR_POP(status, "unable to read PMI header from proxy\n");
- HYDU_ASSERT(!closed, status);
-
HYDU_MALLOC(buf, char *, hdr.buflen + 1, status);
status = HYDU_sock_read(fd, buf, hdr.buflen, &count, &closed, HYDU_SOCK_COMM_MSGWAIT);
@@ -415,9 +405,8 @@
}
if (HYD_pmcd_pmip.user_global.debug) {
- HYD_pmcd_pmi_proxy_dump(status, STDOUT_FILENO,
- "we don't understand the response %s; forwarding downstream\n",
- pmi_cmd);
+ HYDU_dump(stdout, "we don't understand the response %s; forwarding downstream\n",
+ pmi_cmd);
}
status = HYDU_sock_write(hdr.pid, buf, hdr.buflen, &sent, &closed);
@@ -460,7 +449,7 @@
char *client_args[HYD_NUM_TMP_STRINGS];
struct HYD_env *env, *force_env = NULL;
struct HYD_exec *exec;
- enum HYD_pmcd_pmi_cmd cmd;
+ struct HYD_pmcd_hdr hdr;
int *pmi_ranks;
int sent, closed, pmi_fds[2] = { HYD_FD_UNSET, HYD_FD_UNSET };
struct HYDT_bind_cpuset_t cpuset;
@@ -750,9 +739,9 @@
}
/* Send the PID list upstream */
- cmd = PID_LIST;
+ hdr.cmd = PID_LIST;
status =
- HYDU_sock_write(HYD_pmcd_pmip.upstream.control, &cmd, sizeof(cmd), &sent, &closed);
+ HYDU_sock_write(HYD_pmcd_pmip.upstream.control, &hdr, sizeof(hdr), &sent, &closed);
HYDU_ERR_POP(status, "unable to send PID_LIST command upstream\n");
HYDU_ASSERT(!closed, status);
@@ -889,14 +878,14 @@
HYD_status HYD_pmcd_pmip_control_cmd_cb(int fd, HYD_event_t events, void *userp)
{
int cmd_len, closed;
- enum HYD_pmcd_pmi_cmd cmd;
+ struct HYD_pmcd_hdr hdr;
char ftb_event_payload[HYDT_FTB_MAX_PAYLOAD_DATA];
HYD_status status = HYD_SUCCESS;
HYDU_FUNC_ENTER();
/* We got a command from upstream */
- status = HYDU_sock_read(fd, &cmd, sizeof(cmd), &cmd_len, &closed, HYDU_SOCK_COMM_MSGWAIT);
+ status = HYDU_sock_read(fd, &hdr, sizeof(hdr), &cmd_len, &closed, HYDU_SOCK_COMM_MSGWAIT);
HYDU_ERR_POP(status, "error reading command from launcher\n");
if (closed) {
@@ -908,15 +897,15 @@
HYD_pmcd_pmip_killjob();
status = HYD_SUCCESS;
}
- else if (cmd == PROC_INFO) {
+ else if (hdr.cmd == PROC_INFO) {
status = procinfo(fd);
HYDU_ERR_POP(status, "error parsing process info\n");
status = launch_procs();
HYDU_ERR_POP(status, "launch_procs returned error\n");
}
- else if (cmd == CKPOINT) {
- HYD_pmcd_pmi_proxy_dump(status, STDOUT_FILENO, "requesting checkpoint\n");
+ else if (hdr.cmd == CKPOINT) {
+ HYDU_dump(stdout, "requesting checkpoint\n");
MPL_snprintf(ftb_event_payload, HYDT_FTB_MAX_PAYLOAD_DATA, "pgid:%d ranks:%d-%d",
HYD_pmcd_pmip.local.pgid, HYD_pmcd_pmip.downstream.pmi_rank[0],
@@ -930,10 +919,10 @@
HYDU_ERR_POP(status, "FTB publishing failure\n");
HYDU_ERR_POP(status, "checkpoint suspend failed\n");
- HYD_pmcd_pmi_proxy_dump(status, STDOUT_FILENO, "checkpoint completed\n");
+ HYDU_dump(stdout, "checkpoint completed\n");
}
- else if (cmd == PMI_RESPONSE) {
- status = handle_pmi_response(fd);
+ else if (hdr.cmd == PMI_RESPONSE) {
+ status = handle_pmi_response(fd, hdr);
HYDU_ERR_POP(status, "unable to handle PMI response\n");
}
else {
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c 2010-11-22 17:36:01 UTC (rev 7480)
@@ -14,8 +14,7 @@
{
int i, j, sent, closed;
char *tmp[HYD_NUM_TMP_STRINGS], *buf;
- struct HYD_pmcd_pmi_hdr hdr;
- enum HYD_pmcd_pmi_cmd cmd;
+ struct HYD_pmcd_hdr hdr;
HYD_status status = HYD_SUCCESS;
HYDU_FUNC_ENTER();
@@ -33,12 +32,7 @@
HYDU_ERR_POP(status, "unable to join strings\n");
HYDU_free_strlist(tmp);
- cmd = PMI_CMD;
- status =
- HYDU_sock_write(HYD_pmcd_pmip.upstream.control, &cmd, sizeof(cmd), &sent, &closed);
- HYDU_ERR_POP(status, "unable to send PMI_CMD command\n");
- HYDU_ASSERT(!closed, status);
-
+ hdr.cmd = PMI_CMD;
hdr.pid = fd;
hdr.buflen = strlen(buf);
hdr.pmi_version = 1;
@@ -48,8 +42,7 @@
HYDU_ASSERT(!closed, status);
if (HYD_pmcd_pmip.user_global.debug) {
- HYD_pmcd_pmi_proxy_dump(status, STDOUT_FILENO, "forwarding command (%s) upstream\n",
- buf);
+ HYDU_dump(stdout, "forwarding command (%s) upstream\n", buf);
}
status = HYDU_sock_write(HYD_pmcd_pmip.upstream.control, buf, hdr.buflen, &sent, &closed);
@@ -72,7 +65,7 @@
HYDU_FUNC_ENTER();
if (HYD_pmcd_pmip.user_global.debug) {
- HYD_pmcd_pmi_proxy_dump(status, STDOUT_FILENO, "PMI response: %s", cmd);
+ HYDU_dump(stdout, "PMI response: %s", cmd);
}
status = HYDU_sock_write(fd, cmd, strlen(cmd), &sent, &closed);
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip_pmi_v2.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip_pmi_v2.c 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip_pmi_v2.c 2010-11-22 17:36:01 UTC (rev 7480)
@@ -18,8 +18,7 @@
{
int i, j, sent, closed;
char *tmp[HYD_NUM_TMP_STRINGS], *buf;
- struct HYD_pmcd_pmi_hdr hdr;
- enum HYD_pmcd_pmi_cmd cmd;
+ struct HYD_pmcd_hdr hdr;
HYD_status status = HYD_SUCCESS;
HYDU_FUNC_ENTER();
@@ -37,12 +36,7 @@
HYDU_ERR_POP(status, "unable to join strings\n");
HYDU_free_strlist(tmp);
- cmd = PMI_CMD;
- status =
- HYDU_sock_write(HYD_pmcd_pmip.upstream.control, &cmd, sizeof(cmd), &sent, &closed);
- HYDU_ERR_POP(status, "unable to send PMI_CMD command\n");
- HYDU_ASSERT(!closed, status);
-
+ hdr.cmd = PMI_CMD;
hdr.pid = fd;
hdr.buflen = strlen(buf);
hdr.pmi_version = 2;
@@ -52,8 +46,7 @@
HYDU_ASSERT(!closed, status);
if (HYD_pmcd_pmip.user_global.debug) {
- HYD_pmcd_pmi_proxy_dump(status, STDOUT_FILENO, "forwarding command (%s) upstream\n",
- buf);
+ HYDU_dump(stdout, "forwarding command (%s) upstream\n", buf);
}
status = HYDU_sock_write(HYD_pmcd_pmip.upstream.control, buf, hdr.buflen, &sent, &closed);
@@ -82,7 +75,7 @@
HYDU_ASSERT(!closed, status);
if (HYD_pmcd_pmip.user_global.debug) {
- HYD_pmcd_pmi_proxy_dump(status, STDOUT_FILENO, "PMI response: %s\n", cmd);
+ HYDU_dump(stdout, "PMI response: %s\n", cmd);
}
status = HYDU_sock_write(fd, cmd, strlen(cmd), &sent, &closed);
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_cb.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_cb.c 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_cb.c 2010-11-22 17:36:01 UTC (rev 7480)
@@ -202,8 +202,7 @@
static HYD_status control_cb(int fd, HYD_event_t events, void *userp)
{
int count, closed;
- enum HYD_pmcd_pmi_cmd cmd = INVALID_CMD;
- struct HYD_pmcd_pmi_hdr hdr;
+ struct HYD_pmcd_hdr hdr;
struct HYD_proxy *proxy;
char *buf;
HYD_status status = HYD_SUCCESS;
@@ -212,7 +211,7 @@
proxy = (struct HYD_proxy *) userp;
- status = HYDU_sock_read(fd, &cmd, sizeof(cmd), &count, &closed, HYDU_SOCK_COMM_MSGWAIT);
+ status = HYDU_sock_read(fd, &hdr, sizeof(hdr), &count, &closed, HYDU_SOCK_COMM_MSGWAIT);
HYDU_ERR_POP(status, "unable to read command from proxy\n");
if (closed) {
@@ -227,24 +226,19 @@
goto fn_exit;
}
- if (cmd == PID_LIST) { /* Got PIDs */
+ if (hdr.cmd == PID_LIST) { /* Got PIDs */
status = handle_pid_list(fd, proxy);
HYDU_ERR_POP(status, "unable to receive PID list\n");
}
- else if (cmd == EXIT_STATUS) {
+ else if (hdr.cmd == EXIT_STATUS) {
status = handle_exit_status(fd, proxy);
HYDU_ERR_POP(status, "unable to receive exit status\n");
}
- else if (cmd == ABORT) {
+ else if (hdr.cmd == ABORT) {
status = handle_abort(fd, proxy);
HYDU_ERR_POP(status, "unable to receive exit status\n");
}
- else if (cmd == PMI_CMD) {
- status =
- HYDU_sock_read(fd, &hdr, sizeof(hdr), &count, &closed, HYDU_SOCK_COMM_MSGWAIT);
- HYDU_ERR_POP(status, "unable to read PMI header from proxy\n");
- HYDU_ASSERT(!closed, status);
-
+ else if (hdr.cmd == PMI_CMD) {
HYDU_MALLOC(buf, char *, hdr.buflen + 1, status);
status = HYDU_sock_read(fd, buf, hdr.buflen, &count, &closed, HYDU_SOCK_COMM_MSGWAIT);
@@ -258,8 +252,21 @@
HYDU_FREE(buf);
}
+ else if (hdr.cmd == STDOUT || hdr.cmd == STDERR) {
+ HYDU_MALLOC(buf, char *, hdr.buflen, status);
+
+ status = HYDU_sock_read(fd, buf, hdr.buflen, &count, &closed, HYDU_SOCK_COMM_MSGWAIT);
+ HYDU_ERR_POP(status, "unable to read PMI command from proxy\n");
+ HYDU_ASSERT(!closed, status);
+
+ if (hdr.cmd == STDOUT)
+ status = HYD_handle.stdout_cb(hdr.pgid, hdr.proxy_id, hdr.rank, buf, hdr.buflen);
+ else
+ status = HYD_handle.stderr_cb(hdr.pgid, hdr.proxy_id, hdr.rank, buf, hdr.buflen);
+ HYDU_ERR_POP(status, "error in the UI defined callback\n");
+ }
else {
- HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR, "unhandled command = %d\n", cmd);
+ HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR, "unhandled command = %d\n", hdr.cmd);
}
fn_exit:
@@ -272,16 +279,14 @@
static HYD_status send_exec_info(struct HYD_proxy *proxy)
{
- enum HYD_pmcd_pmi_cmd cmd;
+ struct HYD_pmcd_hdr hdr;
int sent, closed;
HYD_status status = HYD_SUCCESS;
HYDU_FUNC_ENTER();
- cmd = PROC_INFO;
- status =
- HYDU_sock_write(proxy->control_fd, &cmd, sizeof(enum HYD_pmcd_pmi_cmd), &sent,
- &closed);
+ hdr.cmd = PROC_INFO;
+ status = HYDU_sock_write(proxy->control_fd, &hdr, sizeof(hdr), &sent, &closed);
HYDU_ERR_POP(status, "unable to write data to proxy\n");
HYDU_ASSERT(!closed, status);
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_pmci.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_pmci.c 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_pmci.c 2010-11-22 17:36:01 UTC (rev 7480)
@@ -56,7 +56,7 @@
{
struct HYD_pg *pg = &HYD_handle.pg_list;
struct HYD_proxy *proxy;
- enum HYD_pmcd_pmi_cmd cmd;
+ struct HYD_pmcd_hdr hdr;
int sent, closed;
HYD_status status = HYD_SUCCESS;
@@ -67,9 +67,8 @@
/* Connect to all proxies and send the checkpoint command */
for (proxy = pg->proxy_list; proxy; proxy = proxy->next) {
- cmd = CKPOINT;
- status = HYDU_sock_write(proxy->control_fd, &cmd, sizeof(enum HYD_pmcd_pmi_cmd),
- &sent, &closed);
+ hdr.cmd = CKPOINT;
+ status = HYDU_sock_write(proxy->control_fd, &hdr, sizeof(hdr), &sent, &closed);
HYDU_ERR_POP(status, "unable to send checkpoint message\n");
HYDU_ASSERT(!closed, status);
}
@@ -111,128 +110,6 @@
goto fn_exit;
}
-static HYD_status outerr(void *buf, int buflen, char **storage, int *storage_len,
- HYD_status(*cb) (void *buf, int buflen))
-{
- struct HYD_pmcd_stdio_hdr *hdr;
- char *rbuf, *tbuf, *tmp, str[HYD_TMPBUF_SIZE];
- int rlen, tcnt, restart, i;
- HYD_status status = HYD_SUCCESS;
-
- HYDU_FUNC_ENTER();
-
- if (!HYD_handle.user_global.prepend_rank) {
- status = cb(buf, buflen);
- HYDU_ERR_POP(status, "error in the UI defined callback\n");
- goto fn_exit;
- }
-
- if (*storage_len)
- hdr = (struct HYD_pmcd_stdio_hdr *) *storage;
- else
- hdr = (struct HYD_pmcd_stdio_hdr *) buf;
-
- if (*storage_len || (buflen < sizeof(struct HYD_pmcd_stdio_hdr) + hdr->buflen)) {
- HYDU_MALLOC(tmp, char *, *storage_len + buflen, status);
- memcpy(tmp, *storage, *storage_len);
- memcpy(tmp + *storage_len, buf, buflen);
- HYDU_FREE(*storage);
- *storage = tmp;
- *storage_len += buflen;
- tmp = NULL;
-
- rbuf = *storage;
- rlen = *storage_len;
- }
- else {
- rbuf = buf;
- rlen = buflen;
- }
-
- while (1) {
- hdr = (struct HYD_pmcd_stdio_hdr *) rbuf;
-
- if (rlen < sizeof(struct HYD_pmcd_stdio_hdr) + hdr->buflen)
- break;
-
- rbuf += sizeof(struct HYD_pmcd_stdio_hdr);
- rlen -= sizeof(struct HYD_pmcd_stdio_hdr);
-
- tbuf = rbuf;
- tcnt = hdr->buflen;
- do {
- if (tcnt == 0)
- break;
-
- HYDU_snprintf(str, HYD_TMPBUF_SIZE, "[%d] ", hdr->rank);
- status = cb(str, strlen(str));
- HYDU_ERR_POP(status, "error in the UI defined callback\n");
-
- restart = 0;
- for (i = 0; i < tcnt; i++) {
- if (tbuf[i] == '\n') {
- status = cb(tbuf, i + 1);
- HYDU_ERR_POP(status, "error in the UI defined callback\n");
-
- tbuf += i + 1;
- tcnt -= i + 1;
-
- restart = 1;
- break;
- }
- }
- if (restart)
- continue;
-
- status = cb(tbuf, tcnt);
- HYDU_ERR_POP(status, "error in the UI defined callback\n");
- break;
- } while (1);
-
- rbuf += hdr->buflen;
- rlen -= hdr->buflen;
-
- if (!rlen)
- break;
- }
-
- if (rlen) { /* left overs */
- HYDU_MALLOC(tmp, char *, rlen, status);
- memcpy(tmp, rbuf, rlen);
- if (*storage)
- HYDU_FREE(*storage);
- *storage = tmp;
- }
- else {
- if (*storage)
- HYDU_FREE(*storage);
- *storage = NULL;
- }
- *storage_len = rlen;
-
- fn_exit:
- return status;
-
- fn_fail:
- goto fn_exit;
-}
-
-static HYD_status stdout_cb(void *buf, int buflen)
-{
- static char *storage = NULL;
- static int storage_len = 0;
-
- return outerr(buf, buflen, &storage, &storage_len, HYD_handle.stdout_cb);
-}
-
-static HYD_status stderr_cb(void *buf, int buflen)
-{
- static char *storage = NULL;
- static int storage_len = 0;
-
- return outerr(buf, buflen, &storage, &storage_len, HYD_handle.stderr_cb);
-}
-
HYD_status HYD_pmci_launch_procs(void)
{
struct HYD_proxy *proxy;
@@ -293,8 +170,7 @@
status = HYDT_bind_init(HYD_handle.user_global.binding, HYD_handle.user_global.bindlib);
HYDU_ERR_POP(status, "unable to initializing binding library");
- status = HYDT_bsci_launch_procs(proxy_args, node_list, control_fd, enable_stdin, stdout_cb,
- stderr_cb);
+ status = HYDT_bsci_launch_procs(proxy_args, node_list, control_fd, enable_stdin);
HYDU_ERR_POP(status, "bootstrap server cannot launch processes\n");
for (i = 0, proxy = HYD_handle.pg_list.proxy_list; proxy; proxy = proxy->next, i++)
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v1.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v1.c 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v1.c 2010-11-22 17:36:01 UTC (rev 7480)
@@ -13,18 +13,13 @@
static HYD_status cmd_response(int fd, int pid, const char *cmd)
{
- enum HYD_pmcd_pmi_cmd c;
- struct HYD_pmcd_pmi_hdr hdr;
+ struct HYD_pmcd_hdr hdr;
int sent, closed;
HYD_status status = HYD_SUCCESS;
HYDU_FUNC_ENTER();
- c = PMI_RESPONSE;
- status = HYDU_sock_write(fd, &c, sizeof(c), &sent, &closed);
- HYDU_ERR_POP(status, "unable to send PMI_RESPONSE command to proxy\n");
- HYDU_ASSERT(!closed, status);
-
+ hdr.cmd = PMI_RESPONSE;
hdr.pid = pid;
hdr.pmi_version = 1;
hdr.buflen = strlen(cmd);
@@ -532,8 +527,7 @@
status = HYD_pmcd_pmi_fill_in_exec_launch_info(pg);
HYDU_ERR_POP(status, "unable to fill in executable arguments\n");
- status = HYDT_bsci_launch_procs(proxy_args, node_list, NULL, 0, HYD_handle.stdout_cb,
- HYD_handle.stderr_cb);
+ status = HYDT_bsci_launch_procs(proxy_args, node_list, NULL, 0);
HYDU_ERR_POP(status, "bootstrap server cannot launch processes\n");
HYDU_free_node_list(node_list);
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v2.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v2.c 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v2.c 2010-11-22 17:36:01 UTC (rev 7480)
@@ -22,18 +22,13 @@
static HYD_status cmd_response(int fd, int pid, char *cmd)
{
char cmdlen[7];
- enum HYD_pmcd_pmi_cmd c;
- struct HYD_pmcd_pmi_hdr hdr;
+ struct HYD_pmcd_hdr hdr;
int sent, closed;
HYD_status status = HYD_SUCCESS;
HYDU_FUNC_ENTER();
- c = PMI_RESPONSE;
- status = HYDU_sock_write(fd, &c, sizeof(c), &sent, &closed);
- HYDU_ERR_POP(status, "unable to send PMI_RESPONSE command to proxy\n");
- HYDU_ASSERT(!closed, status);
-
+ hdr.cmd = PMI_RESPONSE;
hdr.pid = pid;
hdr.pmi_version = 2;
hdr.buflen = 6 + strlen(cmd);
@@ -716,8 +711,7 @@
status = HYD_pmcd_pmi_fill_in_exec_launch_info(pg);
HYDU_ERR_POP(status, "unable to fill in executable arguments\n");
- status = HYDT_bsci_launch_procs(proxy_args, node_list, NULL, 0, HYD_handle.stdout_cb,
- HYD_handle.stderr_cb);
+ status = HYDT_bsci_launch_procs(proxy_args, node_list, NULL, 0);
HYDU_ERR_POP(status, "bootstrap server cannot launch processes\n");
HYDU_free_node_list(node_list);
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/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-7424,7429-7433,7435,7437-7438,7448
+ /mpich2/branches/dev/ckpt/src/pm/hydra/tools:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/tools:5057-6537
/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-7424,7429-7433,7435,7437-7438,7448,7470,7473-7477
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/external.h
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/external.h 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/external.h 2010-11-22 17:36:01 UTC (rev 7480)
@@ -14,9 +14,7 @@
#include "sge.h"
HYD_status HYDT_bscd_external_launch_procs(char **args, struct HYD_node *node_list,
- int *control_fd, int enable_stdin,
- HYD_status(*stdout_cb) (void *buf, int buflen),
- HYD_status(*stderr_cb) (void *buf, int buflen));
+ int *control_fd, int enable_stdin);
HYD_status HYDT_bscd_external_finalize(void);
HYD_status HYDT_bscd_external_query_env_inherit(const char *env_name, int *ret);
HYD_status HYDT_bscd_external_query_native_int(int *ret);
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/external_launch.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/external_launch.c 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/external_launch.c 2010-11-22 17:36:01 UTC (rev 7480)
@@ -72,9 +72,7 @@
}
HYD_status HYDT_bscd_external_launch_procs(char **args, struct HYD_node *node_list,
- int *control_fd, int enable_stdin,
- HYD_status(*stdout_cb) (void *buf, int buflen),
- HYD_status(*stderr_cb) (void *buf, int buflen))
+ int *control_fd, int enable_stdin)
{
int num_hosts, idx, i, host_idx, fd, exec_idx, offset, lh;
int *pid, *fd_list, *dummy;
@@ -291,16 +289,17 @@
/* Register stdio callbacks for the spawned process */
if (i == 0 && enable_stdin) {
fd = STDIN_FILENO;
- status = HYDT_dmx_register_fd(1, &fd, HYD_POLLIN, &fd_stdin, HYDT_bscu_stdin_cb);
+ status = HYDT_dmx_register_fd(1, &fd, HYD_POLLIN,
+ (void *) (size_t) fd_stdin, HYDT_bscu_stdio_cb);
HYDU_ERR_POP(status, "demux returned error registering fd\n");
}
- status = HYDT_dmx_register_fd(1, &fd_stdout, HYD_POLLIN, stdout_cb,
- HYDT_bscu_inter_cb);
+ status = HYDT_dmx_register_fd(1, &fd_stdout, HYD_POLLIN,
+ (void *) (size_t) STDOUT_FILENO, HYDT_bscu_stdio_cb);
HYDU_ERR_POP(status, "demux returned error registering fd\n");
- status = HYDT_dmx_register_fd(1, &fd_stderr, HYD_POLLIN, stderr_cb,
- HYDT_bscu_inter_cb);
+ status = HYDT_dmx_register_fd(1, &fd_stderr, HYD_POLLIN,
+ (void *) (size_t) STDERR_FILENO, HYDT_bscu_stdio_cb);
HYDU_ERR_POP(status, "demux returned error registering fd\n");
}
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/ll.h
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/ll.h 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/ll.h 2010-11-22 17:36:01 UTC (rev 7480)
@@ -10,9 +10,7 @@
#include "hydra_base.h"
HYD_status HYDT_bscd_ll_launch_procs(char **args, struct HYD_node *node_list,
- int *control_fd, int enable_stdin,
- HYD_status(*stdout_cb) (void *buf, int buflen),
- HYD_status(*stderr_cb) (void *buf, int buflen));
+ int *control_fd, int enable_stdin);
HYD_status HYDT_bscd_ll_query_proxy_id(int *proxy_id);
HYD_status HYDT_bscd_ll_query_node_list(struct HYD_node **node_list);
HYD_status HYDTI_bscd_ll_query_node_count(int *count);
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/ll_launch.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/ll_launch.c 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/ll_launch.c 2010-11-22 17:36:01 UTC (rev 7480)
@@ -13,9 +13,7 @@
static int fd_stdin, fd_stdout, fd_stderr;
HYD_status HYDT_bscd_ll_launch_procs(char **args, struct HYD_node *node_list,
- int *control_fd, int enable_stdin,
- HYD_status(*stdout_cb) (void *buf, int buflen),
- HYD_status(*stderr_cb) (void *buf, int buflen))
+ int *control_fd, int enable_stdin)
{
int idx, i, fd, total_procs, node_count;
int *pid, *fd_list;
@@ -102,14 +100,17 @@
/* Register stdio callbacks for the spawned process */
if (enable_stdin) {
fd = STDIN_FILENO;
- status = HYDT_dmx_register_fd(1, &fd, HYD_POLLIN, &fd_stdin, HYDT_bscu_stdin_cb);
+ status = HYDT_dmx_register_fd(1, &fd, HYD_POLLIN,
+ (void *) (size_t) fd_stdin, HYDT_bscu_stdio_cb);
HYDU_ERR_POP(status, "demux returned error registering fd\n");
}
- status = HYDT_dmx_register_fd(1, &fd_stdout, HYD_POLLIN, stdout_cb, HYDT_bscu_inter_cb);
+ status = HYDT_dmx_register_fd(1, &fd_stdout, HYD_POLLIN,
+ (void *) (size_t) STDOUT_FILENO, HYDT_bscu_stdio_cb);
HYDU_ERR_POP(status, "demux returned error registering fd\n");
- status = HYDT_dmx_register_fd(1, &fd_stderr, HYD_POLLIN, stderr_cb, HYDT_bscu_inter_cb);
+ status = HYDT_dmx_register_fd(1, &fd_stderr, HYD_POLLIN,
+ (void *) (size_t) STDERR_FILENO, HYDT_bscu_stdio_cb);
HYDU_ERR_POP(status, "demux returned error registering fd\n");
fn_exit:
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/slurm.h
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/slurm.h 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/slurm.h 2010-11-22 17:36:01 UTC (rev 7480)
@@ -10,9 +10,7 @@
#include "hydra_base.h"
HYD_status HYDT_bscd_slurm_launch_procs(char **args, struct HYD_node *node_list,
- int *control_fd, int enable_stdin,
- HYD_status(*stdout_cb) (void *buf, int buflen),
- HYD_status(*stderr_cb) (void *buf, int buflen));
+ int *control_fd, int enable_stdin);
HYD_status HYDT_bscd_slurm_query_proxy_id(int *proxy_id);
HYD_status HYDT_bscd_slurm_query_node_list(struct HYD_node **node_list);
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 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/slurm_launch.c 2010-11-22 17:36:01 UTC (rev 7480)
@@ -60,9 +60,7 @@
}
HYD_status HYDT_bscd_slurm_launch_procs(char **args, struct HYD_node *node_list,
- int *control_fd, int enable_stdin,
- HYD_status(*stdout_cb) (void *buf, int buflen),
- HYD_status(*stderr_cb) (void *buf, int buflen))
+ int *control_fd, int enable_stdin)
{
int num_hosts, idx, i, fd;
int *pid, *fd_list;
@@ -155,14 +153,17 @@
/* Register stdio callbacks for the spawned process */
if (enable_stdin) {
fd = STDIN_FILENO;
- status = HYDT_dmx_register_fd(1, &fd, HYD_POLLIN, &fd_stdin, HYDT_bscu_stdin_cb);
+ status = HYDT_dmx_register_fd(1, &fd, HYD_POLLIN,
+ (void *) (size_t) fd_stdin, HYDT_bscu_stdio_cb);
HYDU_ERR_POP(status, "demux returned error registering fd\n");
}
- status = HYDT_dmx_register_fd(1, &fd_stdout, HYD_POLLIN, stdout_cb, HYDT_bscu_inter_cb);
+ status = HYDT_dmx_register_fd(1, &fd_stdout, HYD_POLLIN,
+ (void *) (size_t) STDOUT_FILENO, HYDT_bscu_stdio_cb);
HYDU_ERR_POP(status, "demux returned error registering fd\n");
- status = HYDT_dmx_register_fd(1, &fd_stderr, HYD_POLLIN, stderr_cb, HYDT_bscu_inter_cb);
+ status = HYDT_dmx_register_fd(1, &fd_stderr, HYD_POLLIN,
+ (void *) (size_t) STDERR_FILENO, HYDT_bscu_stdio_cb);
HYDU_ERR_POP(status, "demux returned error registering fd\n");
fn_exit:
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/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-7424,7429-7433,7435,7437-7438,7448
+ /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-7424,7429-7433,7435,7437-7438,7448,7470,7473-7477
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/include/bsci.h.in
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/include/bsci.h.in 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/include/bsci.h.in 2010-11-22 17:36:01 UTC (rev 7480)
@@ -37,9 +37,7 @@
struct HYDT_bsci_fns {
/** \brief Launch processes */
HYD_status(*launch_procs) (
- char **args, struct HYD_node *node_list, int *control_fd, int enable_stdin,
- HYD_status(*stdout_cb) (void *buf, int buflen),
- HYD_status(*stderr_cb) (void *buf, int buflen));
+ char **args, struct HYD_node *node_list, int *control_fd, int enable_stdin);
/** \brief Finalize the bootstrap control device */
HYD_status(*finalize) (void);
@@ -112,9 +110,7 @@
* function.
*/
HYD_status HYDT_bsci_launch_procs(
- char **args, struct HYD_node *node_list, int *control_fd, int enable_stdin,
- HYD_status(*stdout_cb) (void *buf, int buflen),
- HYD_status(*stderr_cb) (void *buf, int buflen));
+ char **args, struct HYD_node *node_list, int *control_fd, int enable_stdin);
/**
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/persist/persist_client.h
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/persist/persist_client.h 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/persist/persist_client.h 2010-11-22 17:36:01 UTC (rev 7480)
@@ -12,9 +12,7 @@
#include "persist.h"
HYD_status HYDT_bscd_persist_launch_procs(char **args, struct HYD_node *node_list,
- int *control_fd, int enable_stdin,
- HYD_status(*stdout_cb) (void *buf, int buflen),
- HYD_status(*stderr_cb) (void *buf, int buflen));
+ int *control_fd, int enable_stdin);
HYD_status HYDT_bscd_persist_wait_for_completion(int timeout);
extern int *HYDT_bscd_persist_control_fd;
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/persist/persist_launch.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/persist/persist_launch.c 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/persist/persist_launch.c 2010-11-22 17:36:01 UTC (rev 7480)
@@ -9,15 +9,12 @@
#include "bscu.h"
#include "persist_client.h"
-static HYD_status(*out_cb) (void *buf, int buflen);
-static HYD_status(*err_cb) (void *buf, int buflen);
-
int *HYDT_bscd_persist_control_fd = NULL;
int HYDT_bscd_persist_node_count = 0;
static HYD_status persist_cb(int fd, HYD_event_t events, void *userp)
{
- int count, closed;
+ int count, closed, sent;
char buf[HYD_TMPBUF_SIZE];
HYDT_persist_header hdr;
HYD_status status = HYD_SUCCESS;
@@ -34,12 +31,16 @@
HYDU_ASSERT(!closed, status);
if (hdr.io_type == HYDT_PERSIST_STDOUT) {
- status = out_cb(buf, hdr.buflen);
- HYDU_ERR_POP(status, "error calling stdout callback\n");
+ HYDU_sock_write(STDOUT_FILENO, buf, hdr.buflen, &sent, &closed);
+ HYDU_ERR_POP(status, "stdout forwarding error\n");
+ HYDU_ASSERT(!closed, status);
+ HYDU_ASSERT(sent == hdr.buflen, status);
}
else {
- status = err_cb(buf, hdr.buflen);
- HYDU_ERR_POP(status, "error calling stderr callback\n");
+ HYDU_sock_write(STDERR_FILENO, buf, hdr.buflen, &sent, &closed);
+ HYDU_ERR_POP(status, "stderr forwarding error\n");
+ HYDU_ASSERT(!closed, status);
+ HYDU_ASSERT(sent == hdr.buflen, status);
}
}
else {
@@ -58,9 +59,7 @@
}
HYD_status HYDT_bscd_persist_launch_procs(char **args, struct HYD_node *node_list,
- int *control_fd, int enable_stdin,
- HYD_status(*stdout_cb) (void *buf, int buflen),
- HYD_status(*stderr_cb) (void *buf, int buflen))
+ int *control_fd, int enable_stdin)
{
struct HYD_node *node;
int idx, i, tmp_fd;
@@ -94,7 +93,7 @@
tmp_fd = STDIN_FILENO;
status = HYDT_dmx_register_fd(1, &tmp_fd, HYD_POLLIN,
&HYDT_bscd_persist_control_fd[i],
- HYDT_bscu_stdin_cb);
+ HYDT_bscu_stdio_cb);
HYDU_ERR_POP(status, "demux returned error registering fd\n");
}
@@ -103,9 +102,6 @@
HYDU_ERR_POP(status, "demux returned error registering fd\n");
}
- out_cb = stdout_cb;
- err_cb = stderr_cb;
-
fn_exit:
HYDU_FUNC_EXIT();
return status;
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/src/bsci_launch.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/src/bsci_launch.c 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/src/bsci_launch.c 2010-11-22 17:36:01 UTC (rev 7480)
@@ -8,16 +8,13 @@
#include "bsci.h"
HYD_status HYDT_bsci_launch_procs(char **args, struct HYD_node *node_list, int *control_fd,
- int enable_stdin,
- HYD_status(*stdout_cb) (void *buf, int buflen),
- HYD_status(*stderr_cb) (void *buf, int buflen))
+ int enable_stdin)
{
HYD_status status = HYD_SUCCESS;
HYDU_FUNC_ENTER();
- status = HYDT_bsci_fns.launch_procs(args, node_list, control_fd, enable_stdin,
- stdout_cb, stderr_cb);
+ status = HYDT_bsci_fns.launch_procs(args, node_list, control_fd, enable_stdin);
HYDU_ERR_POP(status, "bootstrap device returned error while launching processes\n");
fn_exit:
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/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-7424,7429-7433,7435,7437-7438,7448
+ /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-7424,7429-7433,7435,7437-7438,7448,7470,7473-7477
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/utils/bscu.h
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/utils/bscu.h 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/utils/bscu.h 2010-11-22 17:36:01 UTC (rev 7480)
@@ -22,8 +22,7 @@
HYD_status HYDT_bscu_wait_for_completion(int timeout);
HYD_status HYDT_bscu_query_env_inherit(const char *env_name, int *ret);
HYD_status HYDT_bscu_cleanup_procs(void);
-HYD_status HYDT_bscu_inter_cb(int fd, HYD_event_t events, void *userp);
-HYD_status HYDT_bscu_stdin_cb(int fd, HYD_event_t events, void *userp);
+HYD_status HYDT_bscu_stdio_cb(int fd, HYD_event_t events, void *userp);
HYD_status HYDT_bscu_query_native_int(int *ret);
#endif /* BSCU_H_INCLUDED */
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/utils/bscu_cb.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/utils/bscu_cb.c 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/utils/bscu_cb.c 2010-11-22 17:36:01 UTC (rev 7480)
@@ -7,20 +7,17 @@
#include "hydra_utils.h"
#include "bscu.h"
-HYD_status HYDT_bscu_inter_cb(int fd, HYD_event_t events, void *userp)
+HYD_status HYDT_bscu_stdio_cb(int fd, HYD_event_t events, void *userp)
{
- int buflen, i, closed;
- char buf[HYD_TMPBUF_SIZE];
- HYD_status(*cb) (void *buf, int buflen);
+ int stdfd, closed, i;
HYD_status status = HYD_SUCCESS;
HYDU_FUNC_ENTER();
- /* Get the callback information */
- cb = (HYD_status(*)(void *buf, int buflen)) userp;
+ stdfd = (int) (size_t) userp;
- status = HYDU_sock_read(fd, buf, HYD_TMPBUF_SIZE, &buflen, &closed, HYDU_SOCK_COMM_NONE);
- HYDU_ERR_POP(status, "error reading from fd\n");
+ status = HYDU_sock_forward_stdio(fd, stdfd, &closed);
+ HYDU_ERR_POP(status, "stdin forwarding error\n");
if (closed || (events & HYD_POLLHUP)) {
/* connection has closed */
@@ -37,11 +34,6 @@
close(fd);
}
- if (buflen) {
- status = cb(buf, buflen);
- HYDU_ERR_POP(status, "callback returned error\n");
- }
-
fn_exit:
HYDU_FUNC_EXIT();
return status;
@@ -49,38 +41,3 @@
fn_fail:
goto fn_exit;
}
-
-HYD_status HYDT_bscu_stdin_cb(int fd, HYD_event_t events, void *userp)
-{
- int closed, in_fd, i;
- HYD_status status = HYD_SUCCESS;
-
- HYDU_FUNC_ENTER();
-
- in_fd = *((int *) userp);
-
- status = HYDU_sock_forward_stdio(STDIN_FILENO, in_fd, &closed);
- HYDU_ERR_POP(status, "stdin forwarding error\n");
-
- if (closed || (events & HYD_POLLHUP)) {
- status = HYDT_dmx_deregister_fd(fd);
- HYDU_ERR_SETANDJUMP(status, status, "error deregistering fd %d\n", fd);
-
- for (i = 0; i < HYD_bscu_fd_count; i++) {
- if (HYD_bscu_fd_list[i] == fd) {
- HYD_bscu_fd_list[i] = HYD_FD_CLOSED;
- break;
- }
- }
-
- close(STDIN_FILENO);
- close(in_fd);
- }
-
- fn_exit:
- HYDU_FUNC_EXIT();
- return status;
-
- fn_fail:
- goto fn_exit;
-}
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/utils/bscu_query_proxy_id.c
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ftb/src/pm/hydra/tools/bootstrap/utils/bscu_query_proxy_id.c:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/tools/bootstrap/utils/bscu_query_proxy_id.c:5817
/mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_query_proxy_id.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7424,7429-7433,7435,7437-7438,7448
+ /mpich2/branches/dev/ftb/src/pm/hydra/tools/bootstrap/utils/bscu_query_proxy_id.c:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/tools/bootstrap/utils/bscu_query_proxy_id.c:5817
/mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_query_proxy_id.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7424,7429-7433,7435,7437-7438,7448,7470,7473-7477
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/ftb/Makefile.mk
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/ftb/Makefile.mk 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/ftb/Makefile.mk 2010-11-22 17:36:01 UTC (rev 7480)
@@ -8,4 +8,6 @@
if hydra_have_ftb
libhydra_la_SOURCES += $(top_srcdir)/tools/ftb/hydt_ftb.c
+else
+libhydra_la_SOURCES += $(top_srcdir)/tools/ftb/hydt_ftb_dummy.c
endif
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/ftb/hydt_ftb.h
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/ftb/hydt_ftb.h 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/ftb/hydt_ftb.h 2010-11-22 17:36:01 UTC (rev 7480)
@@ -9,32 +9,13 @@
#if defined ENABLE_FTB
#include <libftb.h>
-
#define HYDT_FTB_MAX_PAYLOAD_DATA FTB_MAX_PAYLOAD_DATA
+#else
+#define HYDT_FTB_MAX_PAYLOAD_DATA (1024)
+#endif /* ENABLE_FTB */
HYD_status HYDT_ftb_init(void);
HYD_status HYDT_ftb_finalize(void);
HYD_status HYDT_ftb_publish(const char *event_name, const char *event_payload);
-#else
-
-#define HYDT_FTB_MAX_PAYLOAD_DATA (1024)
-
-static HYD_status HYDT_ftb_init(void)
-{
- return HYD_SUCCESS;
-}
-
-static HYD_status HYDT_ftb_finalize(void)
-{
- return HYD_SUCCESS;
-}
-
-static HYD_status HYDT_ftb_publish(const char *event_name, const char *event_payload)
-{
- return HYD_SUCCESS;
-}
-
-#endif /* ENABLE_FTB */
-
#endif /* HYDT_FTB_H_INCLUDED */
Copied: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/ftb/hydt_ftb_dummy.c (from rev 7474, mpich2/trunk/src/pm/hydra/tools/ftb/hydt_ftb_dummy.c)
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/ftb/hydt_ftb_dummy.c (rev 0)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/ftb/hydt_ftb_dummy.c 2010-11-22 17:36:01 UTC (rev 7480)
@@ -0,0 +1,23 @@
+/* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * (C) 2008 by Argonne National Laboratory.
+ * See COPYRIGHT in top-level directory.
+ */
+
+#include "hydra_utils.h"
+#include "hydt_ftb.h"
+
+HYD_status HYDT_ftb_init(void)
+{
+ return HYD_SUCCESS;
+}
+
+HYD_status HYDT_ftb_finalize(void)
+{
+ return HYD_SUCCESS;
+}
+
+HYD_status HYDT_ftb_publish(const char *event_name, const char *event_payload)
+{
+ return HYD_SUCCESS;
+}
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/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-7424,7429-7433,7435,7437-7438,7448
+ /mpich2/branches/dev/ckpt/src/pm/hydra/ui:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/ui:5057-6537
/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-7424,7429-7433,7435,7437-7438,7448,7470,7473-7477
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/ui/utils/uiu.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/ui/utils/uiu.c 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/ui/utils/uiu.c 2010-11-22 17:36:01 UTC (rev 7480)
@@ -181,16 +181,32 @@
return;
}
-HYD_status HYD_uiu_stdout_cb(void *buf, int buflen)
+HYD_status HYD_uiu_stdout_cb(int pgid, int proxy_id, int rank, void *_buf, int buflen)
{
- int sent, closed;
+ int sent, closed, mark, i;
+ char *buf = (char *) _buf;
HYD_status status = HYD_SUCCESS;
HYDU_FUNC_ENTER();
- status = HYDU_sock_write(STDOUT_FILENO, buf, buflen, &sent, &closed);
- HYDU_ERR_POP(status, "unable to write data to stdout\n");
- HYDU_ASSERT(!closed, status);
+ if (HYD_handle.user_global.prepend_rank == 0) {
+ status = HYDU_sock_write(STDOUT_FILENO, buf, buflen, &sent, &closed);
+ HYDU_ERR_POP(status, "unable to write data to stdout\n");
+ HYDU_ASSERT(!closed, status);
+ }
+ else {
+ mark = 0;
+ for (i = 0; i < buflen; i++) {
+ if (buf[i] == '\n' || i == buflen - 1) {
+ HYDU_dump_noprefix(stdout, "[%d] ", rank);
+ status = HYDU_sock_write(STDOUT_FILENO, (const void *) &buf[mark],
+ i - mark + 1, &sent, &closed);
+ HYDU_ERR_POP(status, "unable to write data to stdout\n");
+ HYDU_ASSERT(!closed, status);
+ mark = i + 1;
+ }
+ }
+ }
fn_exit:
HYDU_FUNC_EXIT();
@@ -200,16 +216,32 @@
goto fn_exit;
}
-HYD_status HYD_uiu_stderr_cb(void *buf, int buflen)
+HYD_status HYD_uiu_stderr_cb(int pgid, int proxy_id, int rank, void *_buf, int buflen)
{
- int sent, closed;
+ int sent, closed, mark, i;
+ char *buf = (char *) _buf;
HYD_status status = HYD_SUCCESS;
HYDU_FUNC_ENTER();
- status = HYDU_sock_write(STDERR_FILENO, buf, buflen, &sent, &closed);
- HYDU_ERR_POP(status, "unable to write data to stdout\n");
- HYDU_ASSERT(!closed, status);
+ if (HYD_handle.user_global.prepend_rank == 0) {
+ status = HYDU_sock_write(STDERR_FILENO, buf, buflen, &sent, &closed);
+ HYDU_ERR_POP(status, "unable to write data to stderr\n");
+ HYDU_ASSERT(!closed, status);
+ }
+ else {
+ mark = 0;
+ for (i = 0; i < buflen; i++) {
+ if (buf[i] == '\n' || i == buflen - 1) {
+ HYDU_dump_noprefix(stderr, "[%d] ", rank);
+ status = HYDU_sock_write(STDERR_FILENO, (const void *) &buf[mark],
+ i - mark + 1, &sent, &closed);
+ HYDU_ERR_POP(status, "unable to write data to stderr\n");
+ HYDU_ASSERT(!closed, status);
+ mark = i + 1;
+ }
+ }
+ }
fn_exit:
HYDU_FUNC_EXIT();
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/ui/utils/uiu.h
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/ui/utils/uiu.h 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/ui/utils/uiu.h 2010-11-22 17:36:01 UTC (rev 7480)
@@ -12,7 +12,7 @@
void HYD_uiu_init_params(void);
void HYD_uiu_free_params(void);
void HYD_uiu_print_params(void);
-HYD_status HYD_uiu_stdout_cb(void *buf, int buflen);
-HYD_status HYD_uiu_stderr_cb(void *buf, int buflen);
+HYD_status HYD_uiu_stdout_cb(int pgid, int proxy_id, int rank, void *buf, int buflen);
+HYD_status HYD_uiu_stderr_cb(int pgid, int proxy_id, int rank, void *buf, int buflen);
#endif /* UIU_H_INCLUDED */
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/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-7424,7429-7433,7435,7437-7438,7448
+ /mpich2/branches/dev/ckpt/src/pm/hydra/utils:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/utils:5057-6537
/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-7424,7429-7433,7435,7437-7438,7448,7470,7473-7477
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/utils/sock/sock.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/utils/sock/sock.c 2010-11-22 17:29:10 UTC (rev 7479)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/utils/sock/sock.c 2010-11-22 17:36:01 UTC (rev 7480)
@@ -286,28 +286,6 @@
goto fn_exit;
}
-static HYD_status set_block(int fd)
-{
- int flags;
- HYD_status status = HYD_SUCCESS;
-
- HYDU_FUNC_ENTER();
-
- if ((flags = fcntl(fd, F_GETFL, 0)) == -1)
- flags = 0;
-#if defined O_NONBLOCK
- if (fcntl(fd, F_SETFL, flags & ~O_NONBLOCK) < 0)
- HYDU_ERR_SETANDJUMP(status, HYD_SOCK_ERROR, "fcntl failed on %d\n", fd);
-#endif /* O_NONBLOCK */
-
- fn_exit:
- HYDU_FUNC_EXIT();
- return status;
-
- fn_fail:
- goto fn_exit;
-}
-
static HYD_status alloc_fwd_hash(struct fwd_hash **fwd_hash, int in, int out)
{
HYD_status status = HYD_SUCCESS;
@@ -323,7 +301,7 @@
(*fwd_hash)->next = NULL;
- status = set_block(in);
+ status = set_nonblock(in);
HYDU_ERR_POP(status, "unable to set out-socket to non-blocking\n");
status = set_nonblock(out);
@@ -358,7 +336,8 @@
break;
if (tmp == NULL) { /* No hash found; create one */
- alloc_fwd_hash(&fwd_hash, in, out);
+ status = alloc_fwd_hash(&fwd_hash, in, out);
+ HYDU_ERR_POP(status, "unable to allocate forward hash\n");
if (fwd_hash_list == NULL)
fwd_hash_list = fwd_hash;
else {
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/ftb/winconfigure.wsf:5661-5730
/mpich2/branches/dev/lapi/winconfigure.wsf:5817
/mpich2/branches/dev/win_rrvm/winconfigure.wsf:6404,6407-6408,6420,6422-6423
/mpich2/branches/dev/wintcp_async_progress/winconfigure.wsf:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/winconfigure.wsf:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/winconfigure.wsf:5406
/mpich2/trunk/winconfigure.wsf:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7424,7429-7433,7435,7437-7438,7448
+ /mpich2/branches/dev/ckpt/winconfigure.wsf:5050
/mpich2/branches/dev/ckpt2/winconfigure.wsf:5057-6537
/mpich2/branches/dev/ftb/winconfigure.wsf:5661-5730
/mpich2/branches/dev/lapi/winconfigure.wsf:5817
/mpich2/branches/dev/win_rrvm/winconfigure.wsf:6404,6407-6408,6420,6422-6423
/mpich2/branches/dev/wintcp_async_progress/winconfigure.wsf:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/winconfigure.wsf:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/winconfigure.wsf:5406
/mpich2/trunk/winconfigure.wsf:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7424,7429-7433,7435,7437-7438,7448,7470,7473-7477
More information about the mpich2-commits
mailing list