[mpich2-commits] r7755 - 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/pm/pmiserv src/pm/hydra/tools src/pm/hydra/tools/bind src/pm/hydra/tools/bind/hwloc src/pm/hydra/tools/bind/hwloc/hwloc src/pm/hydra/tools/bind/hwloc/hwloc/config src/pm/hydra/tools/bind/hwloc/hwloc/doc src/pm/hydra/tools/bind/hwloc/hwloc/include src/pm/hydra/tools/bind/hwloc/hwloc/include/hwloc src/pm/hydra/tools/bind/hwloc/hwloc/src src/pm/hydra/tools/bind/hwloc/hwloc/tests src/pm/hydra/tools/bind/hwloc/hwloc/tests/linux src/pm/hydra/tools/bind/hwloc/hwloc/utils src/pm/hydra/tools/bind/plpa src/pm/hydra/tools/bootstrap/external src/pm/hydra/tools/bootstrap/src src/pm/hydra/tools/bootstrap/utils src/pm/hydra/ui src/pm/hydra/utils
balaji at mcs.anl.gov
balaji at mcs.anl.gov
Wed Jan 19 08:28:19 CST 2011
Author: balaji
Date: 2011-01-19 08:28:19 -0600 (Wed, 19 Jan 2011)
New Revision: 7755
Added:
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/utils/hwloc-gather-topology.sh.1in
Modified:
mpich2/branches/release/mpich2-1.3.x/
mpich2/branches/release/mpich2-1.3.x/CHANGES
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/pm/pmiserv/pmip.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/tools/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/bind.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/bind.h
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/bind_hwloc.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/bind_hwloc.h
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/NEWS
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/README
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/VERSION
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc.m4
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/doc/Makefile.am
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/doc/doxygen.cfg
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/doc/hwloc.doxy
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/include/hwloc.h
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/include/hwloc/bitmap.h
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/include/hwloc/helper.h
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/include/hwloc/rename.h
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/src/cpuset.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/src/topology-linux.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/src/topology-synthetic.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/src/topology.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/src/traversal.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/tests/hwloc_bitmap_string.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/tests/linux/hwloc-gather-topology.sh.in
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/utils/Makefile.am
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/utils/lstopo-draw.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/plpa/bind_plpa.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/plpa/bind_plpa.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/src/bsci_query_proxy_id.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/ui/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/utils/
mpich2/branches/release/mpich2-1.3.x/winconfigure.wsf
Log:
Merge r7751, r7752, r7753 and r7754 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/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
+ /mpich2/branches/dev/ckpt:5050
/mpich2/branches/dev/ckpt2:5057-6537
/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
Modified: mpich2/branches/release/mpich2-1.3.x/CHANGES
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/CHANGES 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/CHANGES 2011-01-19 14:28:19 UTC (rev 7755)
@@ -14,7 +14,7 @@
# PM/PMI: Several fixes and improvements to Hydra's process binding
capability.
- # PM/PMI: Upgrade the hwloc version to 1.1.
+ # PM/PMI: Upgrade the hwloc version to 1.1.1rc1.
# PM/PMI: Allow users to sort node lists allocated by resource
managers in Hydra.
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/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
+ /mpich2/branches/dev/ckpt2/confdb:5180,5182,5196,5198
/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
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-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
/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/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
/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/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
+ /mpich2/branches/dev/ckpt/src/mpid:5050
/mpich2/branches/dev/ckpt2/src/mpid:5057-6537
/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
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/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
+ /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/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
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/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
+ /mpich2/branches/dev/ckpt2/src/mpl/src/string/mplstr.c:5182,5196,5198
/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
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/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*
+ /mpich2/branches/dev/ckpt/src/pm/hydra:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra:5057-6537
/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*
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/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
+ /mpich2/branches/dev/ckpt/src/pm/hydra/Makefile.am:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/Makefile.am:5057-6537
/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
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/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
+ /mpich2/branches/dev/ckpt/src/pm/hydra/README:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/README:5057-6537
/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
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/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
+ /mpich2/branches/dev/ckpt/src/pm/hydra/autogen.sh:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/autogen.sh:5057-6537
/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
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/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
+ /mpich2/branches/dev/ckpt/src/pm/hydra/configure.in:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/configure.in:5057-6537
/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
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/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
+ /mpich2/branches/dev/ckpt/src/pm/hydra/examples:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/examples:5057-6537
/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
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/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
+ /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/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
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/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
+ /mpich2/branches/dev/ckpt/src/pm/hydra/include:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/include:5057-6537
/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
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/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
+ /mpich2/branches/dev/ckpt/src/pm/hydra/mpich2prereq:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/mpich2prereq:5057-6537
/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
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/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
+ /mpich2/branches/dev/ckpt/src/pm/hydra/pm:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/pm:5057-6537
/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
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 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmip.c 2011-01-19 14:28:19 UTC (rev 7755)
@@ -57,6 +57,8 @@
static void cleanup_params(void)
{
+ HYD_status status = HYD_SUCCESS;
+
HYDU_finalize_user_global(&HYD_pmcd_pmip.user_global);
/* System global */
@@ -117,7 +119,7 @@
/* Exec list */
HYDU_free_exec_list(HYD_pmcd_pmip.exec_list);
- HYDT_bind_finalize();
+ status = HYDT_bind_finalize();
}
static void signal_cb(int sig)
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 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/pmiserv/pmiserv_pmci.c 2011-01-19 14:28:19 UTC (rev 7755)
@@ -238,7 +238,8 @@
status = HYDT_dmx_finalize();
HYDU_ERR_POP(status, "error returned from demux finalize\n");
- HYDT_bind_finalize();
+ status = HYDT_bind_finalize();
+ HYDU_ERR_POP(status, "error returned from binding finalize\n");
fn_exit:
HYDU_FUNC_EXIT();
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/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
+ /mpich2/branches/dev/ckpt/src/pm/hydra/tools:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/tools:5057-6537
/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
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/bind.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/bind.c 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/bind.c 2011-01-19 14:28:19 UTC (rev 7755)
@@ -98,11 +98,6 @@
/***************************** USER *****************************/
if (!strncmp(binding, "user:", strlen("user:"))) {
- /* Find the actual processing elements */
- HYDU_MALLOC(HYDT_bind_info.bindmap, struct HYDT_bind_cpuset_t *,
- HYDT_bind_info.total_proc_units * sizeof(struct HYDT_bind_cpuset_t),
- status);
-
/* Initialize all values to map to all CPUs */
for (i = 0; i < HYDT_bind_info.total_proc_units; i++)
for (j = 0; j < HYDT_bind_info.total_proc_units; j++)
@@ -124,6 +119,7 @@
if (i >= HYDT_bind_info.total_proc_units)
break;
}
+ HYDU_FREE(bindstr);
goto fn_exit;
}
@@ -169,6 +165,7 @@
elem = strtok(NULL, ",");
} while (elem);
}
+ HYDU_FREE(bindstr);
for (i = HYDT_BIND_OBJ_END - 1; i > HYDT_BIND_OBJ_MACHINE; i--) {
/* If an object has to be used, its parent object is also
@@ -233,6 +230,7 @@
elem = strtok(NULL, ",");
} while (elem);
}
+ HYDU_FREE(bindstr);
topo_end = HYDT_BIND_OBJ_END;
obj = &HYDT_bind_info.machine;
@@ -328,22 +326,13 @@
level.parent = NULL;
- if (level.children)
+ if (level.children) {
for (i = 0; i < level.num_children; i++)
cleanup_topo_level(level.children[i]);
+ HYDU_FREE(level.children);
+ }
}
-void HYDT_bind_finalize(void)
-{
- if (HYDT_bind_info.bindmap)
- HYDU_FREE(HYDT_bind_info.bindmap);
-
- if (HYDT_bind_info.bindlib)
- HYDU_FREE(HYDT_bind_info.bindlib);
-
- cleanup_topo_level(HYDT_bind_info.machine);
-}
-
HYD_status HYDT_bind_process(struct HYDT_bind_cpuset_t cpuset)
{
HYD_status status = HYD_SUCCESS;
@@ -377,3 +366,40 @@
HYDT_bind_cpuset_dup(HYDT_bind_info.bindmap[process_id % HYDT_bind_info.total_proc_units],
cpuset);
}
+
+HYD_status HYDT_bind_finalize(void)
+{
+ HYD_status status = HYD_SUCCESS;
+
+ HYDU_FUNC_ENTER();
+
+ /* Finalize the binding library requested by the user */
+#if defined HAVE_PLPA
+ if (!strcmp(HYDT_bind_info.bindlib, "plpa")) {
+ status = HYDT_bind_plpa_finalize();
+ HYDU_ERR_POP(status, "unable to finalize plpa\n");
+ }
+#endif /* HAVE_PLPA */
+
+#if defined HAVE_HWLOC
+ if (!strcmp(HYDT_bind_info.bindlib, "hwloc")) {
+ status = HYDT_bind_hwloc_finalize();
+ HYDU_ERR_POP(status, "unable to finalize hwloc\n");
+ }
+#endif /* HAVE_HWLOC */
+
+ if (HYDT_bind_info.bindmap)
+ HYDU_FREE(HYDT_bind_info.bindmap);
+
+ if (HYDT_bind_info.bindlib)
+ HYDU_FREE(HYDT_bind_info.bindlib);
+
+ cleanup_topo_level(HYDT_bind_info.machine);
+
+ fn_exit:
+ HYDU_FUNC_EXIT();
+ return status;
+
+ fn_fail:
+ goto fn_exit;
+}
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/bind.h
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/bind.h 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/bind.h 2011-01-19 14:28:19 UTC (rev 7755)
@@ -175,7 +175,7 @@
* This function cleans up any relevant state that the binding library
* maintained.
*/
-void HYDT_bind_finalize(void);
+HYD_status HYDT_bind_finalize(void);
/**
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/bind_hwloc.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/bind_hwloc.c 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/bind_hwloc.c 2011-01-19 14:28:19 UTC (rev 7755)
@@ -294,3 +294,19 @@
fn_fail:
goto fn_exit;
}
+
+HYD_status HYDT_bind_hwloc_finalize(void)
+{
+ HYD_status status = HYD_SUCCESS;
+
+ HYDU_FUNC_ENTER();
+
+ /* Nothing to finalize for now */
+
+ fn_exit:
+ HYDU_FUNC_EXIT();
+ return status;
+
+ fn_fail:
+ goto fn_exit;
+}
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/bind_hwloc.h
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/bind_hwloc.h 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/bind_hwloc.h 2011-01-19 14:28:19 UTC (rev 7755)
@@ -12,5 +12,6 @@
HYD_status HYDT_bind_hwloc_init(HYDT_bind_support_level_t * support_level);
HYD_status HYDT_bind_hwloc_process(struct HYDT_bind_cpuset_t cpuset);
+HYD_status HYDT_bind_hwloc_finalize(void);
#endif /* BIND_HWLOC_H_INCLUDED */
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/NEWS
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/NEWS 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/NEWS 2011-01-19 14:28:19 UTC (rev 7755)
@@ -1,7 +1,7 @@
Copyright © 2009 CNRS
-Copyright © 2009-2010 INRIA
-Copyright © 2009-2010 Université Bordeaux 1
-Copyright © 2009-2010 Cisco Systems, Inc. All rights reserved.
+Copyright © 2009-2011 INRIA
+Copyright © 2009-2011 Université Bordeaux 1
+Copyright © 2009-2011 Cisco Systems, Inc. All rights reserved.
$COPYRIGHT$
@@ -16,6 +16,26 @@
0.9 (as initially released as "libtopology", then re-branded to "hwloc"
in v0.9.1).
+
+Version 1.1.1
+-------------
+* Add hwloc_get_api_version() which returns the version of hwloc used
+ at runtime.
+* Fix hwloc_bitmap_to_ulong() right after allocating the bitmap.
+* Fix hwloc_bitmap_from_ith_ulong() to properly zero the first ulong.
+* Fix hwloc_get_membind_nodeset() on Linux.
+* Fix some file descriptor leaks in the Linux discovery.
+* Fix the minimum width of NUMA nodes, caches and the legend in the graphical
+ lstopo output.
+* Various fixes to bitmap conversion from/to taskset-strings.
+* Fix and document snprintf functions behavior when the buffer size is too
+ small or zero.
+* Fix configure to avoid spurious enabling of the cpuid backend.
+* Cleanup error management in hwloc-gather-topology.sh.
+* Add a manpage and usage for hwloc-gather-topology.sh on Linux.
+* Memory binding documentation enhancements.
+
+
Version 1.1.0
-------------
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/README
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/README 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/README 2011-01-19 14:28:19 UTC (rev 7755)
@@ -23,7 +23,7 @@
hwloc supports the following operating systems:
* Linux (including old kernels not having sysfs topology information, with
- knowledge of cpusets, offline cpus, ScaleMP vSMP, and Kerrighed support)
+ knowledge of cpusets, offline CPUs, ScaleMP vSMP, and Kerrighed support)
* Solaris
* AIX
* Darwin / OS X
@@ -94,34 +94,34 @@
Here's the equivalent output in textual form:
Machine (16GB)
- Socket #0 + L3 #0 (4096KB)
- L2 #0 (1024KB) + L1 #0 (16KB) + Core #0
- PU #0 (phys=0)
- PU #1 (phys=8)
- L2 #1 (1024KB) + L1 #1 (16KB) + Core #1
- PU #2 (phys=4)
- PU #3 (phys=12)
- Socket #1 + L3 #1 (4096KB)
- L2 #2 (1024KB) + L1 #2 (16KB) + Core #2
- PU #4 (phys=1)
- PU #5 (phys=9)
- L2 #3 (1024KB) + L1 #3 (16KB) + Core #3
- PU #6 (phys=5)
- PU #7 (phys=13)
- Socket #2 + L3 #2 (4096KB)
- L2 #4 (1024KB) + L1 #4 (16KB) + Core #4
- PU #8 (phys=2)
- PU #9 (phys=10)
- L2 #5 (1024KB) + L1 #5 (16KB) + Core #5
- PU #10 (phys=6)
- PU #11 (phys=14)
- Socket #3 + L3 #3 (4096KB)
- L2 #6 (1024KB) + L1 #6 (16KB) + Core #6
- PU #12 (phys=3)
- PU #13 (phys=11)
- L2 #7 (1024KB) + L1 #7 (16KB) + Core #7
- PU #14 (phys=7)
- PU #15 (phys=15)
+ Socket L#0 + L3 L#0 (4096KB)
+ L2 L#0 (1024KB) + L1 L#0 (16KB) + Core L#0
+ PU L#0 (P#0)
+ PU L#1 (P#8)
+ L2 L#1 (1024KB) + L1 L#1 (16KB) + Core L#1
+ PU L#2 (P#4)
+ PU L#3 (P#12)
+ Socket L#1 + L3 L#1 (4096KB)
+ L2 L#2 (1024KB) + L1 L#2 (16KB) + Core L#2
+ PU L#4 (P#1)
+ PU L#5 (P#9)
+ L2 L#3 (1024KB) + L1 L#3 (16KB) + Core L#3
+ PU L#6 (P#5)
+ PU L#7 (P#13)
+ Socket L#2 + L3 L#2 (4096KB)
+ L2 L#4 (1024KB) + L1 L#4 (16KB) + Core L#4
+ PU L#8 (P#2)
+ PU L#9 (P#10)
+ L2 L#5 (1024KB) + L1 L#5 (16KB) + Core L#5
+ PU L#10 (P#6)
+ PU L#11 (P#14)
+ Socket L#3 + L3 L#3 (4096KB)
+ L2 L#6 (1024KB) + L1 L#6 (16KB) + Core L#6
+ PU L#12 (P#3)
+ PU L#13 (P#11)
+ L2 L#7 (1024KB) + L1 L#7 (16KB) + Core L#7
+ PU L#14 (P#7)
+ PU L#15 (P#15)
Finally, here's the equivalent output in XML. Long lines were artificially
broken for document clarity (in the real output, each XML tag is on a single
@@ -197,34 +197,22 @@
Here's the equivalent output in textual form:
-Machine (64GB)
- NUMANode #0 (phys=0 8190MB) + Socket #0
- L2 #0 (1024KB) + L1 #0 (64KB) + Core #0 + PU #0 (phys=0)
- L2 #1 (1024KB) + L1 #1 (64KB) + Core #1 + PU #1 (phys=1)
- NUMANode #1 (phys=1 8192MB) + Socket #1
- L2 #2 (1024KB) + L1 #2 (64KB) + Core #2 + PU #2 (phys=2)
- L2 #3 (1024KB) + L1 #3 (64KB) + Core #3 + PU #3 (phys=3)
- NUMANode #2 (phys=2 8192MB) + Socket #2
- L2 #4 (1024KB) + L1 #4 (64KB) + Core #4 + PU #4 (phys=4)
- L2 #5 (1024KB) + L1 #5 (64KB) + Core #5 + PU #5 (phys=5)
- NUMANode #3 (phys=3 8192MB) + Socket #3
- L2 #6 (1024KB) + L1 #6 (64KB) + Core #6 + PU #6 (phys=6)
- L2 #7 (1024KB) + L1 #7 (64KB) + Core #7 + PU #7 (phys=7)
- NUMANode #4 (phys=4 8192MB) + Socket #4
- L2 #8 (1024KB) + L1 #8 (64KB) + Core #8 + PU #8 (phys=8)
- L2 #9 (1024KB) + L1 #9 (64KB) + Core #9 + PU #9 (phys=9)
- NUMANode #5 (phys=5 8192MB) + Socket #5
- L2 #10 (1024KB) + L1 #10 (64KB) + Core #10 + PU #10 (phys=10)
- L2 #11 (1024KB) + L1 #11 (64KB) + Core #11 + PU #11 (phys=11)
- NUMANode #6 (phys=6 8192MB) + Socket #6
- L2 #12 (1024KB) + L1 #12 (64KB) + Core #12 + PU #12 (phys=12)
- L2 #13 (1024KB) + L1 #13 (64KB) + Core #13 + PU #13 (phys=13)
- NUMANode #7 (phys=7 8192MB) + Socket #7
- L2 #14 (1024KB) + L1 #14 (64KB) + Core #14 + PU #14 (phys=14)
- L2 #15 (1024KB) + L1 #15 (64KB) + Core #15 + PU #15 (phys=15)
+Machine (32GB)
+ NUMANode L#0 (P#0 8190MB) + Socket L#0
+ L2 L#0 (1024KB) + L1 L#0 (64KB) + Core L#0 + PU L#0 (P#0)
+ L2 L#1 (1024KB) + L1 L#1 (64KB) + Core L#1 + PU L#1 (P#1)
+ NUMANode L#1 (P#1 8192MB) + Socket L#1
+ L2 L#2 (1024KB) + L1 L#2 (64KB) + Core L#2 + PU L#2 (P#2)
+ L2 L#3 (1024KB) + L1 L#3 (64KB) + Core L#3 + PU L#3 (P#3)
+ NUMANode L#2 (P#2 8192MB) + Socket L#2
+ L2 L#4 (1024KB) + L1 L#4 (64KB) + Core L#4 + PU L#4 (P#4)
+ L2 L#5 (1024KB) + L1 L#5 (64KB) + Core L#5 + PU L#5 (P#5)
+ NUMANode L#3 (P#3 8192MB) + Socket L#3
+ L2 L#6 (1024KB) + L1 L#6 (64KB) + Core L#6 + PU L#6 (P#6)
+ L2 L#7 (1024KB) + L1 L#7 (64KB) + Core L#7 + PU L#7 (P#7)
And here's the equivalent output in XML. Similar to above, line breaks were
-added and only PU#0 is shown for brevity:
+added and only PU #0 is shown for brevity:
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE topology SYSTEM "hwloc.dtd">
@@ -280,22 +268,22 @@
Here's the same output in textual form:
Machine (16GB)
- Socket #0
- L2 #0 (4096KB)
- L1 #0 (32KB) + Core #0 + PU #0 (phys=0)
- L1 #1 (32KB) + Core #1 + PU #1 (phys=4)
- L2 #1 (4096KB)
- L1 #2 (32KB) + Core #2 + PU #2 (phys=2)
- L1 #3 (32KB) + Core #3 + PU #3 (phys=6)
- Socket #1
- L2 #2 (4096KB)
- L1 #4 (32KB) + Core #4 + PU #4 (phys=1)
- L1 #5 (32KB) + Core #5 + PU #5 (phys=5)
- L2 #3 (4096KB)
- L1 #6 (32KB) + Core #6 + PU #6 (phys=3)
- L1 #7 (32KB) + Core #7 + PU #7 (phys=7)
+ Socket L#0
+ L2 L#0 (4096KB)
+ L1 L#0 (32KB) + Core L#0 + PU L#0 (P#0)
+ L1 L#1 (32KB) + Core L#1 + PU L#1 (P#4)
+ L2 L#1 (4096KB)
+ L1 L#2 (32KB) + Core L#2 + PU L#2 (P#2)
+ L1 L#3 (32KB) + Core L#3 + PU L#3 (P#6)
+ Socket L#1
+ L2 L#2 (4096KB)
+ L1 L#4 (32KB) + Core L#4 + PU L#4 (P#1)
+ L1 L#5 (32KB) + Core L#5 + PU L#5 (P#5)
+ L2 L#3 (4096KB)
+ L1 L#6 (32KB) + Core L#6 + PU L#6 (P#3)
+ L1 L#7 (32KB) + Core L#7 + PU L#7 (P#7)
-And the same output in XML (line breaks added, only PU#0 shown):
+And the same output in XML (line breaks added, only PU #0 shown):
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE topology SYSTEM "hwloc.dtd">
@@ -357,8 +345,8 @@
hwloc offers an extensive bitmap manipulation interface in hwloc/bitmap.h.
Moreover, hwloc also comes with additional helpers for interoperability with
-several commonly used environments. See the Interoperability with other
-software section for details.
+several commonly used environments. See the Interoperability With Other
+Software section for details.
The complete API documentation is available in a full set of HTML pages, man
pages, and self-contained PDF files (formatted for both both US letter and A4
@@ -400,10 +388,10 @@
ppc64-without-smt.png
-Notice that hwloc only sees half the PUs when SMT is disabled. PU#15, for
+Notice that hwloc only sees half the PUs when SMT is disabled. PU #15, for
example, seems to change location from NUMA node #0 to #1. In reality, no PUs
"moved" -- they were simply re-numbered when hwloc only saw half as many.
-Hence, PU#15 in the SMT-disabled picture probably corresponds to PU#30 in the
+Hence, PU #15 in the SMT-disabled picture probably corresponds to PU #30 in the
SMT-enabled picture.
This same "PUs have disappeared" effect can be seen on other platforms -- even
@@ -477,7 +465,7 @@
hwloc_topology_init(&topology);
/* ... Optionally, put detection configuration here to ignore
- some objects types, define a synthetic topology, etc....
+ some objects types, define a synthetic topology, etc....
The default is to detect all the objects of the machine that
the caller is allowed to access. See Configure Topology
@@ -589,7 +577,7 @@
obj = hwloc_get_obj_by_type(topology, HWLOC_OBJ_NODE, n - 1);
m = hwloc_alloc_membind_nodeset(topology, size, obj->nodeset,
HWLOC_MEMBIND_DEFAULT, 0);
- hwloc_free_membind(topology, m, size);
+ hwloc_free(topology, m, size);
m = malloc(size);
hwloc_set_area_membind_nodeset(topology, m, size, obj->nodeset,
@@ -683,17 +671,18 @@
The documentation chapters include
* Terms and Definitions
- * Command-line tools
- * Environment variables
- * CPU Binding and Memory Binding
- * Interoperability with other software
- * Thread safety
- * Embedding hwloc in other software
+ * Command-Line Tools
+ * Environment Variables
+ * CPU and Memory Binding Overview
+ * Interoperability With Other Software
+ * Thread Safety
+ * Embedding hwloc in Other Software
* Switching from PLPA to hwloc
+ * Frequently Asked Questions
Make sure to have had a look at those too!
-------------------------------------------------------------------------------
-Generated on Tue Nov 30 2010 15:55:46 for Hardware Locality (hwloc) by doxygen
-1.7.1
+Generated on Tue Jan 18 2011 19:19:59 for Hardware Locality (hwloc) by doxygen
+1.7.2
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/VERSION
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/VERSION 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/VERSION 2011-01-19 14:28:19 UTC (rev 7755)
@@ -7,7 +7,7 @@
major=1
minor=1
-release=0
+release=1
# greek is used for alpha or beta release tags. If it is non-empty,
# it will be appended to the version number. It does not have to be
@@ -16,7 +16,7 @@
# requirement is that it must be entirely printable ASCII characters
# and have no white space.
-greek=rc6
+greek=rc1
# If want_svn=1, then the SVN r number will be included in the overall
# hwloc version number in some form.
@@ -50,4 +50,4 @@
# 2. Version numbers are described in the Libtool current:revision:age
# format.
-libhwloc_so_version=1:0:1
+libhwloc_so_version=2:0:2
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc.m4
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc.m4 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc.m4 2011-01-19 14:28:19 UTC (rev 7755)
@@ -1,7 +1,7 @@
dnl -*- Autoconf -*-
dnl
-dnl Copyright (c) 2009 INRIA
-dnl Copyright (c) 2009 Université Bordeaux 1
+dnl Copyright (c) 2009-2010 INRIA
+dnl Copyright (c) 2009-2011 Université Bordeaux 1
dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
dnl University Research and Technology
dnl Corporation. All rights reserved.
@@ -9,8 +9,6 @@
dnl All rights reserved.
dnl Copyright (c) 2004-2008 High Performance Computing Center Stuttgart,
dnl University of Stuttgart. All rights reserved.
-dnl Copyright © 2010 INRIA
-dnl Copyright © 2010 Université of Bordeaux
dnl Copyright © 2006-2010 Cisco Systems, Inc. All rights reserved.
# Main hwloc m4 macro, to be invoked by the user
@@ -584,7 +582,7 @@
AC_MSG_CHECKING([for cpuid])
old_CPPFLAGS="$CPPFLAGS"
CFLAGS="$CFLAGS -I$HWLOC_top_srcdir/include"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <stdio.h>
#include <private/cpuid.h>
]], [[
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/doc/Makefile.am
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/doc/Makefile.am 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/doc/Makefile.am 2011-01-19 14:28:19 UTC (rev 7755)
@@ -108,34 +108,48 @@
$(DOX_TAG): $(BUILT_SOURCES) $(dox_inputs) $(PREBUILT_IMAGES)
rm -fr $(DOX_DIR)
$(DOXYGEN) $(DOX_CONFIG)
- -sed -i \
- -e 's/__hwloc_restrict/restrict/g' \
- -e 's/\\_\\-\\_\\-hwloc\\_\\-restrict/restrict/g' \
- -e 's/__hwloc_attribute_unused//g' \
- -e 's/\\_\\-\\_\\-hwloc\\_\\-attribute\\_\\-unused//g' \
- -e 's/__hwloc_attribute_malloc//g' \
- -e 's/\\_\\-\\_\\-hwloc\\_\\-attribute\\_\\-malloc//g' \
- -e 's/__hwloc_attribute_const//g' \
- -e 's/\\_\\-\\_\\-hwloc\\_\\-attribute\\_\\-const//g' \
- -e 's/__hwloc_attribute_pure//g' \
- -e 's/\\_\\-\\_\\-hwloc\\_\\-attribute\\_\\-pure//g' \
- -e 's/__hwloc_attribute_deprecated//g' \
- -e 's/\\_\\-\\_\\-hwloc\\_\\-attribute\\_\\-deprecated//g' \
- -e 's/HWLOC_DECLSPEC//g' \
- -e 's/HWLOC\\_\\-DECLSPEC//g' \
- -e 's/__hwloc_inline/inline/g' \
- -e 's/\\_\\-\\_\\-hwloc\\_\\-inline/inline/g' \
+ -sed -i -e 's/__hwloc_restrict/restrict/g' \
$(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
+ -sed -i -e 's/\\_\\-\\_\\-hwloc\\_\\-restrict/restrict/g' \
+ $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
+ -sed -i -e 's/__hwloc_attribute_unused//g' \
+ $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
+ -sed -i -e 's/\\_\\-\\_\\-hwloc\\_\\-attribute\\_\\-unused//g' \
+ $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
+ -sed -i -e 's/__hwloc_attribute_malloc//g' \
+ $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
+ -sed -i -e 's/\\_\\-\\_\\-hwloc\\_\\-attribute\\_\\-malloc//g' \
+ $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
+ -sed -i -e 's/__hwloc_attribute_const//g' \
+ $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
+ -sed -i -e 's/\\_\\-\\_\\-hwloc\\_\\-attribute\\_\\-const//g' \
+ $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
+ -sed -i -e 's/__hwloc_attribute_pure//g' \
+ $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
+ -sed -i -e 's/\\_\\-\\_\\-hwloc\\_\\-attribute\\_\\-pure//g' \
+ $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
+ -sed -i -e 's/__hwloc_attribute_deprecated//g' \
+ $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
+ -sed -i -e 's/\\_\\-\\_\\-hwloc\\_\\-attribute\\_\\-deprecated//g' \
+ $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
+ -sed -i -e 's/HWLOC_DECLSPEC//g' \
+ $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
+ -sed -i -e 's/HWLOC\\_\\-DECLSPEC//g' \
+ $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
+ -sed -i -e 's/__hwloc_inline/inline/g' \
+ $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
+ -sed -i -e 's/\\_\\-\\_\\-hwloc\\_\\-inline/inline/g' \
+ $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
@echo "Work-around spurious leading _ in doxygen filenames..."
- (cd $(DOX_DIR)/man/man3 ; \
+ -(cd $(DOX_DIR)/man/man3 ; \
for i in _hwloc* ; do \
[ ! -f $$i ] || mv $$i $${i#_} ; \
done)
@echo "Removing useless manpages..."
@mkdir $(DOX_DIR)/man.tmp
- @mv $(man3_MANS) $(DOX_DIR)/man.tmp/
- @rm -rf $(DOX_DIR)/man/man3
- @mv $(DOX_DIR)/man.tmp $(DOX_DIR)/man/man3
+ @mv $(DOX_MAN_DIR)/man3/hwloc* $(DOX_MAN_DIR)/man3/HWLOC* $(DOX_DIR)/man.tmp/
+ @rm -rf $(DOX_MAN_DIR)/man3
+ @mv $(DOX_DIR)/man.tmp $(DOX_MAN_DIR)/man3
if HWLOC_DOXYGEN_BROKEN_SHORT_NAMES
@echo "Work-around buggy doxygen filenames..."
- at mv -f $(DOX_DIR)/html/termsanddefs.html $(DOX_DIR)/html/a00001.html
@@ -238,45 +252,60 @@
if HWLOC_INSTALL_DOXYGEN
man3_MANS = \
+ $(DOX_MAN_DIR)/man3/HWLOC_API_VERSION.3 \
+ $(DOX_MAN_DIR)/man3/HWLOC_CPUBIND_NOMEMBIND.3 \
$(DOX_MAN_DIR)/man3/HWLOC_CPUBIND_PROCESS.3 \
$(DOX_MAN_DIR)/man3/HWLOC_CPUBIND_STRICT.3 \
$(DOX_MAN_DIR)/man3/HWLOC_CPUBIND_THREAD.3 \
+ $(DOX_MAN_DIR)/man3/HWLOC_MEMBIND_BIND.3 \
+ $(DOX_MAN_DIR)/man3/HWLOC_MEMBIND_DEFAULT.3 \
+ $(DOX_MAN_DIR)/man3/HWLOC_MEMBIND_FIRSTTOUCH.3 \
+ $(DOX_MAN_DIR)/man3/HWLOC_MEMBIND_INTERLEAVE.3 \
+ $(DOX_MAN_DIR)/man3/HWLOC_MEMBIND_MIGRATE.3 \
+ $(DOX_MAN_DIR)/man3/HWLOC_MEMBIND_MIXED.3 \
+ $(DOX_MAN_DIR)/man3/HWLOC_MEMBIND_NEXTTOUCH.3 \
+ $(DOX_MAN_DIR)/man3/HWLOC_MEMBIND_NOCPUBIND.3 \
+ $(DOX_MAN_DIR)/man3/HWLOC_MEMBIND_PROCESS.3 \
+ $(DOX_MAN_DIR)/man3/HWLOC_MEMBIND_REPLICATE.3 \
+ $(DOX_MAN_DIR)/man3/HWLOC_MEMBIND_STRICT.3 \
+ $(DOX_MAN_DIR)/man3/HWLOC_MEMBIND_THREAD.3 \
$(DOX_MAN_DIR)/man3/HWLOC_OBJ_CACHE.3 \
$(DOX_MAN_DIR)/man3/HWLOC_OBJ_CORE.3 \
+ $(DOX_MAN_DIR)/man3/HWLOC_OBJ_GROUP.3 \
$(DOX_MAN_DIR)/man3/HWLOC_OBJ_MACHINE.3 \
$(DOX_MAN_DIR)/man3/HWLOC_OBJ_MISC.3 \
- $(DOX_MAN_DIR)/man3/HWLOC_OBJ_GROUP.3 \
$(DOX_MAN_DIR)/man3/HWLOC_OBJ_NODE.3 \
$(DOX_MAN_DIR)/man3/HWLOC_OBJ_PU.3 \
$(DOX_MAN_DIR)/man3/HWLOC_OBJ_SOCKET.3 \
$(DOX_MAN_DIR)/man3/HWLOC_OBJ_SYSTEM.3 \
+ $(DOX_MAN_DIR)/man3/HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM.3 \
$(DOX_MAN_DIR)/man3/HWLOC_TOPOLOGY_FLAG_WHOLE_SYSTEM.3 \
- $(DOX_MAN_DIR)/man3/HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM.3 \
$(DOX_MAN_DIR)/man3/HWLOC_TYPE_DEPTH_MULTIPLE.3 \
$(DOX_MAN_DIR)/man3/HWLOC_TYPE_DEPTH_UNKNOWN.3 \
- $(DOX_MAN_DIR)/man3/hwloc_compare_types.3 \
- $(DOX_MAN_DIR)/man3/hwloc_cpubind_flags_t.3 \
- $(DOX_MAN_DIR)/man3/hwloc_membind_flags_t.3 \
- $(DOX_MAN_DIR)/man3/hwloc_membind_policy_t.3 \
+ $(DOX_MAN_DIR)/man3/HWLOC_TYPE_UNORDERED.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_alloc.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_alloc_membind.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_alloc_membind_nodeset.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_alloc_membind_policy.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_alloc_membind_policy_nodeset.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_bitmap_allbut.3 \
$(DOX_MAN_DIR)/man3/hwloc_bitmap_alloc.3 \
$(DOX_MAN_DIR)/man3/hwloc_bitmap_alloc_full.3 \
- $(DOX_MAN_DIR)/man3/hwloc_bitmap_free.3 \
- $(DOX_MAN_DIR)/man3/hwloc_bitmap_dup.3 \
- $(DOX_MAN_DIR)/man3/hwloc_bitmap_copy.3 \
- $(DOX_MAN_DIR)/man3/hwloc_bitmap_allbut.3 \
$(DOX_MAN_DIR)/man3/hwloc_bitmap_and.3 \
$(DOX_MAN_DIR)/man3/hwloc_bitmap_andnot.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_bitmap_asprintf.3 \
$(DOX_MAN_DIR)/man3/hwloc_bitmap_clr.3 \
$(DOX_MAN_DIR)/man3/hwloc_bitmap_clr_range.3 \
$(DOX_MAN_DIR)/man3/hwloc_bitmap_compare.3 \
$(DOX_MAN_DIR)/man3/hwloc_bitmap_compare_first.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_bitmap_copy.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_bitmap_dup.3 \
$(DOX_MAN_DIR)/man3/hwloc_bitmap_fill.3 \
$(DOX_MAN_DIR)/man3/hwloc_bitmap_first.3 \
$(DOX_MAN_DIR)/man3/hwloc_bitmap_foreach_begin.3 \
$(DOX_MAN_DIR)/man3/hwloc_bitmap_foreach_end.3 \
- $(DOX_MAN_DIR)/man3/hwloc_cpuset_from_glibc_sched_affinity.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_bitmap_free.3 \
$(DOX_MAN_DIR)/man3/hwloc_bitmap_from_ith_ulong.3 \
- $(DOX_MAN_DIR)/man3/hwloc_bitmap_sscanf.3 \
$(DOX_MAN_DIR)/man3/hwloc_bitmap_from_ulong.3 \
$(DOX_MAN_DIR)/man3/hwloc_bitmap_intersects.3 \
$(DOX_MAN_DIR)/man3/hwloc_bitmap_isequal.3 \
@@ -290,136 +319,154 @@
$(DOX_MAN_DIR)/man3/hwloc_bitmap_only.3 \
$(DOX_MAN_DIR)/man3/hwloc_bitmap_or.3 \
$(DOX_MAN_DIR)/man3/hwloc_bitmap_set.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_bitmap_set_ith_ulong.3 \
$(DOX_MAN_DIR)/man3/hwloc_bitmap_set_range.3 \
- $(DOX_MAN_DIR)/man3/hwloc_bitmap_set_ith_ulong.3 \
$(DOX_MAN_DIR)/man3/hwloc_bitmap_singlify.3 \
$(DOX_MAN_DIR)/man3/hwloc_bitmap_snprintf.3 \
- $(DOX_MAN_DIR)/man3/hwloc_bitmap_asprintf.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_bitmap_sscanf.3 \
$(DOX_MAN_DIR)/man3/hwloc_bitmap_t.3 \
- $(DOX_MAN_DIR)/man3/hwloc_cpuset_to_nodeset.3 \
- $(DOX_MAN_DIR)/man3/hwloc_cpuset_to_nodeset_strict.3 \
- $(DOX_MAN_DIR)/man3/hwloc_cpuset_from_nodeset.3 \
- $(DOX_MAN_DIR)/man3/hwloc_cpuset_from_nodeset_strict.3 \
- $(DOX_MAN_DIR)/man3/hwloc_cpuset_to_glibc_sched_affinity.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_bitmap_taskset_asprintf.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_bitmap_taskset_snprintf.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_bitmap_taskset_sscanf.3 \
$(DOX_MAN_DIR)/man3/hwloc_bitmap_to_ith_ulong.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_bitmap_to_ulong.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_bitmap_weight.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_bitmap_xor.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_bitmap_zero.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_compare_types.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_compare_types_e.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_const_bitmap_t.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_const_cpuset_t.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_const_nodeset_t.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_cpubind_flags_t.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_cpuset_from_glibc_sched_affinity.3 \
$(DOX_MAN_DIR)/man3/hwloc_cpuset_from_linux_libnuma_bitmask.3 \
$(DOX_MAN_DIR)/man3/hwloc_cpuset_from_linux_libnuma_nodemask.3 \
$(DOX_MAN_DIR)/man3/hwloc_cpuset_from_linux_libnuma_ulongs.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_cpuset_from_nodeset.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_cpuset_from_nodeset_strict.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_cpuset_t.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_cpuset_to_glibc_sched_affinity.3 \
$(DOX_MAN_DIR)/man3/hwloc_cpuset_to_linux_libnuma_bitmask.3 \
$(DOX_MAN_DIR)/man3/hwloc_cpuset_to_linux_libnuma_nodemask.3 \
$(DOX_MAN_DIR)/man3/hwloc_cpuset_to_linux_libnuma_ulongs.3 \
- $(DOX_MAN_DIR)/man3/hwloc_nodeset_from_linux_libnuma_bitmask.3 \
- $(DOX_MAN_DIR)/man3/hwloc_nodeset_from_linux_libnuma_nodemask.3 \
- $(DOX_MAN_DIR)/man3/hwloc_nodeset_from_linux_libnuma_ulongs.3 \
- $(DOX_MAN_DIR)/man3/hwloc_nodeset_to_linux_libnuma_bitmask.3 \
- $(DOX_MAN_DIR)/man3/hwloc_nodeset_to_linux_libnuma_nodemask.3 \
- $(DOX_MAN_DIR)/man3/hwloc_nodeset_to_linux_libnuma_ulongs.3 \
- $(DOX_MAN_DIR)/man3/hwloc_bitmap_to_ulong.3 \
- $(DOX_MAN_DIR)/man3/hwloc_bitmap_weight.3 \
- $(DOX_MAN_DIR)/man3/hwloc_bitmap_xor.3 \
- $(DOX_MAN_DIR)/man3/hwloc_cpuset_t.3 \
- $(DOX_MAN_DIR)/man3/hwloc_const_cpuset_t.3 \
- $(DOX_MAN_DIR)/man3/hwloc_nodeset_t.3 \
- $(DOX_MAN_DIR)/man3/hwloc_const_nodeset_t.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_cpuset_to_nodeset.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_cpuset_to_nodeset_strict.3 \
$(DOX_MAN_DIR)/man3/hwloc_cuda_get_device_cpuset.3 \
$(DOX_MAN_DIR)/man3/hwloc_cudart_get_device_cpuset.3 \
$(DOX_MAN_DIR)/man3/hwloc_distribute.3 \
$(DOX_MAN_DIR)/man3/hwloc_distributev.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_free.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_ancestor_obj_by_depth.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_ancestor_obj_by_type.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_api_version.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_area_membind.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_area_membind_nodeset.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_cache_covering_cpuset.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_child_covering_cpuset.3 \
$(DOX_MAN_DIR)/man3/hwloc_get_closest_objs.3 \
$(DOX_MAN_DIR)/man3/hwloc_get_common_ancestor_obj.3 \
- $(DOX_MAN_DIR)/man3/hwloc_get_cache_covering_cpuset.3 \
- $(DOX_MAN_DIR)/man3/hwloc_get_child_covering_cpuset.3 \
- $(DOX_MAN_DIR)/man3/hwloc_get_obj_covering_cpuset.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_cpubind.3 \
$(DOX_MAN_DIR)/man3/hwloc_get_depth_type.3 \
- $(DOX_MAN_DIR)/man3/hwloc_topology_get_allowed_cpuset.3 \
- $(DOX_MAN_DIR)/man3/hwloc_topology_get_complete_cpuset.3 \
- $(DOX_MAN_DIR)/man3/hwloc_topology_get_online_cpuset.3 \
- $(DOX_MAN_DIR)/man3/hwloc_topology_get_topology_cpuset.3 \
$(DOX_MAN_DIR)/man3/hwloc_get_first_largest_obj_inside_cpuset.3 \
$(DOX_MAN_DIR)/man3/hwloc_get_largest_objs_inside_cpuset.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_membind.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_membind_nodeset.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_nbobjs_by_depth.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_nbobjs_by_type.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_nbobjs_inside_cpuset_by_depth.3 \
$(DOX_MAN_DIR)/man3/hwloc_get_nbobjs_inside_cpuset_by_type.3 \
- $(DOX_MAN_DIR)/man3/hwloc_get_nbobjs_inside_cpuset_by_depth.3 \
$(DOX_MAN_DIR)/man3/hwloc_get_next_child.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_next_obj_by_depth.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_next_obj_by_type.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_next_obj_covering_cpuset_by_depth.3 \
$(DOX_MAN_DIR)/man3/hwloc_get_next_obj_covering_cpuset_by_type.3 \
- $(DOX_MAN_DIR)/man3/hwloc_get_next_obj_covering_cpuset_by_depth.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_next_obj_inside_cpuset_by_depth.3 \
$(DOX_MAN_DIR)/man3/hwloc_get_next_obj_inside_cpuset_by_type.3 \
- $(DOX_MAN_DIR)/man3/hwloc_get_next_obj_inside_cpuset_by_depth.3 \
- $(DOX_MAN_DIR)/man3/hwloc_get_next_obj_by_type.3 \
- $(DOX_MAN_DIR)/man3/hwloc_get_next_obj_by_depth.3 \
- $(DOX_MAN_DIR)/man3/hwloc_get_pu_obj_by_os_index.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_obj_below_array_by_type.3 \
$(DOX_MAN_DIR)/man3/hwloc_get_obj_below_by_type.3 \
- $(DOX_MAN_DIR)/man3/hwloc_get_obj_below_array_by_type.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_obj_by_depth.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_obj_by_type.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_obj_covering_cpuset.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_obj_inside_cpuset_by_depth.3 \
$(DOX_MAN_DIR)/man3/hwloc_get_obj_inside_cpuset_by_type.3 \
- $(DOX_MAN_DIR)/man3/hwloc_get_obj_inside_cpuset_by_depth.3 \
- $(DOX_MAN_DIR)/man3/hwloc_get_obj_by_type.3 \
- $(DOX_MAN_DIR)/man3/hwloc_get_obj_by_depth.3 \
- $(DOX_MAN_DIR)/man3/hwloc_get_ancestor_obj_by_type.3 \
- $(DOX_MAN_DIR)/man3/hwloc_get_ancestor_obj_by_depth.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_proc_cpubind.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_proc_membind.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_proc_membind_nodeset.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_pu_obj_by_os_index.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_root_obj.3 \
$(DOX_MAN_DIR)/man3/hwloc_get_shared_cache_covering_obj.3 \
- $(DOX_MAN_DIR)/man3/hwloc_get_root_obj.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_thread_cpubind.3 \
$(DOX_MAN_DIR)/man3/hwloc_get_type_depth.3 \
- $(DOX_MAN_DIR)/man3/hwloc_get_nbobjs_by_type.3 \
- $(DOX_MAN_DIR)/man3/hwloc_get_nbobjs_by_depth.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_get_type_depth_e.3 \
$(DOX_MAN_DIR)/man3/hwloc_get_type_or_above_depth.3 \
$(DOX_MAN_DIR)/man3/hwloc_get_type_or_below_depth.3 \
$(DOX_MAN_DIR)/man3/hwloc_ibv_get_device_cpuset.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_linux_get_tid_cpubind.3 \
$(DOX_MAN_DIR)/man3/hwloc_linux_parse_cpumap_file.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_linux_set_tid_cpubind.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_membind_flags_t.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_membind_policy_t.3 \
$(DOX_MAN_DIR)/man3/hwloc_mx_board_get_device_cpuset.3 \
$(DOX_MAN_DIR)/man3/hwloc_mx_endpoint_get_device_cpuset.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_nodeset_from_linux_libnuma_bitmask.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_nodeset_from_linux_libnuma_nodemask.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_nodeset_from_linux_libnuma_ulongs.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_nodeset_t.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_nodeset_to_linux_libnuma_bitmask.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_nodeset_to_linux_libnuma_nodemask.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_nodeset_to_linux_libnuma_ulongs.3 \
$(DOX_MAN_DIR)/man3/hwloc_obj.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_obj_attr_snprintf.3 \
$(DOX_MAN_DIR)/man3/hwloc_obj_attr_u.3 \
$(DOX_MAN_DIR)/man3/hwloc_obj_attr_u_hwloc_cache_attr_s.3 \
$(DOX_MAN_DIR)/man3/hwloc_obj_attr_u_hwloc_group_attr_s.3 \
- $(DOX_MAN_DIR)/man3/hwloc_obj_memory_s.3 \
$(DOX_MAN_DIR)/man3/hwloc_obj_cpuset_snprintf.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_obj_get_info_by_name.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_obj_info_s.3 \
$(DOX_MAN_DIR)/man3/hwloc_obj_is_in_subtree.3 \
- $(DOX_MAN_DIR)/man3/hwloc_obj_type_snprintf.3 \
- $(DOX_MAN_DIR)/man3/hwloc_obj_attr_snprintf.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_obj_memory_s.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_obj_memory_s_hwloc_obj_memory_page_type_s.3 \
$(DOX_MAN_DIR)/man3/hwloc_obj_snprintf.3 \
$(DOX_MAN_DIR)/man3/hwloc_obj_t.3 \
$(DOX_MAN_DIR)/man3/hwloc_obj_type_of_string.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_obj_type_snprintf.3 \
$(DOX_MAN_DIR)/man3/hwloc_obj_type_string.3 \
$(DOX_MAN_DIR)/man3/hwloc_obj_type_t.3 \
- $(DOX_MAN_DIR)/man3/hwloc_obj_get_info_by_name.3 \
- $(DOX_MAN_DIR)/man3/hwloc_get_cpubind.3 \
- $(DOX_MAN_DIR)/man3/hwloc_get_proc_cpubind.3 \
- $(DOX_MAN_DIR)/man3/hwloc_get_thread_cpubind.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_set_area_membind.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_set_area_membind_nodeset.3 \
$(DOX_MAN_DIR)/man3/hwloc_set_cpubind.3 \
- $(DOX_MAN_DIR)/man3/hwloc_set_proc_cpubind.3 \
- $(DOX_MAN_DIR)/man3/hwloc_set_thread_cpubind.3 \
- $(DOX_MAN_DIR)/man3/hwloc_alloc.3 \
- $(DOX_MAN_DIR)/man3/hwloc_alloc_membind.3 \
- $(DOX_MAN_DIR)/man3/hwloc_alloc_membind_policy.3 \
- $(DOX_MAN_DIR)/man3/hwloc_alloc_membind_nodeset.3 \
- $(DOX_MAN_DIR)/man3/hwloc_alloc_membind_policy_nodeset.3 \
- $(DOX_MAN_DIR)/man3/hwloc_free.3 \
- $(DOX_MAN_DIR)/man3/hwloc_get_membind.3 \
- $(DOX_MAN_DIR)/man3/hwloc_get_membind_nodeset.3 \
$(DOX_MAN_DIR)/man3/hwloc_set_membind.3 \
$(DOX_MAN_DIR)/man3/hwloc_set_membind_nodeset.3 \
- $(DOX_MAN_DIR)/man3/hwloc_get_area_membind.3 \
- $(DOX_MAN_DIR)/man3/hwloc_get_area_membind_nodeset.3 \
- $(DOX_MAN_DIR)/man3/hwloc_set_area_membind.3 \
- $(DOX_MAN_DIR)/man3/hwloc_set_area_membind_nodeset.3 \
- $(DOX_MAN_DIR)/man3/hwloc_get_proc_membind.3 \
- $(DOX_MAN_DIR)/man3/hwloc_get_proc_membind_nodeset.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_set_proc_cpubind.3 \
$(DOX_MAN_DIR)/man3/hwloc_set_proc_membind.3 \
$(DOX_MAN_DIR)/man3/hwloc_set_proc_membind_nodeset.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_set_thread_cpubind.3 \
$(DOX_MAN_DIR)/man3/hwloc_topology_check.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_topology_cpubind_support.3 \
$(DOX_MAN_DIR)/man3/hwloc_topology_destroy.3 \
- $(DOX_MAN_DIR)/man3/hwloc_topology_export_xml.3 \
- $(DOX_MAN_DIR)/man3/hwloc_topology_export_xmlbuffer.3 \
- $(DOX_MAN_DIR)/man3/hwloc_topology_insert_misc_object_by_cpuset.3 \
- $(DOX_MAN_DIR)/man3/hwloc_topology_insert_misc_object_by_parent.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_topology_discovery_support.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_topology_export_xml.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_topology_export_xmlbuffer.3 \
$(DOX_MAN_DIR)/man3/hwloc_topology_flags_e.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_topology_get_allowed_cpuset.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_topology_get_allowed_nodeset.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_topology_get_complete_cpuset.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_topology_get_complete_nodeset.3 \
$(DOX_MAN_DIR)/man3/hwloc_topology_get_depth.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_topology_get_online_cpuset.3 \
$(DOX_MAN_DIR)/man3/hwloc_topology_get_support.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_topology_get_topology_cpuset.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_topology_get_topology_nodeset.3 \
$(DOX_MAN_DIR)/man3/hwloc_topology_ignore_all_keep_structure.3 \
$(DOX_MAN_DIR)/man3/hwloc_topology_ignore_type.3 \
$(DOX_MAN_DIR)/man3/hwloc_topology_ignore_type_keep_structure.3 \
$(DOX_MAN_DIR)/man3/hwloc_topology_init.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_topology_insert_misc_object_by_cpuset.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_topology_insert_misc_object_by_parent.3 \
$(DOX_MAN_DIR)/man3/hwloc_topology_is_thissystem.3 \
$(DOX_MAN_DIR)/man3/hwloc_topology_load.3 \
+ $(DOX_MAN_DIR)/man3/hwloc_topology_membind_support.3 \
$(DOX_MAN_DIR)/man3/hwloc_topology_set_flags.3 \
$(DOX_MAN_DIR)/man3/hwloc_topology_set_fsroot.3 \
$(DOX_MAN_DIR)/man3/hwloc_topology_set_pid.3 \
@@ -427,14 +474,12 @@
$(DOX_MAN_DIR)/man3/hwloc_topology_set_xml.3 \
$(DOX_MAN_DIR)/man3/hwloc_topology_set_xmlbuffer.3 \
$(DOX_MAN_DIR)/man3/hwloc_topology_support.3 \
- $(DOX_MAN_DIR)/man3/hwloc_topology_discovery_support.3 \
- $(DOX_MAN_DIR)/man3/hwloc_topology_cpubind_support.3 \
$(DOX_MAN_DIR)/man3/hwloc_topology_t.3 \
- $(DOX_MAN_DIR)/man3/hwlocality_cpubinding.3 \
- $(DOX_MAN_DIR)/man3/hwlocality_membinding.3 \
+ $(DOX_MAN_DIR)/man3/hwlocality_api_version.3 \
$(DOX_MAN_DIR)/man3/hwlocality_bitmap.3 \
$(DOX_MAN_DIR)/man3/hwlocality_configuration.3 \
$(DOX_MAN_DIR)/man3/hwlocality_conversion.3 \
+ $(DOX_MAN_DIR)/man3/hwlocality_cpubinding.3 \
$(DOX_MAN_DIR)/man3/hwlocality_creation.3 \
$(DOX_MAN_DIR)/man3/hwlocality_cuda.3 \
$(DOX_MAN_DIR)/man3/hwlocality_cudart.3 \
@@ -446,16 +491,22 @@
$(DOX_MAN_DIR)/man3/hwlocality_helper_find_coverings.3 \
$(DOX_MAN_DIR)/man3/hwlocality_helper_find_inside.3 \
$(DOX_MAN_DIR)/man3/hwlocality_helper_nodeset.3 \
+ $(DOX_MAN_DIR)/man3/hwlocality_helper_nodeset_convert.3 \
$(DOX_MAN_DIR)/man3/hwlocality_helper_traversal.3 \
$(DOX_MAN_DIR)/man3/hwlocality_helper_traversal_basic.3 \
$(DOX_MAN_DIR)/man3/hwlocality_helper_types.3 \
$(DOX_MAN_DIR)/man3/hwlocality_information.3 \
+ $(DOX_MAN_DIR)/man3/hwlocality_linux.3 \
$(DOX_MAN_DIR)/man3/hwlocality_linux_libnuma_bitmask.3 \
$(DOX_MAN_DIR)/man3/hwlocality_linux_libnuma_nodemask.3 \
$(DOX_MAN_DIR)/man3/hwlocality_linux_libnuma_ulongs.3 \
- $(DOX_MAN_DIR)/man3/hwlocality_openfabrics.3 \
+ $(DOX_MAN_DIR)/man3/hwlocality_membinding.3 \
$(DOX_MAN_DIR)/man3/hwlocality_myriexpress.3 \
$(DOX_MAN_DIR)/man3/hwlocality_objects.3 \
+ $(DOX_MAN_DIR)/man3/hwlocality_openfabrics.3 \
+ $(DOX_MAN_DIR)/man3/hwlocality_sets.3 \
+ $(DOX_MAN_DIR)/man3/hwlocality_tinker.3 \
+ $(DOX_MAN_DIR)/man3/hwlocality_topology.3 \
$(DOX_MAN_DIR)/man3/hwlocality_traversal.3 \
$(DOX_MAN_DIR)/man3/hwlocality_types.3
endif
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/doc/doxygen.cfg
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/doc/doxygen.cfg 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/doc/doxygen.cfg 2011-01-19 14:28:19 UTC (rev 7755)
@@ -83,7 +83,7 @@
# the file and class documentation (similar to JavaDoc).
# Set to NO to disable this.
-BRIEF_MEMBER_DESC = YES
+BRIEF_MEMBER_DESC = NO
# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
# the brief description of a member or function before the detailed description.
@@ -1004,7 +1004,7 @@
# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
# invoked. If left blank `latex' will be used as the default command name.
-LATEX_CMD_NAME = latex
+LATEX_CMD_NAME = pdflatex
# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
# generate index for LaTeX. If left blank `makeindex' will be used as the
@@ -1027,7 +1027,7 @@
# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
# packages that should be included in the LaTeX output.
-EXTRA_PACKAGES =
+EXTRA_PACKAGES = times
# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
# the generated latex document. The header should contain everything until
@@ -1064,7 +1064,7 @@
# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER.
-LATEX_SOURCE_CODE = NO
+LATEX_SOURCE_CODE = YES
#---------------------------------------------------------------------------
# configuration options related to the RTF output
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/doc/hwloc.doxy
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/doc/hwloc.doxy 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/doc/hwloc.doxy 2011-01-19 14:28:19 UTC (rev 7755)
@@ -1,8 +1,8 @@
/*
* Copyright © 2009 CNRS
* Copyright © 2009-2010 INRIA
- * Copyright © 2009-2010 Université Bordeaux 1
- * Copyright © 2009-2010 Cisco Systems, Inc. All rights reserved.
+ * Copyright © 2009-2011 Université Bordeaux 1
+ * Copyright © 2009-2011 Cisco Systems, Inc. All rights reserved.
* See COPYING in top-level directory.
*/
@@ -43,7 +43,7 @@
<ul>
<li>Linux (including old kernels not having sysfs topology
-information, with knowledge of cpusets, offline cpus, ScaleMP vSMP,
+information, with knowledge of cpusets, offline CPUs, ScaleMP vSMP,
and Kerrighed support)</li>
<li>Solaris</li>
<li>AIX</li>
@@ -707,7 +707,7 @@
-\page tools Command-line tools
+\page tools Command-Line Tools
hwloc comes with an extensive C programming interface and several
command line utilities. Each of them is fully documented in its own
@@ -769,7 +769,7 @@
-\page envvar Environment variables
+\page envvar Environment Variables
The behavior of the hwloc library and tools may be tuned thanks to the
following environment variables.
@@ -815,46 +815,64 @@
-\page cpu_mem_bind CPU Binding and Memory Binding
+\page cpu_mem_bind CPU and Memory Binding Overview
-Some OSes do not systematically provide separate functions for CPU and Memory
-binding. This means that CPU binding functions may have have effects on the
-memory binding policy, and changing the memory binding policy may change the CPU
-binding of the current thread. This is often not a problem for the application,
-so by default hwloc will make use of these functions when they provide better
-binding support.
+Some operating systems do not systematically provide separate
+functions for CPU and memory binding. This means that CPU binding
+functions may have have effects on the memory binding policy.
+Likewise, changing the memory binding policy may change the CPU
+binding of the current thread. This is often not a problem for
+applications, so by default hwloc will make use of these functions
+when they provide better binding support.
-If the application does not want any CPU binding change when changing the
-memory policy, it needs to use the HWLOC_MEMBIND_NOCPUBIND flag to prevent
-hwloc from using OS functions which would change the CPU binding. Conversely,
-HWLOC_CPUBIND_NOMEMBIND can be passed to cpu binding function to prevent hwloc
-form using OS functions woudl change the memory binding policy. Of course, this
-will thus reduce hwloc's support for binding, so their use is discouraged.
+If the application does not want the CPU binding to change when
+changing the memory policy, it needs to use the
+HWLOC_MEMBIND_NOCPUBIND flag to prevent hwloc from using OS functions
+which would change the CPU binding. Additionally,
+HWLOC_CPUBIND_NOMEMBIND can be passed to CPU binding function to
+prevent hwloc from using OS functions would change the memory binding
+policy. Of course, using these flags will reduce hwloc's overall support for
+binding, so their use is discouraged.
-One can however avoid using these flags but still closely control both memory
-and CPU binding, by allocating memory and touching it, and then changing the
-CPU binding. The already-really-allocated memory will not be migrated, thus
-even if the memory binding policy gets changed by the CPU binding order, the
-effect will have been achieved. On binding and allocating further memory, the
-CPU binding should be performed again in case the memory binding altered the
-previously-selected CPU binding.
+One can avoid using these flags but still closely control both memory
+and CPU binding by allocating memory, touching each page in the
+allocated memory, and then changing the CPU binding. The
+already-really-allocated memory will then be "locked" to physical
+memory and will not be migrated. Thus, even if the memory binding
+policy gets changed by the CPU binding order, the already-allocated
+memory will not change with it. When binding and allocating further
+memory, the CPU binding should be performed again in case the memory
+binding altered the previously-selected CPU binding.
-Not all OSes support the notion of a current memory binding policy for the
-current process but those often still provide a way to allocate data on a given
-node set. Conversely, some OSes support the notion of a current memory binding
-policy, and do not permit to allocate data on a given node set without just
-changing the current policy and allocate the data. Hwloc provides functions
-that set the current memory binding policies (if supported) as well as
-functions which allocat memory bound to given node set. By default, it
-does not use the former to achieve the latter, so that users can use both
-on OSes where they are both supported, and get both effects at the same time.
-For convenience, hwloc however also provides the hwloc_alloc_membind_policy
-and hwloc_alloc_membind_policy_nodeset helpers which are allowed to change the
-current memory binding policy of the process, in order to achieve memory binding
-even if that means having to change the current memory binding policy.
+Not all operating systems support the notion of a "current" memory
+binding policy for the current process, but such operating systems often still
+provide a way to allocate data on a given node set. Conversely, some
+operating systems support the notion of a "current" memory binding policy and do
+not permit allocating data on a specific node set without changing the
+current policy and allocate the data. To provide the most powerful coverage of
+these facilities, hwloc provides:
-\page interoperability Interoperability with other software
+<ul>
+<li>functions that set/get the current memory binding policies (if supported):
+hwloc_set/get_membind_*() and hwloc_set/get_proc_membind()
+<li>functions that allocate memory bound to specific node set without changing
+the current memory binding policy (if supported): hwloc_alloc_membind() and
+hwloc_alloc_membind_nodeset().
+<li>helpers which, if needed, change the current memory binding policy of the
+process in order to obtain memory binding: hwloc_alloc_membind_policy() and
+hwloc_alloc_membind_policy_nodeset()
+</ul>
+An application can thus use the two first sets of functions if it wants to
+manage separately the global process binding policy and directed allocation,
+or use the third set of functions if it does not care about the process memory
+binding policy.
+
+See \ref hwlocality_cpubinding and \ref hwlocality_membinding for
+hwloc's API functions regarding CPU and memory binding, respectively.
+
+\page interoperability Interoperability With Other Software
+
Although hwloc offers its own portable interface, it still may have to
interoperate with specific or non-portable libraries that manipulate
similar kinds of objects. hwloc therefore offers several specific
@@ -928,7 +946,7 @@
-\page threadsafety Thread safety
+\page threadsafety Thread Safety
Like most libraries that mainly fill data structures, hwloc is not
thread safe but rather reentrant: all state is held in a \ref
@@ -989,7 +1007,7 @@
-\page embed Embedding hwloc in other software
+\page embed Embedding hwloc in Other Software
It can be desirable to include hwloc in a larger software package (be
sure to check out the LICENSE file) so that users don't have to
@@ -1107,7 +1125,7 @@
and AM_CONDITIONALs cannot be defined conditionally. Note that it
is safe (but unnecessary) to call HWLOC_DO_AM_CONDITIONALS even if
HWLOC_SETUP_CORE is invoked unconditionally. If you are not using
- Automake to build hwloc, this macro is unncessary (and will actually
+ Automake to build hwloc, this macro is unnecessary (and will actually
cause errors because it invoked AM_* macros that will be undefined).
<strong>NOTE:</strong> When using the HWLOC_SETUP_CORE m4 macro, it may
@@ -1266,7 +1284,7 @@
\page faq Frequently Asked Questions
-\section faq_xml I do not want hwloc to rediscover my enormous machine topology everytime I rerun a process
+\section faq_xml I do not want hwloc to rediscover my enormous machine topology every time I rerun a process
Although the topology discovery is not expensive on common machines,
its overhead may become significant when multiple processes repeat
@@ -1286,5 +1304,39 @@
(that may for instance be transmitted between applications through a socket).
+\section faq_upgrade How do I handle API upgrades?
+The hwloc interface is extended with every new major release.
+Any application using the hwloc API should be prepared to check at
+compile-time whether some features are available in the currently
+installed hwloc distribution.
+
+To check whether hwloc is at least 1.1, you should use:
+\verbatim
+#include <hwloc.h>
+#if HWLOC_API_VERSION >= 0x00010100
+...
+#endif
+\endverbatim
+
+One of the major changes in hwloc 1.1 is the addition of the bitmap
+API. It supersedes the now deprecated cpuset API which will be removed
+in a future hwloc release. It is strongly recommended to switch existing
+codes to the bitmap API. Keeping support for older hwloc versions is easy.
+For instance, if your code uses <tt>hwloc_cpuset_alloc</tt>, you should use
+<tt>hwloc_bitmap_alloc</tt> instead and add the following code to one of your
+common headers:
+\verbatim
+#include <hwloc.h>
+#if HWLOC_API_VERSION < 0x00010100
+#define hwloc_bitmap_alloc hwloc_cpuset_alloc
+#endif
+\endverbatim
+
+Similarly, the hwloc 1.0 interface may be detected by comparing
+<tt>HWLOC_API_VERSION</tt> with <tt>0x00010000</tt>.
+
+hwloc 0.9 did not define any <tt>HWLOC_API_VERSION</tt> but this very old
+release probably does not deserve support from your application anymore.
+
*/
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/include/hwloc/bitmap.h
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/include/hwloc/bitmap.h 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/include/hwloc/bitmap.h 2011-01-19 14:28:19 UTC (rev 7755)
@@ -24,11 +24,17 @@
/** \defgroup hwlocality_bitmap The bitmap API
*
- * For use in hwloc itself, a hwloc_bitmap_t usually represents a set of
- * objects, typically logical processors or memory nodes, indexed by OS
- * physical number.
+ * The ::hwloc_bitmap_t type represents a set of objects, typically OS
+ * processors -- which may actually be hardware threads (represented
+ * by ::hwloc_cpuset_t, which is a typedef for ::hwloc_bitmap_t) -- or
+ * memory nodes (represented by ::hwloc_nodeset_t, which is also a
+ * typedef for ::hwloc_bitmap_t).
*
- * A bitmap may be infinite.
+ * <em>Both CPU and node sets are always indexed by OS physical number.</em>
+ *
+ * \note CPU sets and nodesets are described in \ref hwlocality_sets.
+ *
+ * A bitmap may be of infinite size.
* @{
*/
@@ -37,6 +43,7 @@
* Set of bits represented as an opaque pointer to an internal bitmap.
*/
typedef struct hwloc_bitmap_s * hwloc_bitmap_t;
+/** \brief a non-modifiable ::hwloc_bitmap_t */
typedef const struct hwloc_bitmap_s * hwloc_const_bitmap_t;
@@ -73,21 +80,18 @@
*
* Up to \p buflen characters may be written in buffer \p buf.
*
+ * If \p buflen is 0, \p buf may safely be \c NULL.
+ *
* \return the number of character that were actually written if not truncating,
- * or that would have been written (not including the ending \\0).
+ * or that would have been written (not including the ending \\0).
*/
HWLOC_DECLSPEC int hwloc_bitmap_snprintf(char * __hwloc_restrict buf, size_t buflen, hwloc_const_bitmap_t bitmap);
/** \brief Stringify a bitmap into a newly allocated string.
- *
- * \return the number of character that were actually written
- * (not including the ending \\0).
*/
HWLOC_DECLSPEC int hwloc_bitmap_asprintf(char ** strp, hwloc_const_bitmap_t bitmap);
/** \brief Parse a bitmap string and stores it in bitmap \p bitmap.
- *
- * Must start and end with a digit.
*/
HWLOC_DECLSPEC int hwloc_bitmap_sscanf(hwloc_bitmap_t bitmap, const char * __hwloc_restrict string);
@@ -95,6 +99,13 @@
*
* The taskset command manipulates bitmap strings that contain a single
* (possible very long) hexadecimal number starting with 0x.
+ *
+ * Up to \p buflen characters may be written in buffer \p buf.
+ *
+ * If \p buflen is 0, \p buf may safely be \c NULL.
+ *
+ * \return the number of character that were actually written if not truncating,
+ * or that would have been written (not including the ending \\0).
*/
HWLOC_DECLSPEC int hwloc_bitmap_taskset_snprintf(char * __hwloc_restrict buf, size_t buflen, hwloc_const_bitmap_t bitmap);
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/include/hwloc/helper.h
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/include/hwloc/helper.h 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/include/hwloc/helper.h 2011-01-19 14:28:19 UTC (rev 7755)
@@ -582,7 +582,7 @@
*
* Array \p cpuset will be filled with \p n cpusets recursively distributed
* linearly over the topology under \p root, down to depth \p until (which can
- * be MAX_INT to distribute down to the finest level).
+ * be INT_MAX to distribute down to the finest level).
*
* This is typically useful when an application wants to distribute \p n
* threads over a machine, giving each of them as much private cache as
@@ -680,7 +680,7 @@
/** \defgroup hwlocality_helper_cpuset Cpuset Helpers
* @{
*/
-/* \brief Get complete CPU set
+/** \brief Get complete CPU set
*
* \return the complete CPU set of logical processors of the system. If the
* topology is the result of a combination of several systems, NULL is
@@ -695,7 +695,7 @@
return hwloc_get_root_obj(topology)->complete_cpuset;
}
-/* \brief Get topology CPU set
+/** \brief Get topology CPU set
*
* \return the CPU set of logical processors of the system for which hwloc
* provides topology information. This is equivalent to the cpuset of the
@@ -748,7 +748,7 @@
/** \defgroup hwlocality_helper_nodeset Nodeset Helpers
* @{
*/
-/* \brief Get complete node set
+/** \brief Get complete node set
*
* \return the complete node set of memory of the system. If the
* topology is the result of a combination of several systems, NULL is
@@ -763,7 +763,7 @@
return hwloc_get_root_obj(topology)->complete_nodeset;
}
-/* \brief Get topology node set
+/** \brief Get topology node set
*
* \return the node set of memory of the system for which hwloc
* provides topology information. This is equivalent to the nodeset of the
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/include/hwloc/rename.h
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/include/hwloc/rename.h 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/include/hwloc/rename.h 2011-01-19 14:28:19 UTC (rev 7755)
@@ -36,6 +36,8 @@
/* Names from hwloc.h */
+#define hwloc_get_api_version HWLOC_NAME(get_api_version)
+
#define hwloc_topology HWLOC_NAME(topology)
#define hwloc_topology_t HWLOC_NAME(topology_t)
@@ -181,6 +183,9 @@
#define hwloc_bitmap_snprintf HWLOC_NAME(bitmap_snprintf)
#define hwloc_bitmap_asprintf HWLOC_NAME(bitmap_asprintf)
#define hwloc_bitmap_sscanf HWLOC_NAME(bitmap_sscanf)
+#define hwloc_bitmap_taskset_snprintf HWLOC_NAME(bitmap_taskset_snprintf)
+#define hwloc_bitmap_taskset_asprintf HWLOC_NAME(bitmap_taskset_asprintf)
+#define hwloc_bitmap_taskset_sscanf HWLOC_NAME(bitmap_taskset_sscanf)
#define hwloc_bitmap_zero HWLOC_NAME(bitmap_zero)
#define hwloc_bitmap_fill HWLOC_NAME(bitmap_fill)
#define hwloc_bitmap_from_ulong HWLOC_NAME(bitmap_from_ulong)
@@ -214,6 +219,52 @@
#define hwloc_bitmap_compare HWLOC_NAME(bitmap_compare)
#define hwloc_bitmap_weight HWLOC_NAME(bitmap_weight)
+/* hwloc/cpuset.h -- deprecated but still available */
+
+#define hwloc_cpuset HWLOC_NAME(cpuset)
+#define hwloc_cpuset_s HWLOC_NAME(cpuset_s)
+#define hwloc_cpuset_t HWLOC_NAME(cpuset_t)
+#define hwloc_const_cpuset_t HWLOC_NAME(const_cpuset_t)
+
+#define hwloc_cpuset_alloc HWLOC_NAME(cpuset_alloc)
+#define hwloc_cpuset_free HWLOC_NAME(cpuset_free)
+#define hwloc_cpuset_dup HWLOC_NAME(cpuset_dup)
+#define hwloc_cpuset_copy HWLOC_NAME(cpuset_copy)
+#define hwloc_cpuset_snprintf HWLOC_NAME(cpuset_snprintf)
+#define hwloc_cpuset_asprintf HWLOC_NAME(cpuset_asprintf)
+#define hwloc_cpuset_from_string HWLOC_NAME(cpuset_from_string)
+#define hwloc_cpuset_zero HWLOC_NAME(cpuset_zero)
+#define hwloc_cpuset_fill HWLOC_NAME(cpuset_fill)
+#define hwloc_cpuset_from_ulong HWLOC_NAME(cpuset_from_ulong)
+
+#define hwloc_cpuset_from_ith_ulong HWLOC_NAME(cpuset_from_ith_ulong)
+#define hwloc_cpuset_to_ulong HWLOC_NAME(cpuset_to_ulong)
+#define hwloc_cpuset_to_ith_ulong HWLOC_NAME(cpuset_to_ith_ulong)
+#define hwloc_cpuset_cpu HWLOC_NAME(cpuset_cpu)
+#define hwloc_cpuset_all_but_cpu HWLOC_NAME(cpuset_all_but_cpu)
+#define hwloc_cpuset_set HWLOC_NAME(cpuset_set)
+#define hwloc_cpuset_set_range HWLOC_NAME(cpuset_set_range)
+#define hwloc_cpuset_clr HWLOC_NAME(cpuset_clr)
+#define hwloc_cpuset_clr_range HWLOC_NAME(cpuset_clr_range)
+#define hwloc_cpuset_isset HWLOC_NAME(cpuset_isset)
+#define hwloc_cpuset_iszero HWLOC_NAME(cpuset_iszero)
+#define hwloc_cpuset_isfull HWLOC_NAME(cpuset_isfull)
+#define hwloc_cpuset_isequal HWLOC_NAME(cpuset_isequal)
+#define hwloc_cpuset_intersects HWLOC_NAME(cpuset_intersects)
+#define hwloc_cpuset_isincluded HWLOC_NAME(cpuset_isincluded)
+#define hwloc_cpuset_or HWLOC_NAME(cpuset_or)
+#define hwloc_cpuset_and HWLOC_NAME(cpuset_and)
+#define hwloc_cpuset_andnot HWLOC_NAME(cpuset_andnot)
+#define hwloc_cpuset_xor HWLOC_NAME(cpuset_xor)
+#define hwloc_cpuset_not HWLOC_NAME(cpuset_not)
+#define hwloc_cpuset_first HWLOC_NAME(cpuset_first)
+#define hwloc_cpuset_last HWLOC_NAME(cpuset_last)
+#define hwloc_cpuset_next HWLOC_NAME(cpuset_next)
+#define hwloc_cpuset_singlify HWLOC_NAME(cpuset_singlify)
+#define hwloc_cpuset_compare_first HWLOC_NAME(cpuset_compare_first)
+#define hwloc_cpuset_compare HWLOC_NAME(cpuset_compare)
+#define hwloc_cpuset_weight HWLOC_NAME(cpuset_weight)
+
/* hwloc/helper.h */
#define hwloc_get_type_or_below_depth HWLOC_NAME(get_type_or_below_depth)
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/include/hwloc.h
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/include/hwloc.h 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/include/hwloc.h 2011-01-19 14:28:19 UTC (rev 7755)
@@ -1,8 +1,8 @@
/*
* Copyright © 2009 CNRS
* Copyright © 2009-2010 INRIA
- * Copyright © 2009-2010 Université Bordeaux 1
- * Copyright © 2009-2010 Cisco Systems, Inc. All rights reserved.
+ * Copyright © 2009-2011 Université Bordeaux 1
+ * Copyright © 2009-2011 Cisco Systems, Inc. All rights reserved.
* See COPYING in top-level directory.
*/
@@ -50,6 +50,9 @@
/** \brief Indicate at build time which hwloc API version is being used. */
#define HWLOC_API_VERSION 0x00010100
+/** \brief Indicate at runtime which hwloc API version was used at build time. */
+HWLOC_DECLSPEC unsigned hwloc_get_api_version(void);
+
/** @} */
@@ -69,21 +72,41 @@
-/** \defgroup hwlocality_sets Object sets
+/** \defgroup hwlocality_sets Object sets (hwloc_cpuset_t and hwloc_nodeset_t)
+ *
+ * Hwloc uses bitmasks to represent two distinct kinds of object sets:
+ * CPU sets (::hwloc_cpuset_t) and NUMA node sets (::hwloc_nodeset_t).
+ * These types are both typedefs to a common back end type
+ * (::hwloc_bitmask_t), and therefore all the hwloc bitmap functions
+ * are applicable to both ::hwloc_cpuset_t and ::hwloc_nodeset_t (see
+ * \ref hwlocality_bitmap).
+ *
+ * The rationale for having two different types is that even though
+ * the actions one wants to perform on these types are the same (e.g.,
+ * enable and disable individual items in the set/mask), they're used
+ * in very different contexts: one for specifying which processors to
+ * use and one for specifying which NUMA nodes to use. Hence, the
+ * name difference is really just to reflect the intent of where the
+ * type is used.
+ *
* @{
*/
-/** \brief A CPU set is a bitmap whose bits are set according to CPU physical OS indexes.
+/** \brief A CPU set is a bitmap whose bits are set according to CPU
+ * physical OS indexes.
*
- * It may be consulted and modified with the bitmap API as any ::hwloc_bitmap_t (see hwloc/bitmap.h).
+ * It may be consulted and modified with the bitmap API as any
+ * ::hwloc_bitmap_t (see hwloc/bitmap.h).
*/
typedef hwloc_bitmap_t hwloc_cpuset_t;
/** \brief A non-modifiable ::hwloc_cpuset_t. */
typedef hwloc_const_bitmap_t hwloc_const_cpuset_t;
-/** \brief A node set is a bitmap whose bits are set according to NUMA memory node physical OS indexes.
+/** \brief A node set is a bitmap whose bits are set according to NUMA
+ * memory node physical OS indexes.
*
- * It may be consulted and modified with the bitmap API as any ::hwloc_bitmap_t (see hwloc/bitmap.h).
+ * It may be consulted and modified with the bitmap API as any
+ * ::hwloc_bitmap_t (see hwloc/bitmap.h).
*
* When binding memory on a system without any NUMA node
* (when the whole memory is considered as a single memory bank),
@@ -149,7 +172,7 @@
HWLOC_OBJ_GROUP, /**< \brief Group objects.
* Objects which do not fit in the above but are
* detected by hwloc and are useful to take into
- * account for affinity. For instance, some OSes
+ * account for affinity. For instance, some operating systems
* expose their arbitrary processors aggregation this
* way. And hwloc may insert such objects to group
* NUMA nodes according to their distances.
@@ -800,8 +823,10 @@
* It differs from hwloc_obj_type_string() because it prints type attributes such
* as cache depth.
*
- * \return how many characters were actually written (not including the ending
- * \\0), or -1 on error.
+ * If \p size is 0, \p string may safely be \c NULL.
+ *
+ * \return the number of character that were actually written if not truncating,
+ * or that would have been written (not including the ending \\0).
*/
HWLOC_DECLSPEC int hwloc_obj_type_snprintf(char * __hwloc_restrict string, size_t size, hwloc_obj_t obj,
int verbose);
@@ -812,8 +837,10 @@
*
* Only the major attributes are printed in non-verbose mode.
*
- * \return how many characters were actually written (not including the ending
- * \\0), or -1 on error.
+ * If \p size is 0, \p string may safely be \c NULL.
+ *
+ * \return the number of character that were actually written if not truncating,
+ * or that would have been written (not including the ending \\0).
*/
HWLOC_DECLSPEC int hwloc_obj_attr_snprintf(char * __hwloc_restrict string, size_t size, hwloc_obj_t obj, const char * __hwloc_restrict separator,
int verbose);
@@ -833,8 +860,10 @@
* \p indexprefix is used to prefix the \p os_index attribute number of
* the object in the description. If \c NULL, the \c # character is used.
*
- * \return how many characters were actually written (not including the ending
- * \\0), or -1 on error.
+ * If \p size is 0, \p string may safely be \c NULL.
+ *
+ * \return the number of character that were actually written if not truncating,
+ * or that would have been written (not including the ending \\0).
*/
HWLOC_DECLSPEC int hwloc_obj_snprintf(char * __hwloc_restrict string, size_t size,
hwloc_topology_t topology, hwloc_obj_t obj,
@@ -842,7 +871,11 @@
/** \brief Stringify the cpuset containing a set of objects.
*
- * \return how many characters were actually written (not including the ending \\0). */
+ * If \p size is 0, \p string may safely be \c NULL.
+ *
+ * \return the number of character that were actually written if not truncating,
+ * or that would have been written (not including the ending \\0).
+ */
HWLOC_DECLSPEC int hwloc_obj_cpuset_snprintf(char * __hwloc_restrict str, size_t size, size_t nobj, const hwloc_obj_t * __hwloc_restrict objs);
/** \brief Search the given key name in object infos and return the corresponding value.
@@ -867,14 +900,15 @@
*
* It is often useful to call hwloc_bitmap_singlify() first so that a single CPU
* remains in the set. This way, the process will not even migrate between
- * different CPUs. Some OSes also only support that kind of binding.
+ * different CPUs. Some operating systems also only support that kind of binding.
*
- * \note Some OSes do not provide all ways to bind processes, threads, etc and
- * the corresponding binding functions may fail. -1 is returned and errno is set
- * to ENOSYS when it is not possible to bind the requested kind of object
- * processes/threads. errno is set to EXDEV when the requested cpuset can not be
- * enforced (e.g. some systems only allow one CPU, and some other systems only
- * allow one NUMA node).
+ * \note Some operating systems do not provide all hwloc-supported
+ * mechanisms to bind processes, threads, etc. and the corresponding
+ * binding functions may fail. -1 is returned and errno is set to
+ * ENOSYS when it is not possible to bind the requested kind of object
+ * processes/threads. errno is set to EXDEV when the requested cpuset
+ * can not be enforced (e.g. some systems only allow one CPU, and some
+ * other systems only allow one NUMA node).
*
* The most portable version that should be preferred over the others, whenever
* possible, is
@@ -883,7 +917,7 @@
* hwloc_set_cpubind(topology, set, 0),
* \endcode
*
- * as it just binds the current program, assuming it is monothread, or
+ * as it just binds the current program, assuming it is single-threaded, or
*
* \code
* hwloc_set_cpubind(topology, set, HWLOC_CPUBIND_THREAD),
@@ -895,20 +929,22 @@
* \note To unbind, just call the binding function with either a full cpuset or
* a cpuset equal to the system cpuset.
*
- * \note On some OSes, CPU binding may have effects on memory binding, see
+ * \note On some operating systems, CPU binding may have effects on memory binding, see
* ::HWLOC_CPUBIND_NOMEMBIND
* @{
*/
/** \brief Process/Thread binding flags.
*
- * These flags can be used to refine the binding policy.
+ * These bit flags can be used to refine the binding policy.
*
- * The default (0) is to bind the current process, assumed to be mono-thread,
- * in a non-strict way. This is the most portable way to bind as all OSes
- * usually provide it.
+ * The default (0) is to bind the current process, assumed to be
+ * single-threaded, in a non-strict way. This is the most portable
+ * way to bind as all operating systems usually provide it.
*
- * \note Not all systems support all kinds of binding.
+ * \note Not all systems support all kinds of binding. See the
+ * "Detailed Description" section of \ref hwlocality_cpubinding for a
+ * description of errors that can occur.
*/
typedef enum {
HWLOC_CPUBIND_PROCESS = (1<<0), /**< \brief Bind all threads of the current
@@ -920,7 +956,7 @@
* \hideinitializer
*
* By default, when the designated CPUs are
- * all busy while other CPUs are idle, OSes
+ * all busy while other CPUs are idle, operating systems
* may execute the thread/process on those
* other CPUs instead of the designated CPUs,
* to let them progress anyway. Strict
@@ -929,10 +965,10 @@
* designated CPUs, even when those are busy
* with other tasks and other CPUs are idle.
*
- * \note Depending on OSes and
- * implementations, strict binding may not be
- * possible (implementation reason) or not
- * allowed (administrative reasons), and the
+ * \note Depending on the operating system,
+ * strict binding may not be
+ * possible (e.g., the OS does not implement it) or not
+ * allowed (e.g., for an administrative reasons), and the
* function will fail in that case.
*
* When retrieving the binding of a process,
@@ -947,7 +983,7 @@
HWLOC_CPUBIND_NOMEMBIND = (1<<3)/**< \brief Avoid any effect on memory binding
* \hideinitializer
*
- * On some OSes, some CPU binding function
+ * On some operating systems, some CPU binding function
* would also bind the memory on the
* corresponding NUMA node. It is often not
* a problem for the application, but if it
@@ -1016,165 +1052,475 @@
/** \defgroup hwlocality_membinding Memory binding
*
- * \note Not all OSes support all ways to bind existing allocated memory
- * (migration), future memory allocation, explicit memory allocation, etc. and
- * the corresponding binding functions may fail. -1 is returned and errno is
- * set to ENOSYS when it is not possible to bind the requested kind of object
- * processes/threads). errno is set to EXDEV when the requested cpuset can not
- * be enforced (e.g. some systems only allow one NUMA node).
+ * \note Not all operating systems support all ways to bind existing
+ * allocated memory (e.g., migration), future memory allocation,
+ * explicit memory allocation, etc. Using a binding flag or policy
+ * that is not supported by the underlying OS will cause hwloc's
+ * binding functions to fail and return -1. errno will be set to
+ * ENOSYS when the system does support the specified action or policy
+ * (e.g., some systems only allow binding memory on a per-thread
+ * basis, whereas other systems only allow binding memory for all
+ * threads in a process). errno will be set to EXDEV when the
+ * requested cpuset can not be enforced (e.g., some systems only allow
+ * binding memory to a single NUMA node).
*
- * The most portable version that should be preferred over the others, whenever
- * possible, is
+ * The most portable form that should be preferred over the others
+ * whenever possible is as follows:
*
* \code
- * hwloc_alloc_membind_policy(topology, size, set, HWLOC_MEMBIND_DEFAULT, 0),
+ * hwloc_alloc_membind_policy(topology, size, set,
+ * HWLOC_MEMBIND_DEFAULT, 0);
* \endcode
*
- * which will try to allocate new data bound to the given set, possibly by
- * changing the current memory binding policy, or at worse allocate memory
- * without binding it at all. Since HWLOC_MEMBIND_STRICT is not given, this
- * will even not fail unless a mere malloc() itself would fail, i.e. ENOMEM.
+ * This will allocate some memory hopefully bound to the specified set.
+ * To do so, hwloc will possibly have to change the current memory
+ * binding policy in order to actually get the memory bound, if the OS
+ * does not provide any other way to simply allocate bound memory
+ * without changing the policy for all allocations. That is the
+ * difference with hwloc_alloc_membind(), which will never change the
+ * current memory binding policy. Note that since HWLOC_MEMBIND_STRICT
+ * was not specified, failures to bind will not be reported --
+ * generally, only memory allocation failures will be reported (e.g.,
+ * even a plain malloc() would have failed with ENOMEM).
*
- * Each binding is available with a CPU set argument or a NUMA memory node set
- * argument. The name of the latter ends with _nodeset. It is also possible to
- * convert between CPU set and node set using ::hwloc_cpuset_to_nodeset or
- * ::hwloc_cpuset_from_nodeset.
+ * Each hwloc memory binding function is available in two forms: one
+ * that takes a CPU set argument and another that takes a NUMA memory
+ * node set argument (see \ref hwlocality_sets and \ref
+ * hwlocality_bitmap for a discussion of CPU sets and NUMA memory node
+ * sets). The names of the latter form end with _nodeset. It is also
+ * possible to convert between CPU set and node set using
+ * hwloc_cpuset_to_nodeset() or hwloc_cpuset_from_nodeset().
*
- * \note On some OSes, memory binding may have effects on CPU binding, see
- * ::HWLOC_MEMBIND_NOCPUBIND
+ * \note On some operating systems, memory binding affects the CPU
+ * binding; see ::HWLOC_MEMBIND_NOCPUBIND
* @{
*/
/** \brief Memory binding policy.
*
- * These can be used to choose the binding policy.
+ * These constants can be used to choose the binding policy. Only one policy can
+ * be used at a time (i.e., the values cannot be OR'ed together).
*
- * Note that not all systems support all kinds of binding.
+ * \note Not all systems support all kinds of binding. See the
+ * "Detailed Description" section of \ref hwlocality_membinding for a
+ * description of errors that can occur.
*/
typedef enum {
HWLOC_MEMBIND_DEFAULT = 0, /**< \brief Reset the memory allocation policy to the system default.
* \hideinitializer */
- HWLOC_MEMBIND_FIRSTTOUCH = 1, /**< \brief Allocate memory on the given nodes, but preferably on the
- node where the first accessor is running.
+ HWLOC_MEMBIND_FIRSTTOUCH = 1, /**< \brief Allocate memory
+ * but do not immediately bind
+ * it to a specific locality.
+ * Instead, each page in the
+ * allocation is bound only
+ * when it is first touched.
+ * Pages are individually
+ * bound to the local NUMA
+ * node of the first thread
+ * that touches it.
+ * \hideinitializer */
+ HWLOC_MEMBIND_BIND = 2, /**< \brief Allocate memory on the specified nodes.
* \hideinitializer */
- HWLOC_MEMBIND_BIND = 2, /**< \brief Allocate memory on the given nodes.
+ HWLOC_MEMBIND_INTERLEAVE = 3, /**< \brief Allocate memory on
+ * the given nodes in an
+ * interleaved / round-robin
+ * manner. The precise layout
+ * of the memory across
+ * multiple NUMA nodes is
+ * OS/system specific.
+ * Interleaving can be useful
+ * when threads distributed across
+ * the specified NUMA nodes
+ * will all be accessing the whole
+ * memory range concurrently, since
+ * the interleave will then balance
+ * the memory references.
+ * \hideinitializer */
+ HWLOC_MEMBIND_REPLICATE = 4, /**< \brief Replicate memory
+ * on the given nodes; reads
+ * from this memory will
+ * attempt to be serviced from
+ * the NUMA node local to the
+ * reading thread.
+ * Replicating can be useful
+ * when multiple threads from
+ * the specified NUMA nodes
+ * will be sharing the same
+ * read-only data.
+ *
+ * This policy can only be
+ * used with existing memory
+ * allocations (i.e., the
+ * hwloc_set_*membind*()
+ * functions); it cannot be
+ * used with functions that
+ * allocate new memory (i.e.,
+ * the hwloc_alloc*()
+ * functions).
* \hideinitializer */
- HWLOC_MEMBIND_INTERLEAVE = 3, /**< \brief Allocate memory on the given nodes in a round-robin manner.
+ HWLOC_MEMBIND_NEXTTOUCH = 5, /**< \brief For each page bound
+ * with this policy, by next time
+ * it is touched (and next time only),
+ * it is moved from
+ * its current location to the
+ * local NUMA node of the
+ * thread where the memory
+ * reference occurred (if it
+ * needs to be moved at all).
* \hideinitializer */
- HWLOC_MEMBIND_REPLICATE = 4, /**< \brief Replicate memory on the given nodes.
- * \hideinitializer */
- HWLOC_MEMBIND_NEXTTOUCH = 5 /**< \brief On next touch of existing allocated memory, migrate it to the node
- * where the memory reference happened.
- * \hideinitializer */
+ HWLOC_MEMBIND_MIXED = -1 /**< \brief Returned by hwloc_get_membind*()
+ * functions when multiple threads or
+ * parts of a memory area have
+ * differing memory binding policies.
+ * \hideinitializer */
} hwloc_membind_policy_t;
/** \brief Memory binding flags.
*
- * These flags can be used to refine the binding policy.
+ * These flags can be used to refine the binding policy. All flags
+ * can be logically OR'ed together with the exception of
+ * HWLOC_MEMBIND_PROCESS and HWLOC_MEMBIND_THREAD; these two flags are
+ * mutually exclusive.
*
- * \note Not all systems support all kinds of binding.
+ * \note Not all systems support all kinds of binding. See the
+ * "Detailed Description" section of \ref hwlocality_membinding for a
+ * description of errors that can occur.
*/
typedef enum {
- HWLOC_MEMBIND_PROCESS = (1<<0), /**< \brief Set policy for all threads of the
- * current (possibly multithreaded) process.
+ HWLOC_MEMBIND_PROCESS = (1<<0), /**< \brief Set policy for all
+ * threads of the specified
+ * (possibly multithreaded)
+ * process. This flag is
+ * mutually exclusive with
+ * HWLOC_MEMBIND_THREAD.
* \hideinitializer */
- HWLOC_MEMBIND_THREAD = (1<<1), /**< \brief Set policy for the current thread of
- * the current process.
+ HWLOC_MEMBIND_THREAD = (1<<1), /**< \brief Set policy for a
+ * specific thread of the
+ * current process. This flag
+ * is mutually exclusive with
+ * HWLOC_MEMBIND_PROCESS.
* \hideinitializer */
- HWLOC_MEMBIND_STRICT = (1<<2), /**< Request strict binding from the OS.
- * The function will fail if the
- * binding can not be completely
- * enforced.
+ HWLOC_MEMBIND_STRICT = (1<<2), /**< Request strict binding
+ * from the OS. The function
+ * will fail if the binding
+ * can not be guaranteed /
+ * completely enforced.
+ *
+ * This flag has slightly
+ * different meanings
+ * depending on which function
+ * it is used with.
* \hideinitializer */
- HWLOC_MEMBIND_MIGRATE = (1<<3), /**< \brief Migrate existing allocated memory.
- * If memory can not be migrated and the STRICT
- * flag is passed, an error will be returned.
+ HWLOC_MEMBIND_MIGRATE = (1<<3), /**< \brief Migrate existing
+ * allocated memory. If the
+ * memory cannot be migrated
+ * and the
+ * HWLOC_MEMBIND_STRICT flag
+ * is passed, an error will be
+ * returned.
* \hideinitializer */
- HWLOC_MEMBIND_NOCPUBIND = (1<<4) /**< \brief Avoid any effect on CPU binding
+ HWLOC_MEMBIND_NOCPUBIND = (1<<4) /**< \brief Avoid any effect
+ * on CPU binding.
+ *
+ * On some operating systems,
+ * some underlying memory
+ * binding functions also bind
+ * the application to the
+ * corresponding CPU(s).
+ * Using this flag will cause
+ * hwloc to avoid using OS
+ * functions that could
+ * potentially affect CPU
+ * bindings. Note, however,
+ * that using NOCPUBIND may
+ * reduce hwloc's overall
+ * memory binding support.
+ * Specifically: some of
+ * hwloc's memory binding
+ * functions may fail with
+ * errno set to ENOSYS when
+ * used with NOCPUBIND.
* \hideinitializer
- *
- * On some OSes, some memory binding function
- * would also bind the application on
- * the corresponding CPUs. It is often
- * not a problem for the application, but if it
- * is, setting this flag will make hwloc
- * avoid using OS functions that would also
- * bind on CPUs. This will however reduce the
- * support of memory bindings, i.e. potentially
- * return ENOSYS in some cases.
*/
} hwloc_membind_flags_t;
-/** \brief Bind current process memory on the given nodeset \p nodeset
+/** \brief Set the default memory binding policy of the current
+ * process or thread to prefer the NUMA node(s) specified by \p nodeset
*
+ * If neither HWLOC_MEMBIND_PROCESS nor HWLOC_MEMBIND_THREAD is
+ * specified, the current process is assumed to be single-threaded.
+ * This is the most portable form as it permits hwloc to use either
+ * process-based OS functions or thread-based OS functions, depending
+ * on which are available.
+ *
* \return -1 with errno set to ENOSYS if the action is not supported
* \return -1 with errno set to EXDEV if the binding cannot be enforced
*/
HWLOC_DECLSPEC int hwloc_set_membind_nodeset(hwloc_topology_t topology, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags);
-/** \brief Bind current process memory on memory nodes near the given cpuset \p cpuset
+/** \brief Set the default memory binding policy of the current
+ * process or thread to prefer the NUMA node(s) near the specified \p
+ * cpuset
*
+ * If neither HWLOC_MEMBIND_PROCESS nor HWLOC_MEMBIND_THREAD is
+ * specified, the current process is assumed to be single-threaded.
+ * This is the most portable form as it permits hwloc to use either
+ * process-based OS functions or thread-based OS functions, depending
+ * on which are available.
+ *
* \return -1 with errno set to ENOSYS if the action is not supported
* \return -1 with errno set to EXDEV if the binding cannot be enforced
*/
HWLOC_DECLSPEC int hwloc_set_membind(hwloc_topology_t topology, hwloc_const_cpuset_t cpuset, hwloc_membind_policy_t policy, int flags);
-/** \brief Get current process memory binding in nodeset \p nodeset
+/** \brief Query the default memory binding policy and locality of the
+ * current process or thread.
+ *
+ * This function has two output parameters: \p nodeset and \p policy.
+ * The values returned in these parameters depend on both the \p flags
+ * passed in and the current memory binding policies and nodesets in
+ * the queried target.
+ *
+ * Passing the HWLOC_MEMBIND_PROCESS flag specifies that the query
+ * target is the current policies and nodesets for all the threads in
+ * the current process. Passing HWLOC_MEMBIND_THREAD specifies that
+ * the query target is the current policy and nodeset for only the
+ * thread invoking this function.
+ *
+ * If neither of these flags are passed (which is the most portable
+ * method), the process is assumed to be single threaded. This allows
+ * hwloc to use either process-based OS functions or thread-based OS
+ * functions, depending on which are available.
+ *
+ * HWLOC_MEMBIND_STRICT is only meaningful when HWLOC_MEMBIND_PROCESS
+ * is also specified. In this case, hwloc will check the default
+ * memory policies and nodesets for all threads in the process. If
+ * they are not identical, -1 is returned and errno is set to EXDEV.
+ * If they are identical, the values are returned in \p nodeset and \p
+ * policy.
+ *
+ * Otherwise, if HWLOC_MEMBIND_PROCESS is specified (and
+ * HWLOC_MEMBIND_STRICT is \em not specified), \p nodeset is set to
+ * the logical OR of all threads' default nodeset. If all threads'
+ * default policies are the same, \p policy is set to that policy. If
+ * they are different, \p policy is set to HWLOC_MEMBIND_MIXED.
+ *
+ * In the HWLOC_MEMBIND_THREAD case (or when neither
+ * HWLOC_MEMBIND_PROCESS or HWLOC_MEMBIND_THREAD is specified), there
+ * is only one nodeset and policy; they are returned in \p nodeset and
+ * \p policy, respectively.
+ *
+ * If any other flags are specified, -1 is returned and errno is set
+ * to EINVAL.
*/
HWLOC_DECLSPEC int hwloc_get_membind_nodeset(hwloc_topology_t topology, hwloc_nodeset_t nodeset, hwloc_membind_policy_t * policy, int flags);
-/** \brief Get current process memory binding in cpuset \p cpuset
+/** \brief Query the default memory binding policy and locality of the
+ * current process or thread (the locality is returned in \p cpuset as
+ * CPUs near the locality's actual NUMA node(s)).
+ *
+ * This function has two output parameters: \p cpuset and \p policy.
+ * The values returned in these parameters depend on both the \p flags
+ * passed in and the current memory binding policies and nodesets in
+ * the queried target.
+ *
+ * Passing the HWLOC_MEMBIND_PROCESS flag specifies that the query
+ * target is the current policies and nodesets for all the threads in
+ * the current process. Passing HWLOC_MEMBIND_THREAD specifies that
+ * the query target is the current policy and nodeset for only the
+ * thread invoking this function.
+ *
+ * If neither of these flags are passed (which is the most portable
+ * method), the process is assumed to be single threaded. This allows
+ * hwloc to use either process-based OS functions or thread-based OS
+ * functions, depending on which are available.
+ *
+ * HWLOC_MEMBIND_STRICT is only meaningful when HWLOC_MEMBIND_PROCESS
+ * is also specified. In this case, hwloc will check the default
+ * memory policies and nodesets for all threads in the process. If
+ * they are not identical, -1 is returned and errno is set to EXDEV.
+ * If they are identical, the policy is returned in \p policy. \p
+ * cpuset is set to the union of CPUs near the NUMA node(s) in the
+ * nodeset.
+ *
+ * Otherwise, if HWLOC_MEMBIND_PROCESS is specified (and
+ * HWLOC_MEMBIND_STRICT is \em not specified), the default nodeset
+ * from each thread is logically OR'ed together. \p cpuset is set to
+ * the union of CPUs near the NUMA node(s) in the resulting nodeset.
+ * If all threads' default policies are the same, \p policy is set to
+ * that policy. If they are different, \p policy is set to
+ * HWLOC_MEMBIND_MIXED.
+ *
+ * In the HWLOC_MEMBIND_THREAD case (or when neither
+ * HWLOC_MEMBIND_PROCESS or HWLOC_MEMBIND_THREAD is specified), there
+ * is only one nodeset and policy. The policy is returned in \p
+ * policy; \p cpuset is set to the union of CPUs near the NUMA node(s)
+ * in the \p nodeset.
+ *
+ * If any other flags are specified, -1 is returned and errno is set
+ * to EINVAL.
*/
HWLOC_DECLSPEC int hwloc_get_membind(hwloc_topology_t topology, hwloc_cpuset_t cpuset, hwloc_membind_policy_t * policy, int flags);
-/** \brief Bind given process memory on the given nodeset \p nodeset
+/** \brief Set the default memory binding policy of the specified
+ * process to prefer the NUMA node(s) specified by \p nodeset
*
* \return -1 with errno set to ENOSYS if the action is not supported
* \return -1 with errno set to EXDEV if the binding cannot be enforced
*/
HWLOC_DECLSPEC int hwloc_set_proc_membind_nodeset(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags);
-/** \brief Bind given process memory on memory nodes near the given cpuset \p cpuset
+/** \brief Set the default memory binding policy of the specified
+ * process to prefer the NUMA node(s) near the specified \p cpuset
*
* \return -1 with errno set to ENOSYS if the action is not supported
* \return -1 with errno set to EXDEV if the binding cannot be enforced
*/
HWLOC_DECLSPEC int hwloc_set_proc_membind(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_const_cpuset_t cpuset, hwloc_membind_policy_t policy, int flags);
-/** \brief Get current process memory binding in nodeset \p nodeset
+/** \brief Query the default memory binding policy and locality of the
+ * specified process.
+ *
+ * This function has two output parameters: \p nodeset and \p policy.
+ * The values returned in these parameters depend on both the \p flags
+ * passed in and the current memory binding policies and nodesets in
+ * the queried target.
+ *
+ * Passing the HWLOC_MEMBIND_PROCESS flag specifies that the query
+ * target is the current policies and nodesets for all the threads in
+ * the specified process. If HWLOC_MEMBIND_PROCESS is not specified
+ * (which is the most portable method), the process is assumed to be
+ * single threaded. This allows hwloc to use either process-based OS
+ * functions or thread-based OS functions, depending on which are
+ * available.
+ *
+ * Note that it does not make sense to pass HWLOC_MEMBIND_THREAD to
+ * this function.
+ *
+ * If HWLOC_MEMBIND_STRICT is specified, hwloc will check the default
+ * memory policies and nodesets for all threads in the specified
+ * process. If they are not identical, -1 is returned and errno is
+ * set to EXDEV. If they are identical, the values are returned in \p
+ * nodeset and \p policy.
+ *
+ * Otherwise, \p nodeset is set to the logical OR of all threads'
+ * default nodeset. If all threads' default policies are the same, \p
+ * policy is set to that policy. If they are different, \p policy is
+ * set to HWLOC_MEMBIND_MIXED.
+ *
+ * If any other flags are specified, -1 is returned and errno is set
+ * to EINVAL.
*/
HWLOC_DECLSPEC int hwloc_get_proc_membind_nodeset(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_nodeset_t nodeset, hwloc_membind_policy_t * policy, int flags);
-/** \brief Get current process memory binding in cpuset \p cpuset
+/** \brief Query the default memory binding policy and locality of the
+ * specified process (the locality is returned in \p cpuset as CPUs
+ * near the locality's actual NUMA node(s)).
+ *
+ * This function has two output parameters: \p cpuset and \p policy.
+ * The values returned in these parameters depend on both the \p flags
+ * passed in and the current memory binding policies and nodesets in
+ * the queried target.
+ *
+ * Passing the HWLOC_MEMBIND_PROCESS flag specifies that the query
+ * target is the current policies and nodesets for all the threads in
+ * the specified process. If HWLOC_MEMBIND_PROCESS is not specified
+ * (which is the most portable method), the process is assumed to be
+ * single threaded. This allows hwloc to use either process-based OS
+ * functions or thread-based OS functions, depending on which are
+ * available.
+ *
+ * Note that it does not make sense to pass HWLOC_MEMBIND_THREAD to
+ * this function.
+ *
+ * If HWLOC_MEMBIND_STRICT is specified, hwloc will check the default
+ * memory policies and nodesets for all threads in the specified
+ * process. If they are not identical, -1 is returned and errno is
+ * set to EXDEV. If they are identical, the policy is returned in \p
+ * policy. \p cpuset is set to the union of CPUs near the NUMA
+ * node(s) in the nodeset.
+ *
+ * Otherwise, the default nodeset from each thread is logically OR'ed
+ * together. \p cpuset is set to the union of CPUs near the NUMA
+ * node(s) in the resulting nodeset. If all threads' default policies
+ * are the same, \p policy is set to that policy. If they are
+ * different, \p policy is set to HWLOC_MEMBIND_MIXED.
+ *
+ * If any other flags are specified, -1 is returned and errno is set
+ * to EINVAL.
*/
HWLOC_DECLSPEC int hwloc_get_proc_membind(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_cpuset_t cpuset, hwloc_membind_policy_t * policy, int flags);
-/** \brief Bind some memory range on the given nodeset \p nodeset
+/** \brief Bind the already-allocated memory identified by (addr, len)
+ * to the NUMA node(s) in \p nodeset.
*
* \return -1 with errno set to ENOSYS if the action is not supported
* \return -1 with errno set to EXDEV if the binding cannot be enforced
*/
HWLOC_DECLSPEC int hwloc_set_area_membind_nodeset(hwloc_topology_t topology, const void *addr, size_t len, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags);
-/** \brief Bind some memory range on memory nodes near the given cpuset \p cpuset
+/** \brief Bind the already-allocated memory identified by (addr, len)
+ * to the NUMA node(s) near \p cpuset.
*
* \return -1 with errno set to ENOSYS if the action is not supported
* \return -1 with errno set to EXDEV if the binding cannot be enforced
*/
HWLOC_DECLSPEC int hwloc_set_area_membind(hwloc_topology_t topology, const void *addr, size_t len, hwloc_const_cpuset_t cpuset, hwloc_membind_policy_t policy, int flags);
-/** \brief Get some memory range memory binding in nodeset \p nodeset
+/** \brief Query the NUMA node(s) and binding policy of the memory
+ * identified by (\p addr, \p len ).
+ *
+ * This function has two output parameters: \p nodeset and \p policy.
+ * The values returned in these parameters depend on both the \p flags
+ * passed in and the memory binding policies and nodesets of the pages
+ * in the address range.
+ *
+ * If HWLOC_MEMBIND_STRICT is specified, the target pages are first
+ * checked to see if they all have the same memory binding policy and
+ * nodeset. If they do not, -1 is returned and errno is set to EXDEV.
+ * If they are identical across all pages, the nodeset and policy are
+ * returned in \p nodeset and \p policy, respectively.
+ *
+ * If HWLOC_MEMBIND_STRICT is not specified, \p nodeset is set to the
+ * union of all NUMA node(s) containing pages in the address range.
+ * If all pages in the target have the same policy, it is returned in
+ * \p policy. Otherwise, \p policy is set to HWLOC_MEMBIND_MIXED.
+ *
+ * If any other flags are specified, -1 is returned and errno is set
+ * to EINVAL.
*/
HWLOC_DECLSPEC int hwloc_get_area_membind_nodeset(hwloc_topology_t topology, const void *addr, size_t len, hwloc_nodeset_t nodeset, hwloc_membind_policy_t * policy, int flags);
-/** \brief Get some memory range memory binding in cpuset \p cpuset
+/** \brief Query the CPUs near the NUMA node(s) and binding policy of
+ * the memory identified by (\p addr, \p len ).
+ *
+ * This function has two output parameters: \p cpuset and \p policy.
+ * The values returned in these parameters depend on both the \p flags
+ * passed in and the memory binding policies and nodesets of the pages
+ * in the address range.
+ *
+ * If HWLOC_MEMBIND_STRICT is specified, the target pages are first
+ * checked to see if they all have the same memory binding policy and
+ * nodeset. If they do not, -1 is returned and errno is set to EXDEV.
+ * If they are identical across all pages, the policy is returned in
+ * \p policy. \p cpuset is set to the union of CPUs near the NUMA
+ * node(s) in the nodeset.
+ *
+ * If HWLOC_MEMBIND_STRICT is not specified, the union of all NUMA
+ * node(s) containing pages in the address range is calculated. \p
+ * cpuset is then set to the CPUs near the NUMA node(s) in this union.
+ * If all pages in the target have the same policy, it is returned in
+ * \p policy. Otherwise, \p policy is set to HWLOC_MEMBIND_MIXED.
+ *
+ * If any other flags are specified, -1 is returned and errno is set
+ * to EINVAL.
*/
HWLOC_DECLSPEC int hwloc_get_area_membind(hwloc_topology_t topology, const void *addr, size_t len, hwloc_cpuset_t cpuset, hwloc_membind_policy_t * policy, int flags);
/** \brief Allocate some memory
*
- * This is equivalent to malloc(), except it tries to allocated page-aligned
- * memory from the OS.
+ * This is equivalent to malloc(), except that it tries to allocate
+ * page-aligned memory from the OS.
*
* \note The allocated memory should be freed with hwloc_free().
*/
@@ -1202,7 +1548,8 @@
*/
HWLOC_DECLSPEC void *hwloc_alloc_membind(hwloc_topology_t topology, size_t len, hwloc_const_cpuset_t cpuset, hwloc_membind_policy_t policy, int flags) __hwloc_attribute_malloc;
-/** \brief Free some memory allocated by hwloc_alloc() or hwloc_alloc_membind().
+/** \brief Free memory that was previously allocated by hwloc_alloc()
+ * or hwloc_alloc_membind().
*/
HWLOC_DECLSPEC int hwloc_free(hwloc_topology_t topology, void *addr, size_t len);
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/src/cpuset.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/src/cpuset.c 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/src/cpuset.c 2011-01-19 14:28:19 UTC (rev 7755)
@@ -36,8 +36,8 @@
/* actual opaque type internals */
struct hwloc_bitmap_s {
- unsigned ulongs_count; /* how many ulong bitmasks are valid */
- unsigned ulongs_allocated; /* how many ulong bitmasks are allocated */
+ unsigned ulongs_count; /* how many ulong bitmasks are valid, >= 1 */
+ unsigned ulongs_allocated; /* how many ulong bitmasks are allocated, >= ulongs_count */
unsigned long *ulongs;
int infinite; /* set to 1 if all bits beyond ulongs are set */
#ifdef HWLOC_DEBUG
@@ -47,7 +47,11 @@
/* overzealous check in debug-mode, not as powerful as valgrind but still useful */
#ifdef HWLOC_DEBUG
-#define HWLOC__BITMAP_CHECK(set) assert((set)->magic == HWLOC_BITMAP_MAGIC)
+#define HWLOC__BITMAP_CHECK(set) do { \
+ assert((set)->magic == HWLOC_BITMAP_MAGIC); \
+ assert((set)->ulongs_count >= 1); \
+ assert((set)->ulongs_allocated >= (set)->ulongs_count); \
+} while (0)
#else
#define HWLOC__BITMAP_CHECK(set)
#endif
@@ -77,7 +81,7 @@
if (!set)
return NULL;
- set->ulongs_count = 0;
+ set->ulongs_count = 1;
set->ulongs_allocated = 64/sizeof(unsigned long);
set->ulongs = malloc(64);
if (!set->ulongs) {
@@ -85,6 +89,7 @@
return NULL;
}
+ set->ulongs[0] = HWLOC_SUBBITMAP_ZERO;
set->infinite = 0;
#ifdef HWLOC_DEBUG
set->magic = HWLOC_BITMAP_MAGIC;
@@ -95,8 +100,10 @@
struct hwloc_bitmap_s * hwloc_bitmap_alloc_full(void)
{
struct hwloc_bitmap_s * set = hwloc_bitmap_alloc();
- if (set)
+ if (set) {
set->infinite = 1;
+ set->ulongs[0] = HWLOC_SUBBITMAP_FULL;
+ }
return set;
}
@@ -240,15 +247,11 @@
res = size>0 ? size - 1 : 0;
tmp += res;
size -= res;
+ /* optimize a common case: full bitmap should appear as 0xf...f instead of 0xf...f,0xffffffff */
+ if (set->ulongs_count == 1 && set->ulongs[0] == HWLOC_SUBBITMAP_FULL)
+ return ret;
}
- if (!set->infinite && !set->ulongs_count) {
- res = hwloc_snprintf(tmp, size, "0x0");
- if (res < 0)
- return -1;
- return res;
- }
-
i=set->ulongs_count-1;
while (i>=0 || accumed) {
/* Refill accumulator */
@@ -318,9 +321,15 @@
count++;
current = string;
- if (!strncmp("0xf...f,", current, 8)) {
+ if (!strncmp("0xf...f", current, 7)) {
+ current += 7;
+ if (*current != ',') {
+ /* special case for infinite/full cpuset */
+ hwloc_bitmap_fill(set);
+ return 0;
+ }
+ current++;
infinite = 1;
- current += 8;
count--;
}
@@ -384,6 +393,9 @@
res = size>0 ? size - 1 : 0;
tmp += res;
size -= res;
+ /* optimize a common case: full bitmap should appear as 0xf...f instead of 0xf...fffffffff */
+ if (set->ulongs_count == 1 && set->ulongs[0] == HWLOC_SUBBITMAP_FULL)
+ return ret;
}
i=set->ulongs_count-1;
@@ -391,8 +403,12 @@
unsigned long val = set->ulongs[i--];
if (started) {
/* print the whole subset */
+#if HWLOC_BITS_PER_LONG == 64
+ res = hwloc_snprintf(tmp, size, "%016lx", val);
+#else
res = hwloc_snprintf(tmp, size, "%08lx", val);
- } else if (val) {
+#endif
+ } else if (val || i == -1) {
res = hwloc_snprintf(tmp, size, "0x%lx", val);
started = 1;
} else {
@@ -432,11 +448,25 @@
current = string;
if (!strncmp("0xf...f", current, 7)) {
+ /* infinite bitmap */
infinite = 1;
current += 7;
- } else if (!strncmp("0x", current, 2)) {
- current += 2;
+ if (*current == '\0') {
+ /* special case for infinite/full bitmap */
+ hwloc_bitmap_fill(set);
+ return 0;
+ }
+ } else {
+ /* finite bitmap */
+ if (!strncmp("0x", current, 2))
+ current += 2;
+ if (*current == '\0') {
+ /* special case for empty bitmap */
+ hwloc_bitmap_zero(set);
+ return 0;
+ }
}
+ /* we know there are other characters now */
chars = strlen(current);
count = (chars * 4 + HWLOC_BITS_PER_LONG - 1) / HWLOC_BITS_PER_LONG;
@@ -446,13 +476,13 @@
while (*current != '\0') {
int tmpchars;
- char ustr[9];
+ char ustr[17];
unsigned long val;
char *next;
- tmpchars = chars % 8;
+ tmpchars = chars % (HWLOC_BITS_PER_LONG/4);
if (!tmpchars)
- tmpchars = 8;
+ tmpchars = (HWLOC_BITS_PER_LONG/4);
memcpy(ustr, current, tmpchars);
ustr[tmpchars] = '\0';
@@ -489,7 +519,7 @@
{
HWLOC__BITMAP_CHECK(set);
- hwloc_bitmap_reset_by_ulongs(set, 0);
+ hwloc_bitmap_reset_by_ulongs(set, 1);
hwloc_bitmap__zero(set);
}
@@ -505,7 +535,7 @@
{
HWLOC__BITMAP_CHECK(set);
- hwloc_bitmap_reset_by_ulongs(set, 0);
+ hwloc_bitmap_reset_by_ulongs(set, 1);
hwloc_bitmap__fill(set);
}
@@ -526,7 +556,7 @@
hwloc_bitmap_reset_by_ulongs(set, i+1);
set->ulongs[i] = mask;
- for(j=1; j<(unsigned) i; j++)
+ for(j=0; j<(unsigned) i; j++)
set->ulongs[j] = HWLOC_SUBBITMAP_ZERO;
set->infinite = 0;
}
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/src/topology-linux.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/src/topology-linux.c 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/src/topology-linux.c 2011-01-19 14:28:19 UTC (rev 7755)
@@ -886,18 +886,18 @@
static void
hwloc_linux_membind_mask_to_nodeset(hwloc_topology_t topology __hwloc_attribute_unused,
hwloc_nodeset_t nodeset,
- unsigned _max_os_index, const unsigned long *linuxmask)
+ unsigned max_os_index, const unsigned long *linuxmask)
{
- unsigned max_os_index;
unsigned i;
- /* round up to the nearest multiple of BITS_PER_LONG */
- max_os_index = (_max_os_index + HWLOC_BITS_PER_LONG) & ~(HWLOC_BITS_PER_LONG - 1);
+#ifdef HWLOC_DEBUG
+ /* max_os_index comes from hwloc_linux_find_kernel_max_numnodes() so it's a multiple of HWLOC_BITS_PER_LONG */
+ assert(!(max_os_index%HWLOC_BITS_PER_LONG));
+#endif
hwloc_bitmap_zero(nodeset);
for(i=0; i<max_os_index/HWLOC_BITS_PER_LONG; i++)
hwloc_bitmap_set_ith_ulong(nodeset, i, linuxmask[i]);
- /* if we don't trust the kernel, we could clear bits from _max_os_index+1 to max_os_index-1 */
}
#endif /* HWLOC_HAVE_SET_MEMPOLICY || HWLOC_HAVE_MBIND */
@@ -1161,6 +1161,7 @@
if (!fgets(string, 11, fd)) {
*value = -1;
+ fclose(fd);
return -1;
}
*value = strtoul(string, NULL, 10);
@@ -1761,8 +1762,10 @@
if (!fd)
return;
- if (!fgets(string, sizeof(string), fd))
+ if (!fgets(string, sizeof(string), fd)) {
+ fclose(fd);
return;
+ }
tmp = string;
while (tmp) {
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/src/topology-synthetic.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/src/topology-synthetic.c 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/src/topology-synthetic.c 2011-01-19 14:28:19 UTC (rev 7755)
@@ -85,7 +85,6 @@
topology->backend_params.synthetic.arity[count-1] = (unsigned)item;
topology->backend_params.synthetic.type[count] = type;
- topology->backend_params.synthetic.id[count] = 0;
count++;
}
@@ -162,7 +161,6 @@
topology->backend_params.synthetic.type[0] = HWLOC_OBJ_MACHINE;
nb_machine_levels++;
}
- topology->backend_params.synthetic.id[0] = 0;
if (cache_depth == 1)
/* if there is a single cache level, make it L2 */
@@ -301,6 +299,12 @@
topology->support.discovery->pu = 1;
+ /* start with id=0 for each level */
+ for (i = 0; topology->backend_params.synthetic.arity[i] > 0; i++)
+ topology->backend_params.synthetic.id[i] = 0;
+ /* ... including the last one */
+ topology->backend_params.synthetic.id[i] = 0;
+
/* update first level type according to the synthetic type array */
topology->levels[0][0]->type = topology->backend_params.synthetic.type[0];
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/src/topology.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/src/topology.c 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/src/topology.c 2011-01-19 14:28:19 UTC (rev 7755)
@@ -43,6 +43,12 @@
#include <windows.h>
#endif
+unsigned hwloc_get_api_version(void)
+{
+ return HWLOC_API_VERSION;
+}
+
+
static void
hwloc_topology_clear (struct hwloc_topology *topology);
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/src/traversal.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/src/traversal.c 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/src/traversal.c 2011-01-19 14:28:19 UTC (rev 7755)
@@ -193,7 +193,8 @@
/* TODO: more pretty presentation? */
return hwloc_snprintf(string, size, "%s%u", hwloc_obj_type_string(type), obj->attr->group.depth);
default:
- *string = '\0';
+ if (size > 0)
+ *string = '\0';
return 0;
}
}
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/tests/hwloc_bitmap_string.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/tests/hwloc_bitmap_string.c 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/tests/hwloc_bitmap_string.c 2011-01-19 14:28:19 UTC (rev 7755)
@@ -27,6 +27,7 @@
/* check an empty cpuset */
set = hwloc_bitmap_alloc();
hwloc_bitmap_asprintf(&string, set);
+ assert(!strcmp(string, "0x0"));
set2 = hwloc_bitmap_alloc();
hwloc_bitmap_sscanf(set2, string);
free(string);
@@ -34,8 +35,19 @@
hwloc_bitmap_free(set);
hwloc_bitmap_free(set2);
- /* check an infinite cpuset */
+ /* check a full (and infinite) cpuset */
set = hwloc_bitmap_alloc_full();
+ hwloc_bitmap_asprintf(&string, set);
+ assert(!strcmp(string, "0xf...f"));
+ set2 = hwloc_bitmap_alloc();
+ hwloc_bitmap_sscanf(set2, string);
+ free(string);
+ assert(hwloc_bitmap_isequal(set, set2));
+ hwloc_bitmap_free(set);
+ hwloc_bitmap_free(set2);
+
+ /* check an infinite (but non full) cpuset */
+ set = hwloc_bitmap_alloc_full();
hwloc_bitmap_clr(set, 173);
hwloc_bitmap_clr_range(set, 60, 70);
hwloc_bitmap_asprintf(&string, set);
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/tests/linux/hwloc-gather-topology.sh.in
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/tests/linux/hwloc-gather-topology.sh.in 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/tests/linux/hwloc-gather-topology.sh.in 2011-01-19 14:28:19 UTC (rev 7755)
@@ -20,12 +20,20 @@
echo $@ 2>&1
}
+usage()
+{
+ echo "$0 <savepath>"
+ echo " Saves the Linux topology files (/sys, /proc, ...) under <savepath>.tar.bz2"
+ echo " and the corresponding lstopo verbose output under <savepath>.output"
+ echo "Example:"
+ echo " $0 /tmp/\$(uname -n)"
+}
+
name="$1"; shift
-if [ -z "$name" ] ; then
- echo "$0 <savepath>"
- echo " Saves the Linux topology files (/sys, /proc, ...) under <savepath>.tar.bz2"
- echo " and the corresponding lstopo verbose output under <savepath>.output"
- exit -1
+if [ -z "$name" -o x`echo $name | cut -c1` = x- ] ; then
+ [ x$name != x -a x$name != x-h -a x$name != x--help ] && echo "Unrecognized option: $name"
+ usage
+ exit 1
fi
basename=`basename "$name"`
dirname=`dirname "$name"`
@@ -35,6 +43,11 @@
exit 1
fi
+if [ ! -w "$dirname" ] ; then
+ echo "$dirname is not writable."
+ exit 1
+fi
+
destdir=`mktemp -d`
# Get all files from the given path (either a file or a directory)
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/utils/Makefile.am
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/utils/Makefile.am 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/utils/Makefile.am 2011-01-19 14:28:19 UTC (rev 7755)
@@ -43,6 +43,9 @@
# Only install man pages if we're building in standalone mode
if HWLOC_BUILD_UTILS
man1_pages = lstopo.1 hwloc-bind.1 hwloc-distrib.1 hwloc-calc.1 hwloc-ps.1
+if HWLOC_HAVE_LINUX
+man1_pages += hwloc-gather-topology.sh.1
+endif HWLOC_HAVE_LINUX
man7_pages = hwloc.7
man_pages = $(man7_pages) $(man1_pages)
EXTRA_DIST += $(man1_pages:.1=.1in) $(man7_pages:.7=.7in)
Copied: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/utils/hwloc-gather-topology.sh.1in (from rev 7754, mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/utils/hwloc-gather-topology.sh.1in)
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/utils/hwloc-gather-topology.sh.1in (rev 0)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/utils/hwloc-gather-topology.sh.1in 2011-01-19 14:28:19 UTC (rev 7755)
@@ -0,0 +1,123 @@
+.\" -*- nroff -*-
+.\" Copyright © 2010 Jirka Hladky
+.\" Copyright © 2010 Brice Goglin
+.TH HWLOC-GATHER-TOPOLOGY-SH "1" "#HWLOC_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
+.SH NAME
+hwloc-gather-topology.sh \- Saves the relevant Linux topology files
+and the lstopo output for later (possibly offline) usage.
+.
+.\" **************************
+.\" Synopsis Section
+.\" **************************
+.SH SYNOPSIS
+.
+.B hwloc-gather-topology.sh [\fIoptions\fR] \fI<path>\fR
+.
+.\" **************************
+.\" Options Section
+.\" **************************
+.SH OPTIONS
+.
+\fB\-h\fR \fB\-\-help\fR
+display help message and exit
+.
+.\" **************************
+.\" Description Section
+.\" **************************
+.SH DESCRIPTION
+.
+\fBhwloc-gather-topology.sh\fR saves all the relevant topology files into an
+archive (\fB<path>.tar.bz2\fR) and the lstopo output (\fB<path>.output\fR).
+The utility for example stores the \fB/proc/cpuinfo\fR file and the entire
+\fB/sys/devices/system/node/\fR directory tree.
+.
+.PP
+These files can be used later to explore the machine topology offline.
+Once the tarball has been extracted, it may for instance be given to
+some hwloc command-line utilities through their \fB\-\-input\fR option.
+It is also possible to override the default topology that the hwloc
+library will read by setting the extracted path in the \fBHWLOC_FSROOT\fR
+environment variable.
+.
+.PP
+Both archive and lstopo output may also be submitted to hwloc developers
+to debug issues remotely.
+.
+.PP
+\fBhwloc-gather-topology.sh\fR is a Linux specific tool, it is not installed
+on other operating systems.
+.
+.PP
+.B NOTE:
+It is highly recommended that you read the hwloc(7) overview page
+before reading this man page.
+.
+.\" **************************
+.\" Examples Section
+.\" **************************
+.SH EXAMPLES
+.PP
+To store topology information to be used later (possibly on
+a different host) please run:
+
+ hwloc-gather-topology.sh /tmp/myhost
+
+It will store all relevant topology files in the \fB/tmp/myhost.tar.bz2\fR
+archive and the lstopo output in the \fB/tmp/myhost.output\fR file.
+.
+These files can be transferred on another host for later/offline
+analysis and/or as the input to various hwloc utilities.
+.PP
+To use these data with hwloc utilities you have to unpack
+\fBmyhost.tar.bz2\fR archive first:
+
+ tar jxvf /tmp/myhost.tar.bz2
+
+A new directory named \fBmyhost\fR now contains all topology files.
+Then you ask various hwloc utilities to use this topology instead
+of the one of the real machine by passing \fB\-\-input myhost\fR.
+To display the topology just run:
+
+ lstopo --input ./myhost
+
+It is not necessary that the topology is extracted in the current
+directory, absolute or relative paths are also supported:
+
+ lstopo --input /path/to/remote/host/extracted/topology/
+
+To see how hwloc would distribute 8 parallel jobs on the original host:
+
+ hwloc-distrib --input myhost --single 8
+
+To get the corresponding physical indexes in the previous command:
+
+ hwloc-calc --input myhost --po --li --proclist $(hwloc-distrib --input myhost --single 8)
+
+Any program may actually override the default topology with a given
+archived one even if it does not have a \fB\-\-input\fR option.
+The \fBHWLOC_FSROOT\fR environment variable should be used to do so:
+
+ HWLOC_FSROOT=myhost hwloc-calc --po --li --proclist $(hwloc-distrib --single 8)
+
+All these commands will produce the same output as if executed
+directly on the host on which the topology information was
+originally gathered by the \fBhwloc-gather-topology.sh\fR script.
+.
+.\" **************************
+.\" Return value section
+.\" **************************
+.SH RETURN VALUE
+Upon successful execution, \fBhwloc-gather-topology.sh\fR will exit with the code 0.
+.
+.PP
+\fBhwloc-gather-topology.sh\fR will return nonzero exit status if any kind of error occurs,
+such as (but not limited to) failure to create the archive or output file.
+.
+.\" **************************
+.\" See also section
+.\" **************************
+.SH SEE ALSO
+.
+.ft R
+hwloc(7), lstopo(1), hwloc-calc(1), hwloc-distrib(1)
+.sp
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/utils/lstopo-draw.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/utils/lstopo-draw.c 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/utils/lstopo-draw.c 2011-01-19 14:28:19 UTC (rev 7755)
@@ -400,7 +400,7 @@
{
unsigned myheight = gridsize + (fontsize ? (fontsize + gridsize) : 0) + gridsize, totheight;
unsigned mywidth = 0, totwidth;
- unsigned textwidth = fontsize ? ((logical ? level->logical_index : level->os_index) == (unsigned) -1 ? 7*fontsize : 9*fontsize) : 0;
+ unsigned textwidth = fontsize ? ((logical ? level->logical_index : level->os_index) == (unsigned) -1 ? 8*fontsize : 10*fontsize) : 0;
/* Do not separate objects when in L1 (SMT) */
unsigned separator = level->attr->cache.depth > 1 ? gridsize : 0;
@@ -482,7 +482,7 @@
/* Currently filled width */
unsigned totwidth;
/* Width of the heading text, thus minimal width */
- unsigned textwidth = 11*fontsize;
+ unsigned textwidth = 16*fontsize;
/* Check whether dynamic programming can save us time */
DYNA_CHECK();
@@ -667,6 +667,9 @@
system_draw(topology, methods, logical, level, output, depth, x, &totwidth, y, &totheight);
+ if (totwidth < 20*fontsize)
+ totwidth = 20*fontsize;
+
if (legend) {
/* Display the hostname, but only if we're showing *this*
system */
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/plpa/bind_plpa.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/plpa/bind_plpa.c 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/plpa/bind_plpa.c 2011-01-19 14:28:19 UTC (rev 7755)
@@ -188,3 +188,22 @@
fn_fail:
goto fn_exit;
}
+
+HYD_status HYDT_bind_plpa_finalize(void)
+{
+ HYD_status status = HYD_SUCCESS;
+
+ HYDU_FUNC_ENTER();
+
+ /* FIXME: We do not check for the return value of this function,
+ * because it always seems to return an error. But not calling it
+ * is causing some resource leaks. */
+ PLPA_NAME(finalize) ();
+
+ fn_exit:
+ HYDU_FUNC_EXIT();
+ return status;
+
+ fn_fail:
+ goto fn_exit;
+}
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/plpa/bind_plpa.h
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/plpa/bind_plpa.h 2011-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/plpa/bind_plpa.h 2011-01-19 14:28:19 UTC (rev 7755)
@@ -9,5 +9,6 @@
HYD_status HYDT_bind_plpa_init(HYDT_bind_support_level_t * support_level);
HYD_status HYDT_bind_plpa_process(struct HYDT_bind_cpuset_t cpuset);
+HYD_status HYDT_bind_plpa_finalize(void);
#endif /* BIND_PLPA_H_INCLUDED */
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-01-19 14:26:59 UTC (rev 7754)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/slurm_launch.c 2011-01-19 14:28:19 UTC (rev 7755)
@@ -64,7 +64,8 @@
{
int num_hosts, idx, i, exec_idx;
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,
+ quoted_exec_string[HYD_TMP_STRLEN];
char *path = NULL, *extra_arg_list = NULL, *extra_arg;
struct HYD_node *node;
struct HYDT_bind_cpuset_t cpuset;
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/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
+ /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
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/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
+ /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
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/error-return/src/pm/hydra/tools/bootstrap/utils/bscu_query_proxy_id.c:7662-7670
/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-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
+ /mpich2/branches/dev/error-return/src/pm/hydra/tools/bootstrap/utils/bscu_query_proxy_id.c:7662-7670
/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-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
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/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
+ /mpich2/branches/dev/ckpt/src/pm/hydra/ui:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/ui:5057-6537
/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
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/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
+ /mpich2/branches/dev/ckpt/src/pm/hydra/utils:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/utils:5057-6537
/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
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/error-return/winconfigure.wsf:7662-7670
/mpich2/branches/dev/ftb/winconfigure.wsf:5661-5730
/mpich2/branches/dev/lapi/winconfigure.wsf:5817
/mpich2/branches/dev/win_rrvm/winconfigure.wsf:6404,6407-6408,6420,6422-6423
/mpich2/branches/dev/wintcp_async_progress/winconfigure.wsf:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/winconfigure.wsf:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/winconfigure.wsf:5406
/mpich2/trunk/winconfigure.wsf:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748
+ /mpich2/branches/dev/ckpt/winconfigure.wsf:5050
/mpich2/branches/dev/ckpt2/winconfigure.wsf:5057-6537
/mpich2/branches/dev/error-return/winconfigure.wsf:7662-7670
/mpich2/branches/dev/ftb/winconfigure.wsf:5661-5730
/mpich2/branches/dev/lapi/winconfigure.wsf:5817
/mpich2/branches/dev/win_rrvm/winconfigure.wsf:6404,6407-6408,6420,6422-6423
/mpich2/branches/dev/wintcp_async_progress/winconfigure.wsf:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/winconfigure.wsf:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/winconfigure.wsf:5406
/mpich2/trunk/winconfigure.wsf:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754
More information about the mpich2-commits
mailing list