From: Arlin Davis <arlin.r.davis@intel.com>
Date: Tue, 4 Feb 2014 03:17:33 +0000 (-0800)
Subject: ucm: fix CM service, initial rcv msg posts incorrect
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3d1468750f10571e0b958293ea220060a327ac8a;p=~ardavis%2Fdapl.git

ucm: fix CM service, initial rcv msg posts incorrect

Signed-off-by: Arlin Davis <arlin.r.davis@intel.com>
---

diff --git a/dapl/openib_ucm/cm.c b/dapl/openib_ucm/cm.c
index 4db5548..d162ec6 100644
--- a/dapl/openib_ucm/cm.c
+++ b/dapl/openib_ucm/cm.c
@@ -85,7 +85,7 @@ static enum DAPL_FD_EVENTS dapl_poll(DAPL_SOCKET s, enum DAPL_FD_EVENTS event)
 	fds.events = event;
 	fds.revents = 0;
 	ret = poll(&fds, 1, 0);
-	dapl_log(DAPL_DBG_TYPE_CM, " dapl_poll: fd=%d ret=%d, evnts=0x%x\n",
+	dapl_log(DAPL_DBG_TYPE_THREAD, " dapl_poll: fd=%d ret=%d, evnts=0x%x\n",
 		 s, ret, fds.revents);
 	if (ret == 0)
 		return 0;
@@ -99,10 +99,10 @@ static int dapl_select(struct dapl_fd_set *set, int time_ms)
 {
 	int ret;
 
-	dapl_dbg_log(DAPL_DBG_TYPE_CM, " dapl_select: sleep, fds=%d\n",
+	dapl_dbg_log(DAPL_DBG_TYPE_THREAD, " dapl_select: sleep, fds=%d\n",
 		     set->index);
 	ret = poll(set->set, set->index, time_ms);
-	dapl_dbg_log(DAPL_DBG_TYPE_CM, " dapl_select: wakeup, ret=0x%x\n", ret);
+	dapl_dbg_log(DAPL_DBG_TYPE_THREAD, " dapl_select: wakeup, ret=0x%x\n", ret);
 	return ret;
 }
 #endif
@@ -1711,6 +1711,14 @@ dapls_ib_connect(IN DAT_EP_HANDLE ep_handle,
 {
 	DAPL_EP *ep = (DAPL_EP *)ep_handle;
 	dp_ib_cm_handle_t cm;
+	union dcm_addr *ucm_ia = (union dcm_addr *) r_addr;
+
+	dapl_log(DAPL_DBG_TYPE_CM, " UCM connect -> AF %d LID 0x%x QPN 0x%x GID"
+		 " 0x" F64x ":" F64x " port %d ep_map %s sl %d qt %d\n",
+		 ucm_ia->ib.family, ntohl(ucm_ia->ib.qpn), ntohs(ucm_ia->ib.lid),
+		 (unsigned long long)ntohll(*(uint64_t*)&ucm_ia->ib.gid[0]),
+		 (unsigned long long)ntohll(*(uint64_t*)&ucm_ia->ib.gid[8]),
+		 ntohs(ucm_ia->ib.port), ucm_ia->ib.sl, ucm_ia->ib.qp_type);
 	
 	/* create CM object, initialize SRC info from EP */
 	cm = dapls_ib_cm_create(ep);