From: ftillier <ftillier@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Wed, 6 Jul 2005 19:12:15 +0000 (+0000)
Subject: - Fixed padding warning when building alts.
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f71934db2d5cb69fa19d9900b6aaa9cdc7d60086;p=~shefty%2Frdma-win.git

- Fixed padding warning when building alts.
- Fixed line length for debug output to wrap at 80.
- Added local CM response timeout to CM tests.


git-svn-id: svn://openib.tc.cornell.edu/gen1@27 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---

diff --git a/branches/fab_cm_branch/tests/alts/cmtests.c b/branches/fab_cm_branch/tests/alts/cmtests.c
index 51b122a9..235bdb0a 100644
--- a/branches/fab_cm_branch/tests/alts/cmtests.c
+++ b/branches/fab_cm_branch/tests/alts/cmtests.c
@@ -57,6 +57,7 @@
 #define DEST_QP 1
 
 
+#pragma warning(disable:4324)
 typedef struct _alts_cm_ca_obj
 {
 	ib_api_status_t		status;
@@ -98,7 +99,6 @@ typedef struct _alts_cm_ca_obj
 
 	ib_qp_attr_t		qp_attr[MAX_QPS];
 
-
 	ib_send_wr_t		*p_send_wr;
 	ib_recv_wr_t		*p_recv_wr;
 	size_t				wr_send_size;
@@ -154,6 +154,7 @@ typedef struct _alts_cm_ca_obj
 	mem_region_t		mem_region[10];
 
 } alts_cm_ca_obj_t;
+#pragma warning(default:4324)
 
 #define MAX_SERVER	500
 
@@ -1153,47 +1154,49 @@ rdma_cq_comp_cb(
 			p_done_cl->wr_id,
 			ib_get_wc_status_str(p_done_cl->status) ));
 
-
-		if (p_done_cl->wc_type == IB_WC_RECV)
+		if( p_done_cl->status == IB_WCS_SUCCESS )
 		{
-			ALTS_PRINT(ALTS_DBG_VERBOSE,
-				("message length..:%d bytes\n",
-				p_done_cl->length ));
+			if (p_done_cl->wc_type == IB_WC_RECV)
+			{
+				ALTS_PRINT(ALTS_DBG_VERBOSE,
+					("message length..:%d bytes\n",
+					p_done_cl->length ));
 
-			id = (uint32_t)p_done_cl->wr_id;
+				id = (uint32_t)p_done_cl->wr_id;
 
-			ALTS_PRINT(ALTS_DBG_VERBOSE,
-				("RecvRC info:\n"
-				"\trecv_opt...:x%x\n"
-				"\timm_data...:x%x\n",
-				p_done_cl->recv.conn.recv_opt,
-				p_done_cl->recv.ud.immediate_data ));
+				ALTS_PRINT(ALTS_DBG_VERBOSE,
+					("RecvRC info:\n"
+					"\trecv_opt...:x%x\n"
+					"\timm_data...:x%x\n",
+					p_done_cl->recv.conn.recv_opt,
+					p_done_cl->recv.ud.immediate_data ));
 
-			if( p_ca_obj->rdma_enabled == TRUE )
+				if( p_ca_obj->rdma_enabled == TRUE )
+				{
+					process_response( p_ca_obj,
+					(alts_rdma_t*)p_ca_obj->mem_region[p_done_cl->wr_id].buffer,
+					(uint32_t)p_done_cl->wr_id );
+				}
+			}
+			else
+			if (p_done_cl->wc_type == IB_WC_RDMA_WRITE)
 			{
+				// convert request to read now
+				p_data =
+					(alts_rdma_t*)p_ca_obj->mem_region[p_done_cl->wr_id].buffer;
+				p_data->msg_type = 'R';
 				process_response( p_ca_obj,
-				 (alts_rdma_t*)p_ca_obj->mem_region[p_done_cl->wr_id].buffer,
-				 (uint32_t)p_done_cl->wr_id );
+					p_data,
+					(uint32_t)p_done_cl->wr_id );
+			}
+			else
+			if (p_done_cl->wc_type == IB_WC_RDMA_READ)
+			{
+				id = (uint32_t)p_done_cl->wr_id;
+				process_response( p_ca_obj,
+					(alts_rdma_t*)p_ca_obj->mem_region[p_done_cl->wr_id].buffer,
+					(uint32_t)p_done_cl->wr_id );
 			}
