From 92944171ac75ca484eefee830620e61f23b85527 Mon Sep 17 00:00:00 2001 From: "U-AMR\\MSHEFTY" Date: Thu, 14 Jan 2010 16:00:22 -0800 Subject: [PATCH] refresh --- meta | 7 ++--- patches/refresh-temp | 66 ------------------------------------------- patches/test-wv-print | 53 +++++++++++++++------------------- 3 files changed, 26 insertions(+), 100 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index a12c7df0..e15970ee 100644 --- a/meta +++ b/meta @@ -1,13 +1,12 @@ Version: 1 -Previous: 7dece8607f1a80f79d602f13dd06604597b8366f -Head: 134800cd26fea68986e2a498a02fc60f3230650d +Previous: e5ad376e7871b759355fbc4b505fed7565f4f6dc +Head: 620d3927137e928de8bbfac781d40b95c14cab33 Applied: getopt: c7fe4c8b921fb8baef915df044dbcb0f678f1770 rm-build: 065e916eb4f6b5b133e705a6af588c318ed512c6 delete-crit: b1b14d55af910e494e2c705843af6b40ae2efdd7 rm-ibal: 74f3d19dd5cd35e1f5d8e1544dd95e06448b628d - test-wv-print: 920f01bdfee37e0ac648aceedbe9d590ef5f4b08 - refresh-temp: 134800cd26fea68986e2a498a02fc60f3230650d + test-wv-print: 620d3927137e928de8bbfac781d40b95c14cab33 Unapplied: test-qp-destroy: 576c1450180c8f40873593335a5d73204f735f2a test-nd-times: 7b3cb2057aee2bf0853a0fbc89d76624ab5a10c0 diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 9c5127ef..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,66 +0,0 @@ -Bottom: a398331327435ad917a11038ce588cfb4714c78c -Top: fdb25b67d7a56852df1568a62f3accba8919125e -Author: U-AMR\MSHEFTY -Date: 2010-01-14 16:00:17 -0800 - -Refresh of test-wv-print - ---- - -diff --git a/trunk/core/winverbs/user/wv_base.h b/trunk/core/winverbs/user/wv_base.h -index f37cf96..d41a5ee 100644 ---- a/trunk/core/winverbs/user/wv_base.h -+++ b/trunk/core/winverbs/user/wv_base.h -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - - #include - #include -diff --git a/trunk/core/winverbs/user/wv_ep.cpp b/trunk/core/winverbs/user/wv_ep.cpp -index fe918db..28d2f7d 100644 ---- a/trunk/core/winverbs/user/wv_ep.cpp -+++ b/trunk/core/winverbs/user/wv_ep.cpp -@@ -32,7 +32,6 @@ - #include "wv_ep.h" - #include "wv_ioctl.h" - #include "wv_qp.h" --#include - - static void WvIoConvertConnParam(WV_IO_CONNECT_PARAM *pIoParam, - WV_CONNECT_PARAM *pParam) -@@ -191,8 +190,6 @@ BindAddress(SOCKADDR* pAddress) - } - } - --if (((SOCKADDR_IN *) pAddress)->sin_port == htons(9898)) { --printf("binding address with port 9898\n"); - m_Socket = socket(pAddress->sa_family, SOCK_STREAM, IPPROTO_TCP); - if (m_Socket == INVALID_SOCKET) { - return WvConvertWSAStatus(WSAGetLastError()); -@@ -209,10 +206,6 @@ printf("binding address with port 9898\n"); - if (FAILED(hr)) { - goto get_err; - } --} else { -- attr.Id = m_Id; -- memcpy(&attr.Address, pAddress, bytes); --} - - if (!WvDeviceIoControl(m_hFile, WV_IOCTL_EP_BIND, &attr, sizeof attr, - &attr, sizeof attr, &bytes, NULL)) { -diff --git a/trunk/core/winverbs/user/wv_qp.cpp b/trunk/core/winverbs/user/wv_qp.cpp -index dd1038c..57d2403 100644 ---- a/trunk/core/winverbs/user/wv_qp.cpp -+++ b/trunk/core/winverbs/user/wv_qp.cpp -@@ -305,6 +305,8 @@ CWVQueuePair::~CWVQueuePair() - hr = WvDeviceIoControl(m_hFile, WV_IOCTL_QP_DESTROY, &m_Id, sizeof m_Id, - NULL, 0, &bytes, NULL) ? - WV_SUCCESS : HRESULT_FROM_WIN32(GetLastError()); -+if (hr) -+printf("~CWVQueuePair() failed: 0x%x\n", hr); - m_pVerbs->post_destroy_qp(m_hVerbsQp, (ib_api_status_t) hr); - } - ReleaseReferences(); diff --git a/patches/test-wv-print b/patches/test-wv-print index f5848361..cb1e8a01 100644 --- a/patches/test-wv-print +++ b/patches/test-wv-print @@ -1,5 +1,5 @@ Bottom: 2be0d741ab78101a493bb10c5f93ba8499dce21a -Top: a398331327435ad917a11038ce588cfb4714c78c +Top: fdb25b67d7a56852df1568a62f3accba8919125e Author: U-AMR\MSHEFTY Date: 2010-01-14 11:24:10 -0800 @@ -21,35 +21,28 @@ index 6939d1e..33fa883 100644 SOURCES = \ winverbs.rc \ -diff --git a/trunk/core/winverbs/user/wv_ep.cpp b/trunk/core/winverbs/user/wv_ep.cpp -index 28d2f7d..fe918db 100644 ---- a/trunk/core/winverbs/user/wv_ep.cpp -+++ b/trunk/core/winverbs/user/wv_ep.cpp -@@ -32,6 +32,7 @@ - #include "wv_ep.h" - #include "wv_ioctl.h" - #include "wv_qp.h" +diff --git a/trunk/core/winverbs/user/wv_base.h b/trunk/core/winverbs/user/wv_base.h +index f37cf96..d41a5ee 100644 +--- a/trunk/core/winverbs/user/wv_base.h ++++ b/trunk/core/winverbs/user/wv_base.h +@@ -35,6 +35,7 @@ + #include + #include + #include +#include - static void WvIoConvertConnParam(WV_IO_CONNECT_PARAM *pIoParam, - WV_CONNECT_PARAM *pParam) -@@ -190,6 +191,8 @@ BindAddress(SOCKADDR* pAddress) - } + #include + #include +diff --git a/trunk/core/winverbs/user/wv_qp.cpp b/trunk/core/winverbs/user/wv_qp.cpp +index dd1038c..57d2403 100644 +--- a/trunk/core/winverbs/user/wv_qp.cpp ++++ b/trunk/core/winverbs/user/wv_qp.cpp +@@ -305,6 +305,8 @@ CWVQueuePair::~CWVQueuePair() + hr = WvDeviceIoControl(m_hFile, WV_IOCTL_QP_DESTROY, &m_Id, sizeof m_Id, + NULL, 0, &bytes, NULL) ? + WV_SUCCESS : HRESULT_FROM_WIN32(GetLastError()); ++if (hr) ++printf("~CWVQueuePair() failed: 0x%x\n", hr); + m_pVerbs->post_destroy_qp(m_hVerbsQp, (ib_api_status_t) hr); } - -+if (((SOCKADDR_IN *) pAddress)->sin_port == htons(9898)) { -+printf("binding address with port 9898\n"); - m_Socket = socket(pAddress->sa_family, SOCK_STREAM, IPPROTO_TCP); - if (m_Socket == INVALID_SOCKET) { - return WvConvertWSAStatus(WSAGetLastError()); -@@ -206,6 +209,10 @@ BindAddress(SOCKADDR* pAddress) - if (FAILED(hr)) { - goto get_err; - } -+} else { -+ attr.Id = m_Id; -+ memcpy(&attr.Address, pAddress, bytes); -+} - - if (!WvDeviceIoControl(m_hFile, WV_IOCTL_EP_BIND, &attr, sizeof attr, - &attr, sizeof attr, &bytes, NULL)) { + ReleaseReferences(); -- 2.46.0