[OFED\WIX] add winverbs+rdma_cm example to OFED SDK feature.

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

diff --git a/trunk/OFED/WIX/SDK_Samples/rdma_bw/Makefile.x64 b/trunk/OFED/WIX/SDK_Samples/rdma_bw/Makefile.x64
new file mode 100644 (file)
index 0000000..e6bcf08
--- /dev/null
+++ b/trunk/OFED/WIX/SDK_Samples/rdma_bw/Makefile.x64
@@ -0,0 +1,101 @@
+#\r
+#*********************************************************************\r
+# \r
+# NMAKE Options (passed as macro) \r
+#\r
+# Select a Visual Studio command window from the start menu\r
+# vcvarsall X64         - sets X64 processor compilation env, X86 | IA64\r
+#\r
+#*********************************************************************/\r
+\r
+\r
+#*********************************************************************\r
+# \r
+# Dot Directives\r
+#\r
+#*********************************************************************/\r
+\r
+.SUFFIXES :            # clear the .SUFFIXES list\r
+.SUFFIXES : .c .rc     # initialize .SUFFIXES list\r
+\r
+\r
+#*********************************************************************\r
+# \r
+# Macros\r
+#\r
+#*********************************************************************/\r
+\r
+PGM=ibv_rdma_bw\r
+\r
+LIB_PATH=%SystemDrive%\OFED_SDK\Lib\r
+INC_PATH=%SystemDrive%\OFED_SDK\Inc\r
+\r
+IB_LIBS=libibverbs.lib librdmacm.lib\r
+\r
+DEFS= /D_WIN64 /D_X64_ /D_AMD64_\r
+\r
+ARCH=x64\r
+\r
+OBJS = rdma_bw.obj perftest.obj rdma_bw.res\r
+EXEC = $(PGM).exe\r
+\r
+#\r
+# Compiler \r
+#\r
+\r
+CC = cl\r
+\r
+INC_FLAGS = /I $(INC_PATH)\r
+RFLAGS=/r /i $(INC_PATH)\r
+\r
+UNUSED_CL=/Zp1 /Od\r
+UNUSED_LINKER= /DEBUG /incremental:no\r
+\r
+CC_FLAGS= /nologo /Gy /W3 /Gm- \\r
+       /GR- /GF  /O2 /Oi /Oy- /D_CRT_SECURE_NO_WARNINGS \\r
+       $(DEFS) $(INC_FLAGS)\r
+\r
+#\r
+# Linker\r
+#\r
+\r
+LINK = link \r
+\r
+LIBS =         ws2_32.lib advapi32.lib User32.lib\r
+\r
+LINK_FLAGS = /nologo /subsystem:console /machine:$(ARCH) $(LIBS) \\r
+               /libpath:$(LIB_PATH) $(IB_LIBS)\r
+\r
+#\r
+# System Utilities\r
+#\r
+\r
+RM = del /Q\r
+\r
+\r
+#*********************************************************************\r
+# Inference Rules\r
+#\r
+#*********************************************************************/\r
+\r
+.c.obj:\r
+       $(CC) $(CC_FLAGS) /Fo$@ /c $< \r
+\r
+.rc.res:\r
+       $(RC)  $(RFLAGS) $<\r
+\r
+\r
+#*********************************************************************\r
+#\r
+# Description Blocks\r
+#\r
+#*********************************************************************/\r
+\r
+all : $(EXEC)\r
+\r
+\r
+$(EXEC) : $(OBJS) $0\r
+       $(LINK) $(LINK_FLAGS) /out:$(EXEC) $(OBJS)\r
+\r
+clean: \r
+       -$(RM) *.exe *.pdb *.obj *.res\r

