[mpich2-commits] r8040 - in mpich2/trunk: . src/mpid/ch3/channels/nemesis src/pm/smpd

[jayesh at mcs.anl.gov]

Author: jayesh
Date: 2011-02-24 15:03:55 -0600 (Thu, 24 Feb 2011)
New Revision: 8040

Modified:
   mpich2/trunk/src/mpid/ch3/channels/nemesis/ch3nemesis.vcproj
   mpich2/trunk/src/pm/smpd/mp_parse_command_line.c
   mpich2/trunk/winconfigure.wsf
Log:
Adding dummy/none netmod to Nemesis on Windows

Modified: mpich2/trunk/src/mpid/ch3/channels/nemesis/ch3nemesis.vcproj
===================================================================
--- mpich2/trunk/src/mpid/ch3/channels/nemesis/ch3nemesis.vcproj	2011-02-24 20:59:14 UTC (rev 8039)
+++ mpich2/trunk/src/mpid/ch3/channels/nemesis/ch3nemesis.vcproj	2011-02-24 21:03:55 UTC (rev 8040)
@@ -878,6 +878,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\nemesis\netmod\none\none.c"
+				>
+			</File>
+			<File
 				RelativePath=".\nemesis\netmod\wintcp\socksm.c"
 				>
 			</File>

Modified: mpich2/trunk/src/pm/smpd/mp_parse_command_line.c
===================================================================
--- mpich2/trunk/src/pm/smpd/mp_parse_command_line.c	2011-02-24 20:59:14 UTC (rev 8039)
+++ mpich2/trunk/src/pm/smpd/mp_parse_command_line.c	2011-02-24 21:03:55 UTC (rev 8040)
@@ -2389,7 +2389,7 @@
         nemesis_netmod[0] = '\0';
 #ifdef HAVE_WINDOWS_H
         /* See if there is a netmod specified with the channel
-         * eg: -channel nemesis:newtcp | -channel nemesis:nd
+         * eg: -channel nemesis:newtcp | -channel nemesis:nd | -channel nemesis:none
          */
         if(strlen(channel) > 0){
             char seps[]=":";

Modified: mpich2/trunk/winconfigure.wsf
===================================================================
--- mpich2/trunk/winconfigure.wsf	2011-02-24 20:59:14 UTC (rev 8039)
+++ mpich2/trunk/winconfigure.wsf	2011-02-24 21:03:55 UTC (rev 8040)
@@ -2224,13 +2224,13 @@
 			Case "@nemesis_nets_macro_defs@"
 				str = Replace(str, "@nemesis_nets_macro_defs@", "#define MPIDI_NEM_NEWTCP_MODULE 0" + vbCrLf + "#define MPIDI_NEM_ND_MODULE 1")
 			Case "@nemesis_nets_func_decl@"
-				str = Replace(str, "@nemesis_nets_func_decl@", "MPIDI_nem_newtcp_module_funcs, MPIDI_Nem_nd_funcs")
+				str = Replace(str, "@nemesis_nets_func_decl@", "MPIDI_nem_newtcp_module_funcs, MPIDI_Nem_nd_funcs, MPIDI_nem_none_funcs")
 			Case "@nemesis_nets_array_sz@"
-				str = Replace(str, "@nemesis_nets_array_sz@", "2")
+				str = Replace(str, "@nemesis_nets_array_sz@", "3")
 			Case "@nemesis_nets_func_array@"
-				str = Replace(str, "@nemesis_nets_func_array@", "&MPIDI_nem_newtcp_module_funcs, &MPIDI_Nem_nd_funcs")
+				str = Replace(str, "@nemesis_nets_func_array@", "&MPIDI_nem_newtcp_module_funcs, &MPIDI_Nem_nd_funcs, &MPIDI_nem_none_funcs")
 			Case "@nemesis_nets_strings@"
-				str = Replace(str, "@nemesis_nets_strings@", """newtcp"",""nd""")
+				str = Replace(str, "@nemesis_nets_strings@", """newtcp"",""nd"", ""none""")
 			Case Else
 			'	unhandled_ats = unhandled_ats & Match & vbNewLine
 			'	unhandled_ats_count = unhandled_ats_count + 1
@@ -7134,11 +7134,13 @@
 '	CreateRules f.GetFolder("src\mpid\ch3\channels\nemesis\nemesis\utils"), trimlength
 	CreateRules f.GetFolder("src\mpid\ch3\channels\nemesis\nemesis\netmod\wintcp"), trimlength
 	CreateRules f.GetFolder("src\mpid\ch3\channels\nemesis\nemesis\netmod\nd"), trimlength
+	CreateRules f.GetFolder("src\mpid\ch3\channels\nemesis\nemesis\netmod\none"), trimlength
 	CreateObjs "ch3nemesis", f.GetFolder("src\mpid\ch3\channels\nemesis\src"), trimlength, true, false
 	CreateObjs "ch3nemesis", f.GetFolder("src\mpid\ch3\channels\nemesis\nemesis\src"), trimlength, false, false
 '	CreateObjs "ch3nemesis", f.GetFolder("src\mpid\ch3\channels\nemesis\nemesis\utils"), trimlength, false, false
 	CreateObjs "ch3nemesis", f.GetFolder("src\mpid\ch3\channels\nemesis\nemesis\netmod\wintcp"), trimlength, false, false
-	CreateObjs "ch3nemesis", f.GetFolder("src\mpid\ch3\channels\nemesis\nemesis\netmod\nd"), trimlength, false, true
+	CreateObjs "ch3nemesis", f.GetFolder("src\mpid\ch3\channels\nemesis\nemesis\netmod\nd"), trimlength, false, false
+	CreateObjs "ch3nemesis", f.GetFolder("src\mpid\ch3\channels\nemesis\nemesis\netmod\none"), trimlength, false, true
 
 
 	mfile.WriteLine