r3349: Update DAPL to match the verbs and CM event processing APIs.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: James Lentini <jlentini@netapp.com>

diff --git a/dapl/openib/dapl_ib_cm.c b/dapl/openib/dapl_ib_cm.c
index dcdaf785e05190a441dee337628e16aa76e68778..4b74ec249a828f38561562fe0b16c5518d7fd6a9 100644 (file)
--- a/dapl/openib/dapl_ib_cm.c
+++ b/dapl/openib/dapl_ib_cm.c
@@ -1199,7 +1199,7 @@ void dapli_cm_event_cb()
        dapl_dbg_log(DAPL_DBG_TYPE_UTIL, " dapli_cm_event()\n");
 
        /* process one CM event, fairness */
-       if(!ib_cm_event_get_timed(0,&event)) {
+       if(!ib_cm_get_event_timed(0,&event)) {
                struct dapl_cm_id       *conn;
                int                     ret;
                dapl_dbg_log(DAPL_DBG_TYPE_CM,
@@ -1215,7 +1215,7 @@ void dapli_cm_event_cb()
                else 
                        ret = dapli_cm_active_cb(conn,event);
                
-               ib_cm_event_put(event);
+               ib_cm_ack_event(event);
 
                if (ret) 
                        ib_cm_destroy_id(conn->cm_id);

diff --git a/dapl/openib/dapl_ib_cq.c b/dapl/openib/dapl_ib_cq.c
index 43808681e8989649e30f06c12e0d62fa253d1e50..4b0e1f341e73337ce4b021d641268d2318efd338 100644 (file)
--- a/dapl/openib/dapl_ib_cq.c
+++ b/dapl/openib/dapl_ib_cq.c
@@ -71,10 +71,6 @@ void dapli_cq_event_cb(struct _ib_hca_transport *hca)
                        (!ibv_get_cq_event(hca->ib_ctx, i, 
                                           &ibv_cq, (void*)&evd_ptr))) {
 
-                       /* 
-                        * TODO: ibv put event to protect against
-                        * destroy CQ race conditions?
-                        */
                        if (DAPL_BAD_HANDLE(evd_ptr, DAPL_MAGIC_EVD))
                                continue;
 
@@ -82,6 +78,8 @@ void dapli_cq_event_cb(struct _ib_hca_transport *hca)
                        dapl_evd_dto_callback ( hca->ib_ctx,
                                                evd_ptr->ib_cq_handle,
                                                (void*)evd_ptr );
+
+                       ibv_ack_cq_events(ibv_cq, 1);
                } 
        }
 }

diff --git a/dapl/openib/dapl_ib_util.c b/dapl/openib/dapl_ib_util.c
index 09fb32611c878e0be2516216b6e870692cb7c3d8..2bcccf3c6de14b39aa4fb17232eba0a79e6bc316 100644 (file)
--- a/dapl/openib/dapl_ib_util.c
+++ b/dapl/openib/dapl_ib_util.c
@@ -626,7 +626,7 @@ void dapli_async_event_cb(struct _ib_hca_transport *hca)
                                break;
                        }
                }
-               ibv_put_async_event(&event);
+               ibv_ack_async_event(&event);
        }
 }