[DAPL2] DAPL Counters & 2.0.3 extensions to support counter retrieval.
[mirror/winof/.git] / ulp / dapl2 / dapl / udapl / dapl_evd_wait.c
index 63998d2..a40e444 100644 (file)
@@ -85,7 +85,6 @@ DAT_RETURN DAT_API dapl_evd_wait (
                  threshold, \r
                  event, \r
                  nmore);\r
-    DAPL_CNTR(DCNT_EVD_WAIT);\r
 \r
     evd_ptr = (DAPL_EVD *)evd_handle;\r
     dat_status = DAT_SUCCESS;\r
@@ -122,6 +121,7 @@ DAT_RETURN DAT_API dapl_evd_wait (
        dat_status = DAT_ERROR (DAT_INVALID_STATE,0);\r
        goto bail;\r
     }\r
+    DAPL_CNTR(evd_ptr, DCNT_EVD_WAIT);\r
 \r
     dapl_dbg_log (DAPL_DBG_TYPE_EVD, \r
                  "dapl_evd_wait: EVD %p, CQ %p\n", \r
@@ -203,7 +203,7 @@ DAT_RETURN DAT_API dapl_evd_wait (
                (evd_ptr->completion_type == DAPL_EVD_STATE_SOLICITED_WAIT) ?\r
                     IB_NOTIFY_ON_SOLIC_COMP : IB_NOTIFY_ON_NEXT_COMP );  \r
 \r
-           DAPL_CNTR(DCNT_EVD_WAIT_CMP_NTFY);\r
+           DAPL_CNTR(evd_ptr, DCNT_EVD_WAIT_NOTIFY);\r
            /* FIXME report error */\r
            dapl_os_assert(dat_status == DAT_SUCCESS);\r
 \r
@@ -222,7 +222,7 @@ DAT_RETURN DAT_API dapl_evd_wait (
         */\r
        evd_ptr->threshold = threshold; \r
 \r
-       DAPL_CNTR(DCNT_EVD_WAIT_BLOCKED);\r
+       DAPL_CNTR(evd_ptr, DCNT_EVD_WAIT_BLOCKED);\r
 \r
 #ifdef CQ_WAIT_OBJECT\r
        if (evd_ptr->cq_wait_obj_handle)\r