Correct many mismatches between the log messages and the actual operations.

diff --git a/dapl/svc/mpxyd.c b/dapl/svc/mpxyd.c
index a3be10082e59486ec15f9bffbf4d7b7cb50543ed..0319503fdcb8a67391b5f61fffad6115fbdc1634 100644 (file)
--- a/dapl/svc/mpxyd.c
+++ b/dapl/svc/mpxyd.c
@@ -1422,7 +1422,7 @@ static void mix_scif_accept(scif_epd_t listen_ep)
        len = sizeof(msg);
        ret = scif_send(op_ep, &msg, len, SCIF_SEND_BLOCK);
        if (ret != len) {
-               mlog(0, " ERR: rcv on new_ep %d, ret %d, exp %d\n", op_ep, ret, len);
+               mlog(0, " ERR: snd on new_ep %d, ret %d, exp %d\n", op_ep, ret, len);
                /* remove this created SMD from MCM device ??? */
        }
 }
@@ -1457,7 +1457,7 @@ static int mix_listen_free(mcm_scif_dev_t *smd, dat_mix_hdr_t *pmsg)
        len = sizeof(dat_mix_hdr_t);
        ret = scif_send(smd->scif_ep, pmsg, len, SCIF_SEND_BLOCK);
        if (ret != len) {
-               mlog(0, " ERR: rcv on new_ep %d, ret %d, exp %d\n", smd->scif_ep, ret, len);
+               mlog(0, " ERR: snd on new_ep %d, ret %d, exp %d\n", smd->scif_ep, ret, len);
                return ret;
        }
        return 0;
@@ -1508,7 +1508,7 @@ static int mix_listen(mcm_scif_dev_t *smd, dat_mix_listen_t *pmsg)
        len = sizeof(dat_mix_listen_t);
        ret = scif_send(smd->scif_ep, pmsg, len, SCIF_SEND_BLOCK);
        if (ret != len) {
-               mlog(0, " ERR: rcv on new_ep %d, ret %d, exp %d\n", smd->scif_ep, ret, len);
+               mlog(0, " ERR: snd on new_ep %d, ret %d, exp %d\n", smd->scif_ep, ret, len);
                return ret;
        }
 
@@ -1692,7 +1692,7 @@ resp:
        len = sizeof(dat_mix_hdr_t);
        ret = scif_send(smd->scif_ep, pmsg, len, SCIF_SEND_BLOCK);
        if (ret != len) {
-               mlog(0, " ERR: rcv on scif_ep %d, ret %d, exp %d\n", smd->scif_ep, ret, len);
+               mlog(0, " ERR: snd on scif_ep %d, ret %d, exp %d\n", smd->scif_ep, ret, len);
                return ret;
        }
        return 0;
@@ -1771,7 +1771,7 @@ resp:
        len = sizeof(dat_mix_cq_t);
        ret = scif_send(smd->scif_ep, pmsg, len, SCIF_SEND_BLOCK);
        if (ret != len) {
-               mlog(0, " ERR: rcv on scif_ep %d, ret %d, exp %d\n", smd->scif_ep, ret, len);
+               mlog(0, " ERR: snd on scif_ep %d, ret %d, exp %d\n", smd->scif_ep, ret, len);
                return ret;
        }
        return 0;
@@ -1821,7 +1821,7 @@ static int mix_cq_poll(mcm_scif_dev_t *smd, dat_mix_dto_comp_t *pmsg)
        len = sizeof(dat_mix_dto_comp_t);
        ret = scif_send(smd->scif_ep, pmsg, len, SCIF_SEND_BLOCK);
        if (ret != len) {
-               mlog(0, " ERR: rcv on scif_ep %d, ret %d, exp %d\n", smd->scif_ep, ret, len);
+               mlog(0, " ERR: snd on scif_ep %d, ret %d, exp %d\n", smd->scif_ep, ret, len);
                return ret;
        }
        return 0;
@@ -1874,7 +1874,7 @@ resp:
        len = sizeof(dat_mix_hdr_t);
        ret = scif_send(smd->scif_ep, pmsg, len, SCIF_SEND_BLOCK);
        if (ret != len) {
-               mlog(0, " ERR: rcv on scif_ep %d, ret %d, exp %d\n", smd->scif_ep, ret, len);
+               mlog(0, " ERR: snd on scif_ep %d, ret %d, exp %d\n", smd->scif_ep, ret, len);
                return ret;
        }
        mlog(1, " MIX_QP_DESTROY: QP %p response sent to MIC client\n", m_qp);
