[ofa-general] [PATCH 05/11] uDAPL winof: fix build issues after consolidating cma, scm code base.

Davis, Arlin R arlin.r.davis at intel.com
Mon Jul 6 12:52:08 PDT 2009



Signed-off-by: Arlin Davis <arlin.r.davis at intel.com>
---
 dapl/common/dapl_debug.c                |    1 -
 dapl/openib_cma/SOURCES                 |    8 +--
 dapl/openib_common.c                    |    6 ++
 dapl/openib_scm/SOURCES                 |    6 +--
 dat/udat/udat_exports.src               |    1 +
 test/dapltest/scripts/dt-regression.bat |   88 -------------------------------
 6 files changed, 10 insertions(+), 100 deletions(-)
 create mode 100644 dapl/openib_common.c
 delete mode 100644 test/dapltest/scripts/dt-regression.bat

diff --git a/dapl/common/dapl_debug.c b/dapl/common/dapl_debug.c
index 18b6e7e..960bc00 100644
--- a/dapl/common/dapl_debug.c
+++ b/dapl/common/dapl_debug.c
@@ -198,7 +198,6 @@ char *dapl_query_counter_name(DAT_HANDLE dh, int counter)
 	return NULL;
 }
 
-#include <inttypes.h>
 void dapl_print_counter(DAT_HANDLE dh, int counter, int reset)
 {
 	int i, max;
diff --git a/dapl/openib_cma/SOURCES b/dapl/openib_cma/SOURCES
index f1c5002..d6b97a2 100644
--- a/dapl/openib_cma/SOURCES
+++ b/dapl/openib_cma/SOURCES
@@ -20,11 +20,7 @@ SOURCES = \
 	udapl.rc \
 	..\dapl_common_src.c			\
 	..\dapl_udapl_src.c			\
-	..\openib_common\mem.c			\
-	..\openib_common\util.c			\
-	..\openib_common\cq.c			\
-	..\openib_common\qp.c			\
-	..\openib_common\ib_extensions.c	\
+	..\openib_common.c 			\
 	device.c				\
 	cm.c
 
@@ -33,7 +29,7 @@ INCLUDES = ..\include;..\openib_common;..\common;windows;..\..\dat\include;\
 		   ..\..\..\..\inc;..\..\..\..\inc\user;..\..\..\libibverbs\include;\
 		   ..\..\..\librdmacm\include
 
-DAPL_OPTS = -DEXPORT_DAPL_SYMBOLS -DDAT_EXTENSIONS -DOPENIB
+DAPL_OPTS = -DEXPORT_DAPL_SYMBOLS -DDAT_EXTENSIONS -DOPENIB -DCQ_WAIT_OBJECT #-DDAPL_COUNTERS
 
 USER_C_FLAGS = $(USER_C_FLAGS) $(DAPL_OPTS)
 
diff --git a/dapl/openib_common.c b/dapl/openib_common.c
new file mode 100644
index 0000000..336eff9
--- /dev/null
+++ b/dapl/openib_common.c
@@ -0,0 +1,6 @@
+
+#include "openib_common\mem.c"
+#include "openib_common\util.c"
+#include "openib_common\cq.c"
+#include "openib_common\qp.c"
+#include "openib_common\ib_extensions.c"
diff --git a/dapl/openib_scm/SOURCES b/dapl/openib_scm/SOURCES
index 5714aa3..6e4ad30 100644
--- a/dapl/openib_scm/SOURCES
+++ b/dapl/openib_scm/SOURCES
@@ -20,11 +20,7 @@ SOURCES = \
 	udapl.rc \
 	..\dapl_common_src.c             \
 	..\dapl_udapl_src.c              \
-        ..\openib_common\mem.c           \
-        ..\openib_common\util.c          \
-        ..\openib_common\cq.c            \
-        ..\openib_common\qp.c            \
-        ..\openib_common\ib_extensions.c \
+        ..\openib_common.c               \
         device.c                         \
         cm.c
 
diff --git a/dat/udat/udat_exports.src b/dat/udat/udat_exports.src
index 42e3773..32b29ff 100644
--- a/dat/udat/udat_exports.src
+++ b/dat/udat/udat_exports.src
@@ -51,6 +51,7 @@ dat_rsp_create
 dat_rsp_free
 dat_rsp_query
 dat_strerror
+dat_get_handle_type
 dats_get_ia_handle
 #ifdef DAT_EXTENSIONS
 dat_extension_op
diff --git a/test/dapltest/scripts/dt-regression.bat b/test/dapltest/scripts/dt-regression.bat
deleted file mode 100644
index 6d7c65d..0000000
--- a/test/dapltest/scripts/dt-regression.bat
+++ /dev/null
@@ -1,88 +0,0 @@
- at echo off
-rem
-rem DAPLtest regression test client - requires a running DAPLtest server.
-rem   Usage: dt-regression.bat hostname [anything == no pause after test]
-rem
-rem run various Dapl tests via the dapltest server running somewhere network accesible
-rem
-
-SETLOCAL
-
-set D=ibnic0
-set TO=3
-
-if "%*" EQU "" (
-    set /P S= [DAPLtest Server-Hostname]
-) else (
-    if "%1" EQU "" (
-        echo "Usage: %0 dapltest-hostname "
-        exit /B
-    )
-    set S=%1
-    if "%2" NEQ "" (
-        set TO=0
-    )
-)
-
-rem 0xfff
-set X=
-if not "%X%" == "" (
-    set DAT_OS_DBG_TYPE=%X%
-    set DAT_DBG_TYPE=%X%
-    set DAT_DBG_LEVEL=%X%
-    set DAPL_DBG_LEVEL=%X%
-    set DAPL_DBG_TYPE=%X%
-)
-
-rem set DAT_OVERRIDE=D:\dapl2\dat.conf
-set ITR=25000
-
-rem dapltest debug - set DB= -d
-
-set DT=dapl2test.exe
-
-echo ----- Connectivity
-rem Connectivity test - client sends one buffer with one 4KB segments, 50 times.
-rem add '-d' for debug output.
-%DT% -T T %DB% -s %S% -D %D% -i 50 -t 1 -w 1 client SR 4096 server SR 4096
-IF %ERRORLEVEL% NEQ 0 exit /B
-echo Connectivity test Finished.
-if %TO% GTR 0 timeout /T 5
-
-echo ----- Transaction test: %ITR% iterations
-%DT% -T T %DB% -s %S% -D %D% -i %ITR% -t 1 -w 1 client SR 4096 server SR 4096
-IF %ERRORLEVEL% NEQ 0 exit /B
-echo Transaction test - 500 iterations, Finished
-if %TO% GTR 0 timeout /T 5
-
-echo ----- Performance test: %ITR% iterations
-%DT% -T P %DB% -s %S% -D %D% -i %ITR% RW 4096 2
-IF %ERRORLEVEL% NEQ 0 exit /B
-echo Perf test Finished.
-if %TO% GTR 0 timeout /T 5
-
-echo ----- RDMA-read test: %ITR% iterations
-%DT% -T P %DB% -s %S% -D %D% -i %ITR% RR 4096 2
-IF %ERRORLEVEL% NEQ 0 exit /B
-echo RDMA-read Finished.
-if %TO% GTR 0 timeout /T 5
-
-echo ----- RDMA-write test: %ITR% iterations
-%DT% -T P %DB% -s %S% -D %D% -i %ITR% RW 4096 2
-IF %ERRORLEVEL% NEQ 0 exit /B
-echo RDMA-write Finished.
-if %TO% GTR 0 timeout /T 5
-
-rem %DT% -T T -V -d -t 2 -w 2 -i 1000111 -s %S% -D %D% 
-rem           client RW  4096 1    server RW  2048 4 
-rem           client RR  1024 2    server RR  2048 2 
-rem           client SR  1024 3 -f server SR   256 3 -f
-
-rem %DT% -T T -P -d -t 1 -w 1 -i 1024 -s %S% -D %D%
-rem             client RW  4096 1    server RW  2048 4 
-rem             server RR  1024 2    client RR  2048 2 
-rem             client SR  1024 3 -f server SR   256 3 -f
-
-ENDLOCAL
-
- at echo on
-- 
1.5.2.5




More information about the general mailing list