diff --git a/trunk/OFED/WIX/SDK_Samples/rdma_bw/Makefile.x86 b/trunk/OFED/WIX/SDK_Samples/rdma_bw/Makefile.x86
new file mode 100644 (file)
index 0000000..f4ce61d
--- /dev/null
+++ b/trunk/OFED/WIX/SDK_Samples/rdma_bw/Makefile.x86
@@ -0,0 +1,101 @@
+#\r
+#*********************************************************************\r
+# \r
+# NMAKE Options (passed as macro) \r
+#\r
+# Select a Visual Studio command window from the start menu\r
+# vcvarsall X64         - sets X64 processor compilation env, X86 | IA64\r
+#\r
+#*********************************************************************/\r
+\r
+\r
+#*********************************************************************\r
+# \r
+# Dot Directives\r
+#\r
+#*********************************************************************/\r
+\r
+.SUFFIXES :            # clear the .SUFFIXES list\r
+.SUFFIXES : .c .rc     # initialize .SUFFIXES list\r
+\r
+\r
+#*********************************************************************\r
+# \r
+# Macros\r
+#\r
+#*********************************************************************/\r
+\r
+PGM=ibv_rdma_bw\r
+\r
+LIB_PATH=%SystemDrive%\OFED_SDK\Lib\r
+INC_PATH=%SystemDrive%\OFED_SDK\Inc\r
+\r
+IB_LIBS=libibverbs.lib librdmacm.lib\r
+\r
+DEFS= /D_WIN32\r
+\r
+ARCH=x86\r
+\r
+OBJS = rdma_bw.obj perftest.obj rdma_bw.res\r
+EXEC = $(PGM).exe\r
+\r
+#\r
+# Compiler \r
+#\r
+\r
+CC = cl\r
+\r
+INC_FLAGS = /I $(INC_PATH)\r
+RFLAGS=/r /i $(INC_PATH)\r
+\r
+UNUSED_CL=/Zp1 /Od\r
+UNUSED_LINKER= /DEBUG /incremental:no\r
+\r
+CC_FLAGS= /nologo /Gy /W3 /Gm- \\r
+       /GR- /GF  /O2 /Oi /Oy- /D_CRT_SECURE_NO_WARNINGS \\r
+       $(DEFS) $(INC_FLAGS)\r
+\r
+#\r
+# Linker\r
+#\r
+\r
+LINK = link \r
+\r
+LIBS =         ws2_32.lib advapi32.lib User32.lib\r
+\r
+LINK_FLAGS = /nologo /subsystem:console /machine:$(ARCH) $(LIBS) \\r
+               /libpath:$(LIB_PATH) $(IB_LIBS)\r
+\r
+#\r
+# System Utilities\r
+#\r
+\r
+RM = del /Q\r
+\r
+\r
+#*********************************************************************\r
+# Inference Rules\r
+#\r
+#*********************************************************************/\r
+\r
+.c.obj:\r
+       $(CC) $(CC_FLAGS) /Fo$@ /c $< \r
+\r
+.rc.res:\r
+       $(RC)  $(RFLAGS) $<\r
+\r
+\r
+#*********************************************************************\r
+#\r
+# Description Blocks\r
+#\r
+#*********************************************************************/\r
+\r
+all : $(EXEC)\r
+\r
+\r
+$(EXEC) : $(OBJS) $0\r
+       $(LINK) $(LINK_FLAGS) /out:$(EXEC) $(OBJS)\r
+\r
+clean: \r
+       -$(RM) *.exe *.pdb *.obj *.res\r

