[ND/WINVERBS] winverbs/nd: map completion status to ND value convert flushed completi...

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
git-svn-id: svn://openib.tc.cornell.edu/gen1@2666 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/branches/WOF2-2/inc/user/rdma/winverbs.h b/branches/WOF2-2/inc/user/rdma/winverbs.h
index eb73b1bb7901c64bf6ed7bdc1043f72c59fc9897..12542a56f871195277d3ea6b5c7887f1a99b3648 100644 (file)
--- a/branches/WOF2-2/inc/user/rdma/winverbs.h
+++ b/branches/WOF2-2/inc/user/rdma/winverbs.h
@@ -194,6 +194,25 @@ typedef enum _WV_OPCODE
 \r
 }      WV_OPCODE;\r
 \r
+typedef enum _WV_WC_STATUS\r
+{\r
+       WvWcSuccess,\r
+       WvWcLocalLengthError,\r
+       WvWcLocalOpError,\r
+       WvWcLocalProtectionError,\r
+       WvWcFlushed,\r
+       WvWcMwBindError,\r
+       WvWcRemoteAccessError,\r
+       WvWcRemoteOpError,\r
+       WvWcRnrRetryError,\r
+       WvWcTimeoutRetryError,\r
+       WvWcRemoteInvalidRequest,\r
+       WvWcBadResponse,\r
+       WvWcLocalAccessError,\r
+       WvWcError\r
+\r
+}      WV_WC_STATUS;\r
+\r
 // Completion flags\r
 #define WV_WC_IMMEDIATE                0x00000001\r
 // reserved                                    0x00000002\r
@@ -207,7 +226,7 @@ typedef struct _WV_COMPLETION
        WV_OPCODE               Opcode;\r
        UINT32                  Length;\r
        UINT64                  VendorCode;\r
-       HRESULT                 Status;\r
+       WV_WC_STATUS    Status;\r
 \r
        // Receive completion data\r
        DWORD                   Flags;\r

diff --git a/branches/WOF2-2/ulp/libibverbs/include/infiniband/verbs.h b/branches/WOF2-2/ulp/libibverbs/include/infiniband/verbs.h
index b1e448906a0d8cdb54e4e1c259ad8ff81436ae5e..780f938e2f1d4bdefbdb60c965f6f018d59e2d52 100644 (file)
--- a/branches/WOF2-2/ulp/libibverbs/include/infiniband/verbs.h
+++ b/branches/WOF2-2/ulp/libibverbs/include/infiniband/verbs.h
@@ -242,28 +242,29 @@ struct ibv_async_event
 \r
 enum ibv_wc_status\r
 {\r
-       IBV_WC_SUCCESS,\r
-       IBV_WC_LOC_LEN_ERR,\r
-       IBV_WC_LOC_QP_OP_ERR,\r
-       IBV_WC_LOC_PROT_ERR,\r
-       IBV_WC_WR_FLUSH_ERR,\r
-       IBV_WC_MW_BIND_ERR,\r
-       IBV_WC_REM_ACCESS_ERR,\r
-       IBV_WC_REM_OP_ERR,\r
-       IBV_WC_RNR_RETRY_EXC_ERR,\r
-       IBV_WC_RESP_TIMEOUT_ERR,\r
-       IBV_WC_REM_INV_REQ_ERR,\r
-       IBV_WC_BAD_RESP_ERR,\r
-       IBV_WC_LOC_ACCESS_ERR,\r
-       IBV_WC_GENERAL_ERR,\r
-       IBV_WC_FATAL_ERR,\r
-       IBV_WC_RETRY_EXC_ERR,\r
-       IBV_WC_REM_ABORT_ERR,\r
-       IBV_WC_LOC_EEC_OP_ERR,\r
-       IBV_WC_LOC_RDD_VIOL_ERR,\r
-       IBV_WC_REM_INV_RD_REQ_ERR,\r
-       IBV_WC_INV_EECN_ERR,\r
-       IBV_WC_INV_EEC_STATE_ERR\r
+       IBV_WC_SUCCESS                          = WvWcSuccess,\r
+       IBV_WC_LOC_LEN_ERR                      = WvWcLocalLengthError,\r
+       IBV_WC_LOC_QP_OP_ERR            = WvWcLocalOpError,\r
+       IBV_WC_LOC_PROT_ERR                     = WvWcLocalProtectionError,\r
+       IBV_WC_WR_FLUSH_ERR                     = WvWcFlushed,\r
+       IBV_WC_MW_BIND_ERR                      = WvWcMwBindError,\r
+       IBV_WC_REM_ACCESS_ERR           = WvWcRemoteAccessError,\r
+       IBV_WC_REM_OP_ERR                       = WvWcRemoteOpError,\r
+       IBV_WC_RNR_RETRY_EXC_ERR        = WvWcRnrRetryError,\r
+       IBV_WC_RESP_TIMEOUT_ERR         = WvWcTimeoutRetryError,\r
+       IBV_WC_REM_INV_REQ_ERR          = WvWcRemoteInvalidRequest,\r
+       IBV_WC_BAD_RESP_ERR                     = WvWcBadResponse,\r
+       IBV_WC_LOC_ACCESS_ERR           = WvWcLocalAccessError,\r
+       IBV_WC_GENERAL_ERR                      = WvWcError,\r
+       IBV_WC_FATAL_ERR                        = WvWcError,\r
+       IBV_WC_RETRY_EXC_ERR            = WvWcError,\r
+       IBV_WC_REM_ABORT_ERR            = WvWcError,\r
+       IBV_WC_LOC_EEC_OP_ERR           = WvWcError,\r
+       IBV_WC_LOC_RDD_VIOL_ERR         = WvWcError,\r
+       IBV_WC_REM_INV_RD_REQ_ERR       = WvWcError,\r
+       IBV_WC_INV_EECN_ERR                     = WvWcError,\r
+       IBV_WC_INV_EEC_STATE_ERR        = WvWcError\r
+\r
 };\r
 \r
 __declspec(dllexport)\r

