- 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 51b122a91a5fe17e0bfd2e59a4af8a9c7b39c097..235bdb0a711c1f8a9f82a2ee2f67c165a10cccb1 100644 (file)
--- 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\r
 \r
 \r
+#pragma warning(disable:4324)\r
 typedef struct _alts_cm_ca_obj\r
 {\r
        ib_api_status_t         status;\r
@@ -98,7 +99,6 @@ typedef struct _alts_cm_ca_obj
 \r
        ib_qp_attr_t            qp_attr[MAX_QPS];\r
 \r
-\r
        ib_send_wr_t            *p_send_wr;\r
        ib_recv_wr_t            *p_recv_wr;\r
        size_t                          wr_send_size;\r
@@ -154,6 +154,7 @@ typedef struct _alts_cm_ca_obj
        mem_region_t            mem_region[10];\r
 \r
 } alts_cm_ca_obj_t;\r
+#pragma warning(default:4324)\r
 \r
 #define MAX_SERVER     500\r
 \r
@@ -1153,47 +1154,49 @@ rdma_cq_comp_cb(
                        p_done_cl->wr_id,\r
                        ib_get_wc_status_str(p_done_cl->status) ));\r
 \r
-\r
-               if (p_done_cl->wc_type == IB_WC_RECV)\r
+               if( p_done_cl->status == IB_WCS_SUCCESS )\r
                {\r
-                       ALTS_PRINT(ALTS_DBG_VERBOSE,\r
-                               ("message length..:%d bytes\n",\r
-                               p_done_cl->length ));\r
+                       if (p_done_cl->wc_type == IB_WC_RECV)\r
+                       {\r
+                               ALTS_PRINT(ALTS_DBG_VERBOSE,\r
+                                       ("message length..:%d bytes\n",\r
+                                       p_done_cl->length ));\r
 \r
-                       id = (uint32_t)p_done_cl->wr_id;\r
+                               id = (uint32_t)p_done_cl->wr_id;\r
 \r
-                       ALTS_PRINT(ALTS_DBG_VERBOSE,\r
-                               ("RecvRC info:\n"\r
-                               "\trecv_opt...:x%x\n"\r
-                               "\timm_data...:x%x\n",\r
-                               p_done_cl->recv.conn.recv_opt,\r
-                               p_done_cl->recv.ud.immediate_data ));\r
+                               ALTS_PRINT(ALTS_DBG_VERBOSE,\r
+                                       ("RecvRC info:\n"\r
+                                       "\trecv_opt...:x%x\n"\r
+                                       "\timm_data...:x%x\n",\r
+                                       p_done_cl->recv.conn.recv_opt,\r
+                                       p_done_cl->recv.ud.immediate_data ));\r
 \r
-                       if( p_ca_obj->rdma_enabled == TRUE )\r
+                               if( p_ca_obj->rdma_enabled == TRUE )\r
+                               {\r
+                                       process_response( p_ca_obj,\r
+                                       (alts_rdma_t*)p_ca_obj->mem_region[p_done_cl->wr_id].buffer,\r
+                                       (uint32_t)p_done_cl->wr_id );\r
+                               }\r
+                       }\r
+                       else\r
+                       if (p_done_cl->wc_type == IB_WC_RDMA_WRITE)\r
                        {\r
+                               // convert request to read now\r
+                               p_data =\r
+                                       (alts_rdma_t*)p_ca_obj->mem_region[p_done_cl->wr_id].buffer;\r
+                               p_data->msg_type = 'R';\r
                                process_response( p_ca_obj,\r
-                                (alts_rdma_t*)p_ca_obj->mem_region[p_done_cl->wr_id].buffer,\r
-                                (uint32_t)p_done_cl->wr_id );\r
+                                       p_data,\r
+                                       (uint32_t)p_done_cl->wr_id );\r
+                       }\r
+                       else\r
+                       if (p_done_cl->wc_type == IB_WC_RDMA_READ)\r
+                       {\r
+                               id = (uint32_t)p_done_cl->wr_id;\r
+                               process_response( p_ca_obj,\r
+                                       (alts_rdma_t*)p_ca_obj->mem_region[p_done_cl->wr_id].buffer,\r
+                                       (uint32_t)p_done_cl->wr_id );\r
                        }\r
