[WinOF] Include DAPL socket-cm provider for Windows to Linux DAT connections.

git-svn-id: svn://openib.tc.cornell.edu/gen1@906 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/branches/WinOF/WIX/dat.conf b/branches/WinOF/WIX/dat.conf
index 0db48dc2e0443d537dd93e0b42764bbe8504b5e3..555e021af73e5dcf540a4b40f2c692ed84a5c30a 100644 (file)
--- a/branches/WinOF/WIX/dat.conf
+++ b/branches/WinOF/WIX/dat.conf
@@ -21,3 +21,10 @@ IbalHca0v2 u2.0 nonthreadsafe default C:\Windows\dapl2.dll ri.2.0 "IbalHca0 1" "
 #\r
 # DAT 2.0 (debug)\r
 ibnic0v2d u2.0 nonthreadsafe default "C:\\Program Files (x86)\\WinOF\\dapl2d.dll" ri.2.0 "IbalHca0 1" ""\r
+#\r
+# DAT 2.0 [socket-cm] InfiniBand QPs setup by passing QP info over a socket\r
+# connection; supports DAT Windows <==> Linux over IB connections.\r
+ibnic0v2-scm u2.0 nonthreadsafe default C:\Windows\dapl2-scm.dll ri.2.0 "IbalHca0 1" ""\r
+#\r
+# Socket-CM (debug)\r
+ibnic0v2-scmd u2.0 nonthreadsafe default "C:\\Program Files (x86)\\WinOF\\dapl2-scmd.dll" ri.2.0 "IbalHca0 1" ""\r

diff --git a/branches/WinOF/WIX/ia64/wof.wxs b/branches/WinOF/WIX/ia64/wof.wxs
index 2902d5daa3eddc3ad6d8f2420d55556fac65fced..4a1ce4a7a38300a1fde126265026cbdfee751dd0 100644 (file)
--- a/branches/WinOF/WIX/ia64/wof.wxs
+++ b/branches/WinOF/WIX/ia64/wof.wxs
@@ -418,6 +418,16 @@
               <File Id="_dapl2d.dll" Compressed="yes" DiskId="1"\r
                      LongName="dapl2d.dll" Name="DAPL2D.DLL"\r
                      Source="..\bin\DAPL2\ia64\dapl2d.dll" />\r
+              <File Id="_dapl2_scm.dll" Compressed="yes" DiskId="1"\r
+                          LongName="dapl2-scm.dll" Name="D2-scm.DLL"\r
+                          Source="..\bin\DAPL2\ia64\dapl2-scm.dll" />\r
+              <CopyFile Id="dupDAPL2_scm" FileId="_dapl2_scm.dll"\r
+                              DestinationName="d2-scm.dll"\r
+                              DestinationLongName="dapl2-scm.dll"\r
+                              DestinationProperty="WindowsFolder" />\r
+              <File Id="_dapl2_scmd.dll" Compressed="yes" DiskId="1"\r
+                          LongName="dapl2-scmd.dll" Name="D2-scmd.DLL"\r
+                          Source="..\bin\DAPL2\ia64\dapl2-scmd.dll" />\r
               <File Id="_dat32.dll" Compressed="yes" DiskId="1"\r
                      LongName="dat232.dll" Name="DAT232.DLL"\r
                      Source="..\bin\DAPL2\ia64\dat232.dll" />\r

diff --git a/branches/WinOF/WIX/x64/wof.wxs b/branches/WinOF/WIX/x64/wof.wxs
index 82cda583646e189ce39bc9d2d5c904ada5af43a9..3f56662b201e8d0798a09532fe69a55dbe4b0c92 100644 (file)
--- a/branches/WinOF/WIX/x64/wof.wxs
+++ b/branches/WinOF/WIX/x64/wof.wxs
@@ -415,6 +415,16 @@
               <File Id="_dapl2d.dll" Compressed="yes" DiskId="1"\r
                      LongName="dapl2d.dll" Name="DAPL2D.DLL"\r
                      Source="..\bin\DAPL2\amd64\dapl2d.dll" />\r
+              <File Id="_dapl2_scm.dll" Compressed="yes" DiskId="1"\r
+                     LongName="dapl2-scm.dll" Name="D2-scm.DLL"\r
+                     Source="..\bin\DAPL2\amd64\dapl2-scm.dll" />\r
+              <CopyFile Id="dupDAPL2_scm" FileId="_dapl2_scm.dll"\r
+                        DestinationName="d2-scm.dll"\r
+                        DestinationLongName="dapl2-scm.dll"\r
+                        DestinationProperty="WindowsFolder" />\r
+              <File Id="_dapl2_scmd.dll" Compressed="yes" DiskId="1"\r
+                     LongName="dapl2-scmd.dll" Name="D2-scmd.DLL"\r
+                     Source="..\bin\DAPL2\amd64\dapl2-scmd.dll" />\r
               <File Id="_dat32.dll" Compressed="yes" DiskId="1"\r
                      LongName="dat232.dll" Name="DAT232.DLL"\r
                      Source="..\bin\DAPL2\amd64\dat232.dll" />\r