diff --git a/branches/WOF2-2/ulp/netdirect/user/nd_cq.cpp b/branches/WOF2-2/ulp/netdirect/user/nd_cq.cpp
index 28aabe5504fa9dcd89cc2347a9457f76c5ad38c7..07dabc23575a14c5e279a59ffccbdf380f5e56ba 100644 (file)
--- a/branches/WOF2-2/ulp/netdirect/user/nd_cq.cpp
+++ b/branches/WOF2-2/ulp/netdirect/user/nd_cq.cpp
@@ -116,6 +116,34 @@ Notify(DWORD Type, OVERLAPPED* pOverlapped)
        return NDConvertWVStatus(hr);\r
 }\r
 \r
+STDMETHODIMP_(HRESULT) CNDCompletionQueue::\r
+ConvertStatus(WV_WC_STATUS Status)\r
+{\r
+       switch (Status) {\r
+       case WvWcSuccess:\r
+               return ND_SUCCESS;\r
+       case WvWcFlushed:\r
+               return ND_CANCELED;\r
+       case WvWcLocalLengthError:\r
+               return ND_LOCAL_LENGTH;\r
+       case WvWcRnrRetryError:\r
+       case WvWcTimeoutRetryError:\r
+               return ND_TIMEOUT;\r
+       case WvWcLocalAccessError:\r
+       case WvWcLocalOpError:\r
+       case WvWcLocalProtectionError:\r
+       case WvWcMwBindError:\r
+               return ND_ACCESS_VIOLATION;\r
+       case WvWcRemoteAccessError:\r
+       case WvWcRemoteOpError:\r
+       case WvWcRemoteInvalidRequest:\r
+       case WvWcBadResponse:\r
+               return ND_REMOTE_ERROR;\r
+       default:\r
+               return ND_INTERNAL_ERROR;\r
+       }\r
+}\r
+\r
 STDMETHODIMP_(SIZE_T) CNDCompletionQueue::\r
 GetResults(ND_RESULT* pResults[], SIZE_T nResults)\r
 {\r
@@ -134,7 +162,7 @@ GetResults(ND_RESULT* pResults[], SIZE_T nResults)
                        if (comp[i].Opcode & WvReceive) {\r
                                pResults[total]->BytesTransferred = comp[i].Length;\r
                        }\r
-                       pResults[total++]->Status = comp[i].Status;\r
+                       pResults[total++]->Status = ConvertStatus(comp[i].Status);\r
                }\r
        }\r
        return total;\r

diff --git a/branches/WOF2-2/ulp/netdirect/user/nd_cq.h b/branches/WOF2-2/ulp/netdirect/user/nd_cq.h
index ba1c91a4b4c2b545bd1758ce983d7863351cfe15..06c4d6c49846e91037fa91626f83a1a58b8b5fbf 100644 (file)
--- a/branches/WOF2-2/ulp/netdirect/user/nd_cq.h
+++ b/branches/WOF2-2/ulp/netdirect/user/nd_cq.h
@@ -90,6 +90,7 @@ public:
 protected:\r
        CNDAdapter                      *m_pAdapter;\r
        STDMETHODIMP            Init(SIZE_T nEntries);\r
+       STDMETHODIMP_(HRESULT) ConvertStatus(WV_WC_STATUS Status);\r
 };\r
 \r
 #endif // _ND_CQ_H_\r