From dec4d2eafebdfe7e6b495a36dd16bd5a98417e04 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Fri, 9 Sep 2005 21:51:58 +0000 Subject: [PATCH] r3349: Update DAPL to match the verbs and CM event processing APIs. Signed-off-by: Sean Hefty Signed-off-by: James Lentini --- dapl/openib/dapl_ib_cm.c | 4 ++-- dapl/openib/dapl_ib_cq.c | 6 ++---- dapl/openib/dapl_ib_util.c | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dapl/openib/dapl_ib_cm.c b/dapl/openib/dapl_ib_cm.c index dcdaf78..4b74ec2 100644 --- 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 4380868..4b0e1f3 100644 --- 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 09fb326..2bcccf3 100644 --- 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); } } -- 2.46.0