@@ -1913,7 +1913,7 @@ static int m_qp_create(mcm_scif_dev_t *smd,
        /* Find the CQ's for this QP for transmitting */
        m_cq = mix_get_cq(smd, scq_id);
        if (!m_cq) {
-               mlog(0, " ERR: mcm_get_cq, id %d, not found\n", scq_id);
+               mlog(0, " ERR: mix_get_cq, id %d, not found\n", scq_id);
                goto err;
        }
 
@@ -2023,7 +2023,7 @@ resp:
        len = sizeof(dat_mix_qp_t);
        ret = scif_send(smd->scif_ep, pmsg, len, SCIF_SEND_BLOCK);
        if (ret != len) {
-               mlog(0, " ERR: rcv on scif_ep %d, ret %d, exp %d\n", smd->scif_ep, ret, len);
+               mlog(0, " ERR: snd on scif_ep %d, ret %d, exp %d\n", smd->scif_ep, ret, len);
                return ret;
        }
        return 0;
@@ -2047,7 +2047,7 @@ static void mix_dto_event(struct mcm_cq *m_cq, struct ibv_wc *wc, int nc)
                len = sizeof(dat_mix_dto_comp_t);
                ret = scif_send(m_cq->smd->scif_un_ep, &msg, len, SCIF_SEND_BLOCK); /* BUG? have to send back on cm_ep ?? */
                if (ret != len) {
-                       mlog(0, " ERR: rcv on scif_ep %d, ret %d, exp %d\n",
+                       mlog(0, " ERR: snd on scif_ep %d, ret %d, exp %d\n",
                                m_cq->smd->scif_un_ep, ret, len);
                        return;
                }
@@ -2074,7 +2074,7 @@ static int mix_cm_event(mcm_cm_t *m_cm, uint32_t event)
        len = sizeof(dat_mix_cm_event_t);
        ret = scif_send(m_cm->smd->scif_un_ep, &msg, len, SCIF_SEND_BLOCK); /* ??? assume small msgs are sent without waiting on receiver */
        if (ret != len) {
-               mlog(0, " ERR: rcv on scif_ep %d, ret %d, exp %d\n", m_cm->smd->scif_un_ep, ret, len);
+               mlog(0, " ERR: snd on scif_ep %d, ret %d, exp %d\n", m_cm->smd->scif_un_ep, ret, len);
                return -1;
        }
        mlog(1, " MIX_CM_EVENT: cm %p cm_id %d, ctx %p, event 0x%x\n", m_cm, msg.cm_id, msg.cm_ctx, event);
@@ -2101,7 +2101,7 @@ static int mix_cm_req_out(mcm_scif_dev_t *smd, dat_mix_cm_t *pmsg)
        /* Find the QP for linking */
        m_qp = mix_get_qp(smd, pmsg->qp_id);
        if (!m_qp) {
-               mlog(0, " ERR: mcm_get_qp, id %d, not found\n", pmsg->qp_id);
+               mlog(0, " ERR: mix_get_qp, id %d, not found\n", pmsg->qp_id);
                goto err;
        }
 
@@ -2150,7 +2150,7 @@ resp:
        len = sizeof(dat_mix_cm_t);
        ret = scif_send(smd->scif_ep, pmsg, len, SCIF_SEND_BLOCK);
        if (ret != len) {
-               mlog(0, " ERR: rcv on scif_ep %d, ret %d, exp %d\n", smd->scif_ep, ret, len);
+               mlog(0, " ERR: snd on scif_ep %d, ret %d, exp %d\n", smd->scif_ep, ret, len);
                return ret;
        }
        mlog(1, " MIX_CM_REQ_OUT: MPXYD id 0x%x, ctx %p - MIC id 0x%x, ctx %p\n",
@@ -2175,10 +2175,10 @@ static int mix_cm_disc_out(mcm_scif_dev_t *smd, dat_mix_cm_t *pmsg)
        mlog(1, " MIX_CM_DREQ_OUT: cm_id %d, cm_ctx %p, qp_id %d \n",
                pmsg->cm_id, (void*)pmsg->cm_ctx, pmsg->qp_id);
 
-       /* Find the QP for linking */
+       /* Find the CM for linking */
        m_cm = mix_get_cm(smd, pmsg->cm_id);
        if (!m_cm) {
-               mlog(0, " ERR: mcm_get_qp, id %d, not found\n", pmsg->qp_id);
+               mlog(0, " ERR: mix_get_cm, id %d, not found\n", pmsg->cm_id);
                return -1;
        }
 
@@ -2208,10 +2208,10 @@ static int mix_cm_rtu_out(mcm_scif_dev_t *smd, dat_mix_cm_t *pmsg)
        mlog(1, " MIX_CM_RTU_OUT: cm_id %d, cm_ctx %p, qp_id %d \n",
                pmsg->cm_id, (void*)pmsg->cm_ctx, pmsg->qp_id);
 
-       /* Find the QP for linking */
+       /* Find the CM for linking */
        m_cm = mix_get_cm(smd, pmsg->cm_id);
        if (!m_cm) {
-               mlog(0, " ERR: mcm_get_qp, id %d, not found\n", pmsg->qp_id);
+               mlog(0, " ERR: mix_get_cm, id %d, not found\n", pmsg->cm_id);
                return -1;
        }
 
@@ -2263,7 +2263,7 @@ static int mix_cm_reply_in(mcm_cm_t *m_cm, dat_mcm_msg_t *pkt, int pkt_len)
        len = sizeof(dat_mix_cm_t);
        ret = scif_send(m_cm->smd->scif_un_ep, &msg, len, SCIF_SEND_BLOCK);
        if (ret != len) {
-               mlog(0, " ERR: rcv on scif_ep %d, ret %d, exp %d\n", m_cm->smd->scif_un_ep, ret, len);
+               mlog(0, " ERR: snd on scif_ep %d, ret %d, exp %d\n", m_cm->smd->scif_un_ep, ret, len);
                return -1;
        }
        mlog(1, " success cm_id %d\n", msg.cm_id);
@@ -2331,7 +2331,7 @@ static int mix_cm_req_in(mcm_cm_t *cm, dat_mcm_msg_t *pkt, int pkt_len)
        len = sizeof(dat_mix_cm_t);
        ret = scif_send(acm->smd->scif_un_ep, &msg, len, SCIF_SEND_BLOCK);
        if (ret != len) {
-               mlog(0, " ERR: rcv on scif_ep %d, ret %d, exp %d\n", acm->smd->scif_un_ep, ret, len);
+               mlog(0, " ERR: snd on scif_ep %d, ret %d, exp %d\n", acm->smd->scif_un_ep, ret, len);
                return -1;
        }
        mlog(1, " success cm_id %d cm_ctx %p\n", msg.cm_id, msg.cm_ctx);
@@ -2356,7 +2356,7 @@ static int mix_cm_rtu_in(mcm_cm_t *m_cm, dat_mcm_msg_t *pkt, int pkt_len)
        len = sizeof(dat_mix_cm_t);
        ret = scif_send(m_cm->smd->scif_un_ep, &msg, len, SCIF_SEND_BLOCK);
        if (ret != len) {
-               mlog(0, " ERR: rcv on scif_ep %d, ret %d, exp %d\n", m_cm->smd->scif_un_ep, ret, len);
+               mlog(0, " ERR: snd on scif_ep %d, ret %d, exp %d\n", m_cm->smd->scif_un_ep, ret, len);
                return -1;
        }
        mlog(1, " success cm_id %d\n", msg.cm_id);
@@ -2385,7 +2385,7 @@ static int mix_cm_rep_out(mcm_scif_dev_t *smd, dat_mix_cm_t *pmsg)
        /* Find the CM for this reply */
        m_cm = mix_get_cm(smd, pmsg->cm_id);
        if (!m_cm) {
-               mlog(0, " ERR: mcm_get_cm, id %d, not found\n", pmsg->cm_id);
+               mlog(0, " ERR: mix_get_cm, id %d, not found\n", pmsg->cm_id);
                return -1;
        }
 
@@ -2399,7 +2399,7 @@ static int mix_cm_rep_out(mcm_scif_dev_t *smd, dat_mix_cm_t *pmsg)
        /* Attach the QP for this CR */
        m_cm->m_qp = mix_get_qp(smd, pmsg->qp_id);
        if (!m_cm->m_qp) {
-               mlog(0, " ERR: mcm_get_qp, id %d, not found\n", pmsg->qp_id);
+               mlog(0, " ERR: mix_get_qp, id %d, not found\n", pmsg->qp_id);
                return -1;
        }
        mlog(1, " MIX_CM_REP_OUT: found cm_id %d = %p qp_id %d = %p \n",
@@ -2458,10 +2458,10 @@ static int mix_cm_rej_out(mcm_scif_dev_t *smd, dat_mix_cm_t *pmsg)
        mlog(1, " MIX_CM_REJ_OUT: cm_id %d, cm_ctx %p, qp_id %d \n",
                pmsg->cm_id, (void*)pmsg->cm_ctx, pmsg->qp_id);
 
-       /* Find the QP for linking */
+       /* Find the CM for linking */
        m_cm = mix_get_cm(smd, pmsg->cm_id);
        if (!m_cm) {
-               mlog(0, " ERR: mcm_get_qp, id %d, not found\n", pmsg->qp_id);
+               mlog(0, " ERR: mix_get_cm, id %d, not found\n", pmsg->cm_id);
                return -1;
        }
 
@@ -2494,7 +2494,7 @@ static int mix_cm_disc_in(mcm_cm_t *m_cm)
        len = sizeof(dat_mix_hdr_t);
        ret = scif_send(m_cm->smd->scif_un_ep, &msg, len, SCIF_SEND_BLOCK); /* ??? assume sent without waiting on receiver */
        if (ret != len) {
-               mlog(0, " ERR: rcv on scif_ep %d, ret %d, exp %d\n", m_cm->smd->scif_un_ep, ret, len);
+               mlog(0, " ERR: snd on scif_ep %d, ret %d, exp %d\n", m_cm->smd->scif_un_ep, ret, len);
                return -1;
        }
        mlog(1, " MIX_CM_DISC_IN: cm_id %d\n", msg.req_id);