-		}
-		else
-		if (p_done_cl->wc_type == IB_WC_RDMA_WRITE)
-		{
-			// convert request to read now
-			p_data =
-				(alts_rdma_t*)p_ca_obj->mem_region[p_done_cl->wr_id].buffer;
-			p_data->msg_type = 'R';
-			process_response( p_ca_obj,
-				p_data,
-				(uint32_t)p_done_cl->wr_id );
-		}
-		else
-		if (p_done_cl->wc_type == IB_WC_RDMA_READ)
-		{
-			id = (uint32_t)p_done_cl->wr_id;
-			process_response( p_ca_obj,
-				(alts_rdma_t*)p_ca_obj->mem_region[p_done_cl->wr_id].buffer,
-				(uint32_t)p_done_cl->wr_id );
 		}
 
 		p_free_wcl = p_done_cl;
@@ -1893,12 +1896,18 @@ alts_cm_rep_cb(
 			p_cm_rtu->access_ctrl |= IB_AC_RDMA_READ + IB_AC_RDMA_WRITE;
 		}
 
-		p_cm_rtu->sq_depth = 16;
-		p_cm_rtu->rq_depth = 16;
+		if( p_ca_obj->p_ca_attr->modify_wr_depth )
+		{
+			p_cm_rtu->sq_depth = 16;
+			p_cm_rtu->rq_depth = 16;
+		}
 		p_cm_rtu->pfn_cm_apr_cb = alts_cm_apr_cb;
 		p_cm_rtu->pfn_cm_dreq_cb = alts_cm_dreq_cb;
 
 		ib_status = ib_cm_rtu( p_cm_rep_rec->h_cm_rep, p_cm_rtu );
+
+		ALTS_PRINT( ALTS_DBG_VERBOSE,
+			("ib_cm_rtu returned %s\n", ib_get_err_str( ib_status )) );
 	}
 	else
 	if ( p_cm_rep_rec->qp_type == IB_QPT_UNRELIABLE_DGRM )
@@ -2119,10 +2128,14 @@ alts_cm_req_cb(
 			cm_mra.svc_timeout = 21; // equals 8.5 sec wait + packet lifetime
 
 			ib_status = ib_cm_mra( p_cm_req_rec->h_cm_req, &cm_mra );
+			ALTS_PRINT( ALTS_DBG_VERBOSE,
+				("ib_cm_mra returned %s\n", ib_get_err_str( ib_status )) );
 		}
 		else
 		{
 			ib_status = ib_cm_rep( p_cm_req_rec->h_cm_req, p_cm_rep );
+			ALTS_PRINT( ALTS_DBG_VERBOSE,
+				("ib_cm_rep returned %s\n", ib_get_err_str( ib_status )) );
 		}
 	}
 	else
@@ -2268,6 +2281,7 @@ alts_cm_client_server(
 		p_req_client->pfn_cm_rej_cb = alts_cm_rej_cb;
 		p_req_client->pfn_cm_mra_cb = alts_cm_mra_cb;
 		p_req_client->h_qp = p_ca_obj->h_qp[SRC_QP];
+		p_req_client->local_resp_timeout = 12;
 	}
 
 	ib_status = ib_cm_req(p_req_client);
diff --git a/branches/fab_cm_branch/tests/alts/ibquery.c b/branches/fab_cm_branch/tests/alts/ibquery.c
index d70df31c..396186ea 100644
--- a/branches/fab_cm_branch/tests/alts/ibquery.c
+++ b/branches/fab_cm_branch/tests/alts/ibquery.c
@@ -113,7 +113,8 @@ al_test_query(void)
 		if(ib_status != IB_SUCCESS)
 		{
 			ALTS_PRINT( ALTS_DBG_ERROR,
-				("alts_open_al failed status = %s\n", ib_get_err_str(ib_status)) );
+				("alts_open_al failed status = %s\n",
+				ib_get_err_str(ib_status)) );
 			break;
 		}
 
@@ -124,7 +125,8 @@ al_test_query(void)
 		if(ib_status != IB_SUCCESS)
 		{
 			ALTS_PRINT( ALTS_DBG_ERROR,
-				("alts_open_ca failed status = %s\n", ib_get_err_str(ib_status)) );
+				("alts_open_ca failed status = %s\n",
+				ib_get_err_str(ib_status)) );
 			break;
 		}
 