diff --git a/branches/WinOF/WIX/x86/wof.wxs b/branches/WinOF/WIX/x86/wof.wxs
index a768f95e686481c4c1da50a66c186e0fdd38c3cf..b91664f1c1167b167e2a99bd0173a79bfda5f30c 100644 (file)
--- a/branches/WinOF/WIX/x86/wof.wxs
+++ b/branches/WinOF/WIX/x86/wof.wxs
@@ -350,6 +350,18 @@
                     <File Id="_dapl2d.dll" Compressed="yes" DiskId="1"\r
                           LongName="dapl2d.dll" Name="DAPL2D.DLL"\r
                           Source="..\bin\DAPL2\x86\dapl2d.dll" />\r
+\r
+                    <File Id="_dapl2_scm.dll" Compressed="yes" DiskId="1"\r
+                          LongName="dapl2-scm.dll" Name="D2-scm.DLL"\r
+                          Source="..\bin\DAPL2\x86\dapl2-scm.dll" />\r
+                      <CopyFile Id="dupDAPL2_scm" FileId="_dapl2_scm.dll"\r
+                              DestinationName="d2-scm.dll"\r
+                              DestinationLongName="dapl2-scm.dll"\r
+                              DestinationProperty="WindowsFolder" />\r
+                    <File Id="_dapl2_scmd.dll" Compressed="yes" DiskId="1"\r
+                          LongName="dapl2-scmd.dll" Name="D2-scmd.DLL"\r
+                          Source="..\bin\DAPL2\x86\dapl2-scmd.dll" />\r
+\r
                     <File Id="_dat2.dll" Compressed="yes" DiskId="1"\r
                           LongName="dat2.dll" Name="DAT2.DLL"\r
                           Source="..\bin\DAPL2\x86\dat2.dll" />\r

diff --git a/trunk/docs/Manual.htm b/trunk/docs/Manual.htm
index 2db11cae52ff726c5d58f5eb96cc1336ffde7237..a45e48687336d97442f32724f82a97f96dbc2597 100644 (file)
--- a/trunk/docs/Manual.htm
+++ b/trunk/docs/Manual.htm
@@ -15,7 +15,7 @@ div.Section1
 <h1 align="center">User's Manual</h1>\r
 <h2 align="center">Release 1.0.1</h2>\r
 <h3 align="center">\r
-<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%m/%d/%Y" startspan -->10/05/2007<!--webbot bot="Timestamp" endspan i-checksum="12571" --></h3>\r
+<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%m/%d/%Y" startspan -->11/14/2007<!--webbot bot="Timestamp" endspan i-checksum="12565" --></h3>\r
 <h2 align="left"><u>Overview</u></h2>\r
 <p align="left"><span style="FONT-SIZE: 12pt; FONT-FAMILY: 'Times New Roman'">\r
 The Windows OpenFabrics (WinOF) package is composed of software modules intended \r
@@ -1186,6 +1186,16 @@ include</font></p>
        versions of DAT/DAPL 2.0 runtime libraries, found only on 64-bit systems, \r
        are identified in '%SystemDrive%\%ProgramFiles(x86)%\WinOF' as dat232.dll \r
        and dapl232.dll.</font></p>\r
+       <p align="left"><font face="Courier New" size="2">DAT/DAPL 2.0 (free-build) \r
+       libraries utilize the IBAL (eye-ball) InfiniBand Access Layer Connection \r
+       Manager (CM) to establish IB reliable connections to Windows based system. \r
+       To facilitate DAT v2.0 Windows to Linux InfiniBand communications an interim \r
+       BSD socket based Connection Manager (sock-cm) is provided. The DAPL \r
+       socket-CM provider is installed as '%SystemRoot%\dapl2-scm.dll' and listed \r
+       in the %SystemDrive%\DAT\dat.conf provider file as 'ibnic0v2-scm'. Both \r
+       nodes must use the same Connection Manager IBAL-CM[ibnic0v2: dapl2.dll] or \r
+       Socket-CM[ibnicv2-scm: dapl2-scm.dll] in order for connections to be \r
+       established.</font></p>\r
        <p align="left"><font face="Courier New" size="2">In order for DAT/uDAPL \r
        programs to execute correctly, the runtime library files 'dat.dll and \r
        dapl.dll' must be present in one of the following folders: current \r

diff --git a/trunk/etc/makebin.bat b/trunk/etc/makebin.bat
index 8db64b1c6a9175a024f93079a63095c1f24ad8db..4d9110db81ff3bed3630d633355fcf16037972c7 100644 (file)
--- a/trunk/etc/makebin.bat
+++ b/trunk/etc/makebin.bat
@@ -66,6 +66,8 @@ xcopy %bin_dir%\datd.pdb   %2\DAPL\amd64\ /y
 \r
 xcopy %bin_dir%\dapl2d.dll %2\DAPL2\amd64\ /y\r
 xcopy %bin_dir%\dapl2d.pdb %2\DAPL2\amd64\ /y\r