diff --git a/trunk/OFED/WIX/SDK_Samples/rdma_bw/README.txt b/trunk/OFED/WIX/SDK_Samples/rdma_bw/README.txt
new file mode 100644 (file)
index 0000000..dd49aa0
--- /dev/null
+++ b/trunk/OFED/WIX/SDK_Samples/rdma_bw/README.txt
@@ -0,0 +1,60 @@
+\r
+Visual Studio (C++) Build Environment [4-07-10]\r
+-----------------------------------------------------------------\r
+\r
+Install Microsoft Visual Studio 10 (C++ env)\r
+\r
+\r
+**** WARNING - win32 application building ****\r
+\r
+Disregard if building x64 application.\r
+\r
+The Visual Studio default x86 calling convention is '__cdecl' (/Gd).\r
+The 32-bit versions of ibal32.lib & complib32.lib are built using '__stdcall'\r
+as the default calling convention (AL_API & CL_API).\r
+Make _sure_ 'all' user-defined ibal and complib callback routines match the\r
+callback function declaration [AL_API or CL_API calling conventions].\r
+The VS compiler will note a C-style cast is required if the calling conventions\r
+do not match.\r
+The other option is to force __stdcall (/Gz) as the 'default' calling\r
+convention for your 'win32' InfiniBand application.\r
+\r
+\r
+Building rdma_bw test example from a cmd.exe window\r
+----------------------------------------------\r
+\r
+\r
+cd to %SystemDrive%\OFED_SDK\Samples\rdma_bw\r
+\r
+\r
+Makefile Solution\r
+-----------------\r
+\r
+Assuming Visual Studio is installed, select a Visual Studio x64 command\r
+window from the start menu.\r
+\r
+nmake -f Makefile.x64\r
+\r
+If building a win32 application on a 64-bit platform then link with\r
+lbal32[d].lib & complib32[d].lib.\r
+\r
+\r
+Executing ibv_rdma_bw.exe\r
+--------------------\r
+\r
+  'ibv_rdma_bw -h' tells the story...\r
+\r
+Example ibv_rdma_bw invocation: local loopback test\r
+\r
+\r
+Separate processes for server & client (different cmd windows).\r
+\r
+server:    ibv_rdma_bw \r
+client:    ibv_rdma_bw -h <ethernet-hostname>\r
+\r
+\r
+Example using rdma_cm over IPoIB interface\r
+\r
+server:    ibv_rdma_bw -c\r
+client:    ibv_rdma_bw -c -h IPoIB-IF-IPv4-address\r
+\r

diff --git a/trunk/OFED/WIX/SDK_Samples/rdma_bw/rdma_bw.rc b/trunk/OFED/WIX/SDK_Samples/rdma_bw/rdma_bw.rc
new file mode 100644 (file)
index 0000000..9badd59
--- /dev/null
+++ b/trunk/OFED/WIX/SDK_Samples/rdma_bw/rdma_bw.rc
@@ -0,0 +1,48 @@
+/*\r
+ * This software is available to you under the OpenFabrics Alliance BSD license\r
+ * below:\r
+ *\r
+ *     Redistribution and use in source and binary forms, with or\r
+ *     without modification, are permitted provided that the following\r
+ *     conditions are met:\r
+ *\r
+ *      - Redistributions of source code must retain the above\r
+ *        copyright notice, this list of conditions and the following\r
+ *        disclaimer.\r
+ *\r
+ *      - Redistributions in binary form must reproduce the above\r
+ *        copyright notice, this list of conditions and the following\r
+ *        disclaimer in the documentation and/or other materials\r
+ *        provided with the distribution.\r
+ *\r
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\r
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\r
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS\r
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN\r
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\r
+ * SOFTWARE.\r
+ */\r
+\r
+#define VER_FILEMAJORVERSION 2\r
+#define VER_FILEMINORVERSION 2\r
+#define VER_FILEBUILD 1\r
+#define VER_FILEREV 1\r
+#define IB_COMPANYNAME "OpenFabrics Alliance"\r
+#define IB_PRODUCTNAME "OpenFabrics\x20Windows"\r
+\r
+#include <oib_ver.h>\r
+\r
+#define VER_FILETYPE                   VFT_APP\r
+#define VER_FILESUBTYPE                        VFT2_UNKNOWN\r
+\r
+#ifdef DBG\r
+#define VER_FILEDESCRIPTION_STR                "winverbs - RDMA Bandwidth Test (Debug)"\r
+#else\r
+#define VER_FILEDESCRIPTION_STR                "winverbs - RDMA Bandwidth Test "\r
+#endif\r
+\r
+#define VER_INTERNALNAME_STR           "ibv_rdma_bw.exe"\r
+#define VER_ORIGINALFILENAME_STR       "ibv_rdma_bw.exe"\r
+\r