-               }\r
-               else\r
-               if (p_done_cl->wc_type == IB_WC_RDMA_WRITE)\r
-               {\r
-                       // convert request to read now\r
-                       p_data =\r
-                               (alts_rdma_t*)p_ca_obj->mem_region[p_done_cl->wr_id].buffer;\r
-                       p_data->msg_type = 'R';\r
-                       process_response( p_ca_obj,\r
-                               p_data,\r
-                               (uint32_t)p_done_cl->wr_id );\r
-               }\r
-               else\r
-               if (p_done_cl->wc_type == IB_WC_RDMA_READ)\r
-               {\r
-                       id = (uint32_t)p_done_cl->wr_id;\r
-                       process_response( p_ca_obj,\r
-                               (alts_rdma_t*)p_ca_obj->mem_region[p_done_cl->wr_id].buffer,\r
-                               (uint32_t)p_done_cl->wr_id );\r
                }\r
 \r
                p_free_wcl = p_done_cl;\r
@@ -1893,12 +1896,18 @@ alts_cm_rep_cb(
                        p_cm_rtu->access_ctrl |= IB_AC_RDMA_READ + IB_AC_RDMA_WRITE;\r
                }\r
 \r
-               p_cm_rtu->sq_depth = 16;\r
-               p_cm_rtu->rq_depth = 16;\r
+               if( p_ca_obj->p_ca_attr->modify_wr_depth )\r
+               {\r
+                       p_cm_rtu->sq_depth = 16;\r
+                       p_cm_rtu->rq_depth = 16;\r
+               }\r
                p_cm_rtu->pfn_cm_apr_cb = alts_cm_apr_cb;\r
                p_cm_rtu->pfn_cm_dreq_cb = alts_cm_dreq_cb;\r
 \r
                ib_status = ib_cm_rtu( p_cm_rep_rec->h_cm_rep, p_cm_rtu );\r
+\r
+               ALTS_PRINT( ALTS_DBG_VERBOSE,\r
+                       ("ib_cm_rtu returned %s\n", ib_get_err_str( ib_status )) );\r
        }\r
        else\r
        if ( p_cm_rep_rec->qp_type == IB_QPT_UNRELIABLE_DGRM )\r
@@ -2119,10 +2128,14 @@ alts_cm_req_cb(
                        cm_mra.svc_timeout = 21; // equals 8.5 sec wait + packet lifetime\r
 \r
                        ib_status = ib_cm_mra( p_cm_req_rec->h_cm_req, &cm_mra );\r
+                       ALTS_PRINT( ALTS_DBG_VERBOSE,\r
+                               ("ib_cm_mra returned %s\n", ib_get_err_str( ib_status )) );\r
                }\r
                else\r
                {\r
                        ib_status = ib_cm_rep( p_cm_req_rec->h_cm_req, p_cm_rep );\r
+                       ALTS_PRINT( ALTS_DBG_VERBOSE,\r
+                               ("ib_cm_rep returned %s\n", ib_get_err_str( ib_status )) );\r
                }\r
        }\r
        else\r
@@ -2268,6 +2281,7 @@ alts_cm_client_server(
                p_req_client->pfn_cm_rej_cb = alts_cm_rej_cb;\r
                p_req_client->pfn_cm_mra_cb = alts_cm_mra_cb;\r
                p_req_client->h_qp = p_ca_obj->h_qp[SRC_QP];\r
+               p_req_client->local_resp_timeout = 12;\r
        }\r
 \r
        ib_status = ib_cm_req(p_req_client);\r

diff --git a/branches/fab_cm_branch/tests/alts/ibquery.c b/branches/fab_cm_branch/tests/alts/ibquery.c
index d70df31cf207b00b2fd1d5067424b87473fbd6c8..396186eab69f11e5a72045c43916ac0376a5d802 100644 (file)
--- 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)\r
                {\r
                        ALTS_PRINT( ALTS_DBG_ERROR,\r
-                               ("alts_open_al failed status = %s\n", ib_get_err_str(ib_status)) );\r
+                               ("alts_open_al failed status = %s\n",\r
+                               ib_get_err_str(ib_status)) );\r
                        break;\r
                }\r
 \r
@@ -124,7 +125,8 @@ al_test_query(void)
                if(ib_status != IB_SUCCESS)\r
                {\r
                        ALTS_PRINT( ALTS_DBG_ERROR,\r
-                               ("alts_open_ca failed status = %s\n", ib_get_err_str(ib_status)) );\r
+                               ("alts_open_ca failed status = %s\n",\r
+                               ib_get_err_str(ib_status)) );\r
                        break;\r
                }\r
 \r