+xcopy %bin_dir%\dapl2-scmd.dll %2\DAPL2\amd64\ /y\r
+xcopy %bin_dir%\dapl2-scmd.pdb %2\DAPL2\amd64\ /y\r
 xcopy %bin_dir%\dat2d.dll  %2\DAPL2\amd64\ /y\r
 xcopy %bin_dir%\dat2d.lib  %2\DAPL2\amd64\ /y\r
 xcopy %bin_dir%\dat2d.pdb  %2\DAPL2\amd64\ /y\r
@@ -84,6 +86,8 @@ xcopy %bin_dir%\datd.pdb    %2\DAPL\ia64\ /y
 \r
 xcopy %bin_dir%\dapl2d.dll  %2\DAPL2\ia64\ /y\r
 xcopy %bin_dir%\dapl2d.pdb  %2\DAPL2\ia64\ /y\r
+xcopy %bin_dir%\dapl2-scmd.dll  %2\DAPL2\ia64\ /y\r
+xcopy %bin_dir%\dapl2-scmd.pdb  %2\DAPL2\ia64\ /y\r
 xcopy %bin_dir%\dat2d.dll   %2\DAPL2\ia64\ /y\r
 xcopy %bin_dir%\dat2d.lib   %2\DAPL2\ia64\ /y\r
 xcopy %bin_dir%\dat2d.pdb   %2\DAPL2\ia64\ /y\r
@@ -102,6 +106,8 @@ xcopy %bin_dir%\datd.pdb    %2\DAPL\x86\ /y
 \r
 xcopy %bin_dir%\dapl2d.dll  %2\DAPL2\x86\ /y\r
 xcopy %bin_dir%\dapl2d.pdb  %2\DAPL2\x86\ /y\r
+xcopy %bin_dir%\dapl2-scmd.dll  %2\DAPL2\x86\ /y\r
+xcopy %bin_dir%\dapl2-scmd.pdb  %2\DAPL2\x86\ /y\r
 xcopy %bin_dir%\dat2d.dll   %2\DAPL2\x86\ /y\r
 xcopy %bin_dir%\dat2d.lib   %2\DAPL2\x86\ /y\r
 xcopy %bin_dir%\dat2d.pdb   %2\DAPL2\x86\ /y\r
@@ -143,6 +149,8 @@ xcopy %bin_dir%\dat.pdb   %2\DAPL\amd64\ /y
 \r
 xcopy %bin_dir%\dapl2.dll %2\DAPL2\amd64\ /y\r
 xcopy %bin_dir%\dapl2.pdb %2\DAPL2\amd64\ /y\r
+xcopy %bin_dir%\dapl2-scm.dll %2\DAPL2\amd64\ /y\r
+xcopy %bin_dir%\dapl2-scm.pdb %2\DAPL2\amd64\ /y\r
 xcopy %bin_dir%\dat2.dll  %2\DAPL2\amd64\ /y\r
 xcopy %bin_dir%\dat2.lib  %2\DAPL2\amd64\ /y\r
 xcopy %bin_dir%\dat2.pdb  %2\DAPL2\amd64\ /y\r
@@ -167,6 +175,8 @@ xcopy %bin_dir%\dat.pdb   %2\DAPL\ia64\ /y
 \r
 xcopy %bin_dir%\dapl2.dll %2\DAPL2\ia64\ /y\r
 xcopy %bin_dir%\dapl2.pdb %2\DAPL2\ia64\ /y\r
+xcopy %bin_dir%\dapl2-scm.dll %2\DAPL2\ia64\ /y\r
+xcopy %bin_dir%\dapl2-scm.pdb %2\DAPL2\ia64\ /y\r
 xcopy %bin_dir%\dat2.dll  %2\DAPL2\ia64\ /y\r
 xcopy %bin_dir%\dat2.lib  %2\DAPL2\ia64\ /y\r
 xcopy %bin_dir%\dat2.pdb  %2\DAPL2\ia64\ /y\r
@@ -189,6 +199,8 @@ xcopy %bin_dir%\dat.pdb   %2\DAPL\x86\ /y
 \r
 xcopy %bin_dir%\dapl2.dll %2\DAPL2\x86\ /y\r
 xcopy %bin_dir%\dapl2.pdb %2\DAPL2\x86\ /y\r
+xcopy %bin_dir%\dapl2-scm.dll %2\DAPL2\x86\ /y\r
+xcopy %bin_dir%\dapl2-scm.pdb %2\DAPL2\x86\ /y\r
 xcopy %bin_dir%\dat2.dll  %2\DAPL2\x86\ /y\r
 xcopy %bin_dir%\dat2.lib  %2\DAPL2\x86\ /y\r
 xcopy %bin_dir%\dat2.pdb  %2\DAPL2\x86\ /y\r