diff --git a/trunk/OFED/WIX/common/ib_sdk.inc b/trunk/OFED/WIX/common/ib_sdk.inc
index db82561c08c323526e05938a3a493a9bab515677..3df0248742d930e69f164e919d74d2f47a64e847 100644 (file)
--- a/trunk/OFED/WIX/common/ib_sdk.inc
+++ b/trunk/OFED/WIX/common/ib_sdk.inc
@@ -445,8 +445,8 @@
     </Directory>\r
 \r
     <Directory Id="IB_samples" Name="Samples">\r
-      <Directory Id="sample_DDK" Name="DDK">\r
-        <Component Id="cDDK_example"\r
+      <Directory Id="sample_WDK" Name="WDK">\r
+        <Component Id="cWDK_example"\r
                    Guid="8C27B926-FCFE-4f46-83B4-A27482A5EB3B">\r
           <CreateFolder />\r
               <File Id="cmtest.c" DiskId="1"\r
@@ -454,21 +454,21 @@
                     Source="..\bin\misc\cmtest.c" />\r
               <File Id="cmtest.rc" DiskId="1"\r
                     Name="cmtest.rc"\r
-                    Source="..\..\SDK_Samples\DDK\cmtest.rc" />\r
+                    Source="..\..\SDK_Samples\WDK\cmtest.rc" />\r
               <File Id="makefile" DiskId="1"\r
                     Name="makefile"\r
-                    Source="..\..\SDK_Samples\DDK\makefile" />\r
+                    Source="..\..\SDK_Samples\WDK\makefile" />\r
               <File Id="SOURCES" DiskId="1"\r
                     Name="SOURCES"\r
-                    Source="..\..\SDK_Samples\DDK\SOURCES" />\r
+                    Source="..\..\SDK_Samples\WDK\SOURCES" />\r
               <File Id="README.txt" DiskId="1"\r
                     Name="README.txt"\r
-                    Source="..\..\SDK_Samples\DDK\README.txt" />\r
+                    Source="..\..\SDK_Samples\WDK\README.txt" />\r
         </Component>\r
-      </Directory>    <!-- End DDK -->\r
+      </Directory>    <!-- End WDK -->\r
 \r
-      <Directory Id="sample_VS" Name="VS">\r
-        <Component Id="cVS_example"\r
+      <Directory Id="sample_VS_bld1" Name="cmtest">\r
+        <Component Id="cVS_bld_example1"\r
                    Guid="35E03D7E-E943-4346-8F63-7E991AF68F53">\r
           <CreateFolder />\r
               <File Id="vs_cmtest.c" DiskId="1"\r
@@ -476,21 +476,53 @@
                     Source="..\bin\misc\cmtest.c" />\r
               <File Id="vs_cmtest.rc" DiskId="1"\r
                     Name="cmtest.rc"\r
-                    Source="..\..\SDK_Samples\VS\cmtest.rc" />\r
+                    Source="..\..\SDK_Samples\cmtest\cmtest.rc" />\r
               <File Id="vsREADME.txt" DiskId="1"\r
                     Name="README.txt"\r
-                    Source="..\..\SDK_Samples\VS\README.txt" />\r
+                    Source="..\..\SDK_Samples\cmtest\README.txt" />\r
               <?if $(var.ARCHP) = "x64" Or $(var.ARCHP) = "ia64" ?>\r