@@ -136,7 +138,8 @@ al_test_query(void)
 		if(ib_status != IB_INSUFFICIENT_MEMORY)
 		{
 			ALTS_PRINT(ALTS_DBG_ERROR,
-				("ib_query_ca failed with status = %s\n", ib_get_err_str(ib_status)) );
+				("ib_query_ca failed with status = %s\n",
+				ib_get_err_str(ib_status)) );
 			ib_status = IB_ERROR;
 			break;
 		}
@@ -158,7 +161,8 @@ al_test_query(void)
 		if(ib_status != IB_SUCCESS)
 		{
 			ALTS_PRINT( ALTS_DBG_ERROR,
-				("ib_query_ca failed with status = %s\n", ib_get_err_str(ib_status)) );
+				("ib_query_ca failed with status = %s\n",
+				ib_get_err_str(ib_status)) );
 			break;
 		}
 
@@ -206,7 +210,8 @@ al_test_query(void)
 		if(ib_status != IB_SUCCESS)
 		{
 			ALTS_PRINT( ALTS_DBG_ERROR,
-				("ib_query api failed with status %s\n",ib_get_err_str(ib_status)) );
+				("ib_query api failed with status %s\n",
+				ib_get_err_str(ib_status)) );
 			break;
 		}
 
@@ -231,7 +236,8 @@ al_test_query(void)
 		if(ib_status != IB_SUCCESS)
 		{
 			ALTS_PRINT( ALTS_DBG_ERROR,
-				("ib_query api failed with status %s\n",ib_get_err_str(ib_status)) );
+				("ib_query api failed with status %s\n",
+				ib_get_err_str(ib_status)) );
 			break;
 		}
 
@@ -256,7 +262,8 @@ al_test_query(void)
 		if(ib_status != IB_SUCCESS)
 		{
 			ALTS_PRINT( ALTS_DBG_ERROR,
-				("ib_query api failed with status %s\n",ib_get_err_str(ib_status)) );
+				("ib_query api failed with status %s\n",
+				ib_get_err_str(ib_status)) );
 			break;
 		}
 
@@ -281,7 +288,8 @@ al_test_query(void)
 		if(ib_status != IB_SUCCESS)
 		{
 			ALTS_PRINT( ALTS_DBG_ERROR,
-				("ib_query api failed with status %s\n",ib_get_err_str(ib_status)) );
+				("ib_query api failed with status %s\n",
+				ib_get_err_str(ib_status)) );
 			break;
 		}
 
@@ -314,7 +322,8 @@ al_test_query(void)
 		if(ib_status != IB_SUCCESS)
 		{
 			ALTS_PRINT( ALTS_DBG_ERROR,
-				("ib_query api failed with status %s\n",ib_get_err_str(ib_status)) );
+				("ib_query api failed with status %s\n",
+				ib_get_err_str(ib_status)) );
 			break;
 		}
 
@@ -349,7 +358,8 @@ al_test_query(void)
 		if(ib_status != IB_SUCCESS)
 		{
 			ALTS_PRINT( ALTS_DBG_ERROR, 
-				("ib_reg_svc api failed with status %s\n",ib_get_err_str(ib_status)) );
+				("ib_reg_svc api failed with status %s\n",
+				ib_get_err_str(ib_status)) );
 			break;
 		}
 
@@ -387,7 +397,8 @@ al_test_query(void)
 		if(ib_status != IB_SUCCESS)
 		{
 			ALTS_PRINT( ALTS_DBG_ERROR, 
-				("ib_reg_svc api failed with status %s\n",ib_get_err_str(ib_status)) );
+				("ib_reg_svc api failed with status %s\n",
+				ib_get_err_str(ib_status)) );
 			break;
 		}
 
@@ -395,7 +406,8 @@ al_test_query(void)
 		if( ib_status != IB_SUCCESS )
 		{
 			ALTS_PRINT( ALTS_DBG_ERROR, 
-				("ib_dereg_svc api failed with status %s\n",ib_get_err_str(ib_status)) );
+				("ib_dereg_svc api failed with status %s\n",
+				ib_get_err_str(ib_status)) );
 			break;
 		}
 #endif