@@ -136,7 +138,8 @@ al_test_query(void)
                if(ib_status != IB_INSUFFICIENT_MEMORY)\r
                {\r
                        ALTS_PRINT(ALTS_DBG_ERROR,\r
-                               ("ib_query_ca failed with status = %s\n", ib_get_err_str(ib_status)) );\r
+                               ("ib_query_ca failed with status = %s\n",\r
+                               ib_get_err_str(ib_status)) );\r
                        ib_status = IB_ERROR;\r
                        break;\r
                }\r
@@ -158,7 +161,8 @@ al_test_query(void)
                if(ib_status != IB_SUCCESS)\r
                {\r
                        ALTS_PRINT( ALTS_DBG_ERROR,\r
-                               ("ib_query_ca failed with status = %s\n", ib_get_err_str(ib_status)) );\r
+                               ("ib_query_ca failed with status = %s\n",\r
+                               ib_get_err_str(ib_status)) );\r
                        break;\r
                }\r
 \r
@@ -206,7 +210,8 @@ al_test_query(void)
                if(ib_status != IB_SUCCESS)\r
                {\r
                        ALTS_PRINT( ALTS_DBG_ERROR,\r
-                               ("ib_query api failed with status %s\n",ib_get_err_str(ib_status)) );\r
+                               ("ib_query api failed with status %s\n",\r
+                               ib_get_err_str(ib_status)) );\r
                        break;\r
                }\r
 \r
@@ -231,7 +236,8 @@ al_test_query(void)
                if(ib_status != IB_SUCCESS)\r
                {\r
                        ALTS_PRINT( ALTS_DBG_ERROR,\r
-                               ("ib_query api failed with status %s\n",ib_get_err_str(ib_status)) );\r
+                               ("ib_query api failed with status %s\n",\r
+                               ib_get_err_str(ib_status)) );\r
                        break;\r
                }\r
 \r
@@ -256,7 +262,8 @@ al_test_query(void)
                if(ib_status != IB_SUCCESS)\r
                {\r
                        ALTS_PRINT( ALTS_DBG_ERROR,\r
-                               ("ib_query api failed with status %s\n",ib_get_err_str(ib_status)) );\r
+                               ("ib_query api failed with status %s\n",\r
+                               ib_get_err_str(ib_status)) );\r
                        break;\r
                }\r
 \r
@@ -281,7 +288,8 @@ al_test_query(void)
                if(ib_status != IB_SUCCESS)\r
                {\r
                        ALTS_PRINT( ALTS_DBG_ERROR,\r
-                               ("ib_query api failed with status %s\n",ib_get_err_str(ib_status)) );\r
+                               ("ib_query api failed with status %s\n",\r
+                               ib_get_err_str(ib_status)) );\r
                        break;\r
                }\r
 \r
@@ -314,7 +322,8 @@ al_test_query(void)
                if(ib_status != IB_SUCCESS)\r
                {\r
                        ALTS_PRINT( ALTS_DBG_ERROR,\r
-                               ("ib_query api failed with status %s\n",ib_get_err_str(ib_status)) );\r
+                               ("ib_query api failed with status %s\n",\r
+                               ib_get_err_str(ib_status)) );\r
                        break;\r
                }\r
 \r
@@ -349,7 +358,8 @@ al_test_query(void)
                if(ib_status != IB_SUCCESS)\r
                {\r
                        ALTS_PRINT( ALTS_DBG_ERROR, \r
-                               ("ib_reg_svc api failed with status %s\n",ib_get_err_str(ib_status)) );\r
+                               ("ib_reg_svc api failed with status %s\n",\r
+                               ib_get_err_str(ib_status)) );\r
                        break;\r
                }\r
 \r
@@ -387,7 +397,8 @@ al_test_query(void)
                if(ib_status != IB_SUCCESS)\r
                {\r
                        ALTS_PRINT( ALTS_DBG_ERROR, \r
-                               ("ib_reg_svc api failed with status %s\n",ib_get_err_str(ib_status)) );\r
+                               ("ib_reg_svc api failed with status %s\n",\r
+                               ib_get_err_str(ib_status)) );\r
                        break;\r
                }\r
 \r
@@ -395,7 +406,8 @@ al_test_query(void)
                if( ib_status != IB_SUCCESS )\r
                {\r
                        ALTS_PRINT( ALTS_DBG_ERROR, \r
-                               ("ib_dereg_svc api failed with status %s\n",ib_get_err_str(ib_status)) );\r
+                               ("ib_dereg_svc api failed with status %s\n",\r
+                               ib_get_err_str(ib_status)) );\r
                        break;\r
                }\r
 #endif\r