-                  <File Id="Makefile.x64" DiskId="1"\r
-                        Name="Makefile.x64"\r
-                        Source="..\..\SDK_Samples\VS\Makefile.x64" />\r
+                  <File Id="Makefile.cmtest" DiskId="1"\r
+                        Name="Makefile"\r
+                        Source="..\..\SDK_Samples\cmtest\Makefile.x64" />\r
               <?else?>\r
-                  <File Id="Makefile.x64" DiskId="1"\r
-                        Name="Makefile.x64"\r
-                        Source="..\..\SDK_Samples\VS\Makefile.x86" />\r
+                  <File Id="Makefile.cmtest" DiskId="1"\r
+                        Name="Makefile"\r
+                        Source="..\..\SDK_Samples\cmtest\Makefile.x86" />\r
               <?endif?>\r
         </Component>\r
-      </Directory>   <!-- End VS -->\r
+      </Directory>   <!-- End VS_bld_example1 -->\r
+\r
+      <Directory Id="sample_VS_bld2" Name="rdma_bw">\r
+        <Component Id="cVS_bld_example2"\r
+                   Guid="CA59CFD2-D51B-4392-8827-E9DFE9AD036F">\r
+          <CreateFolder />\r
+              <File Id="vs_perftest.c" DiskId="1"\r
+                    Name="perftest.c"\r
+                    Source="..\..\..\..\tests\perftest\perftest.c" />\r
+              <File Id="vs_perftest.h" DiskId="1"\r
+                    Name="perftest.h"\r
+                    Source="..\..\..\..\tests\perftest\perftest.h" />\r
+              <File Id="vs_rdma_bw.c" DiskId="1"\r
+                    Name="rdma_bw.c"\r
+                    Source="..\..\..\..\tests\perftest\rdma_bw\rdma_bw.c" />\r
+              <File Id="vs_rdma_bw.rc" DiskId="1"\r
+                    Name="rdma_bw.rc"\r
+                    Source="..\..\SDK_Samples\rdma_bw\rdma_bw.rc" />\r
+              <File Id="vsREADME_rdma_bw.txt" DiskId="1"\r
+                    Name="README.txt"\r
+                    Source="..\..\SDK_Samples\rdma_bw\README.txt" />\r
+              <?if $(var.ARCHP) = "x64" Or $(var.ARCHP) = "ia64" ?>\r
+                  <File Id="Makefile.rdma_bw" DiskId="1"\r
+                        Name="Makefile"\r
+                        Source="..\..\SDK_Samples\rdma_bw\Makefile.x64" />\r
+              <?else?>\r
+                  <File Id="Makefile.rdma_bw" DiskId="1"\r
+                        Name="Makefile"\r
+                        Source="..\..\SDK_Samples\rdma_bw\Makefile.x86" />\r
+              <?endif?>\r
+        </Component>\r
+      </Directory>   <!-- End VS_bld_example2 -->\r
+\r
     </Directory>   <!-- End Samples -->\r
 \r
   </Directory>\r

diff --git a/trunk/OFED/WIX/common/std_features.inc b/trunk/OFED/WIX/common/std_features.inc
index 97958a91834be19de7068f0bd36d4990dbfffd57..d0543fcb867f996d03e21a178b36d9696eee81dd 100644 (file)
--- a/trunk/OFED/WIX/common/std_features.inc
+++ b/trunk/OFED/WIX/common/std_features.inc
@@ -151,8 +151,9 @@
       <ComponentRef Id="cINC_linux_netinet" />\r
       <ComponentRef Id="cINC_linux_sys" />\r
       <ComponentRef Id="cINC_user_rdma" />\r
-      <ComponentRef Id="cDDK_example" />\r
-      <ComponentRef Id="cVS_example" />\r
+      <ComponentRef Id="cWDK_example" />\r
+      <ComponentRef Id="cVS_bld_example1" />\r
+      <ComponentRef Id="cVS_bld_example2" />\r
     </Feature>\r
 \r
     <Feature Id="fCHECKED" Title="Debug/Checked Modules"\r