From 5d3feff70ea0e828a9a8c1e754d8a0bd2ed3dffe Mon Sep 17 00:00:00 2001 From: stansmith Date: Mon, 10 Dec 2007 20:38:36 +0000 Subject: [PATCH] [WinOF] IBSDK sample code - Applied AL_API declarations to all callback routines. git-svn-id: svn://openib.tc.cornell.edu/gen1@915 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- trunk/tests/cmtest/user/cmtest_main.c | 135 +++++++++++++------------- 1 file changed, 67 insertions(+), 68 deletions(-) diff --git a/trunk/tests/cmtest/user/cmtest_main.c b/trunk/tests/cmtest/user/cmtest_main.c index a06db1f2..f24b6af2 100644 --- a/trunk/tests/cmtest/user/cmtest_main.c +++ b/trunk/tests/cmtest/user/cmtest_main.c @@ -206,39 +206,39 @@ static char *wc_status_text[] = { -static void +static void AL_API __req_cb( IN ib_cm_req_rec_t *p_cm_req_rec ); -static void +static void AL_API __rep_cb( IN ib_cm_rep_rec_t *p_cm_rep_rec ); -static void +static void AL_API __rtu_cb( IN ib_cm_rtu_rec_t *p_cm_rtu_rec ); -static void +static void AL_API __rej_cb( IN ib_cm_rej_rec_t *p_cm_rej_rec ); -static void +static void AL_API __mra_cb( IN ib_cm_mra_rec_t *p_cm_mra_rec ); -static void +static void AL_API __apr_cb( IN ib_cm_apr_rec_t *p_cm_apr_rec ); -static void +static void AL_API __lap_cb( IN ib_cm_lap_rec_t *p_cm_lap_rec ); -static void +static void AL_API __dreq_cb( IN ib_cm_dreq_rec_t *p_cm_dreq_rec ); -static void +static void AL_API __drep_cb( IN ib_cm_drep_rec_t *p_cm_drep_rec ); @@ -509,46 +509,46 @@ static void __init_conn_info() { /* Initialize connection request parameters. */ - g_root.cm_req.svc_id = CMT_BASE_SVC_ID + g_root.inst_id; - g_root.cm_req.max_cm_retries = 5; - g_root.cm_req.p_primary_path = &g_root.path_rec; - g_root.cm_req.pfn_cm_rep_cb = (ib_pfn_cm_rep_cb_t)__rep_cb; - g_root.cm_req.qp_type = IB_QPT_RELIABLE_CONN; - g_root.cm_req.resp_res = 3; - g_root.cm_req.init_depth = 1; + g_root.cm_req.svc_id = CMT_BASE_SVC_ID + g_root.inst_id; + g_root.cm_req.max_cm_retries = 5; + g_root.cm_req.p_primary_path = &g_root.path_rec; + g_root.cm_req.pfn_cm_rep_cb = __rep_cb; + g_root.cm_req.qp_type = IB_QPT_RELIABLE_CONN; + g_root.cm_req.resp_res = 3; + g_root.cm_req.init_depth = 1; g_root.cm_req.remote_resp_timeout = 20; - g_root.cm_req.flow_ctrl = TRUE; - g_root.cm_req.local_resp_timeout = 20; - g_root.cm_req.rnr_nak_timeout = 6; - g_root.cm_req.rnr_retry_cnt = 3; - g_root.cm_req.retry_cnt = 5; - g_root.cm_req.pfn_cm_mra_cb = (ib_pfn_cm_mra_cb_t)__mra_cb; - g_root.cm_req.pfn_cm_rej_cb = (ib_pfn_cm_rej_cb_t)__rej_cb; + g_root.cm_req.flow_ctrl = TRUE; + g_root.cm_req.local_resp_timeout= 20; + g_root.cm_req.rnr_nak_timeout = 6; + g_root.cm_req.rnr_retry_cnt = 3; + g_root.cm_req.retry_cnt = 5; + g_root.cm_req.pfn_cm_mra_cb = __mra_cb; + g_root.cm_req.pfn_cm_rej_cb = __rej_cb; /* Initialize connection reply parameters. */ - g_root.cm_rep.qp_type = IB_QPT_RELIABLE_CONN; - g_root.cm_rep.access_ctrl = CMT_ACCESS_CTRL; - g_root.cm_rep.sq_depth = 0; - g_root.cm_rep.rq_depth = 0; - g_root.cm_rep.init_depth = 1; - g_root.cm_rep.target_ack_delay = 7; - g_root.cm_rep.failover_accepted = IB_FAILOVER_ACCEPT_UNSUPPORTED; - g_root.cm_rep.flow_ctrl = TRUE; - g_root.cm_rep.rnr_nak_timeout = 7; - g_root.cm_rep.rnr_retry_cnt = 6; - g_root.cm_rep.pfn_cm_rej_cb = (ib_pfn_cm_rej_cb_t)__rej_cb; - g_root.cm_rep.pfn_cm_mra_cb = (ib_pfn_cm_mra_cb_t)__mra_cb; - g_root.cm_rep.pfn_cm_rtu_cb = (ib_pfn_cm_rtu_cb_t)__rtu_cb; - g_root.cm_rep.pfn_cm_lap_cb = (ib_pfn_cm_lap_cb_t)__lap_cb; - g_root.cm_rep.pfn_cm_dreq_cb = (ib_pfn_cm_dreq_cb_t)__dreq_cb; + g_root.cm_rep.qp_type = IB_QPT_RELIABLE_CONN; + g_root.cm_rep.access_ctrl = CMT_ACCESS_CTRL; + g_root.cm_rep.sq_depth = 0; + g_root.cm_rep.rq_depth = 0; + g_root.cm_rep.init_depth = 1; + g_root.cm_rep.target_ack_delay = 7; + g_root.cm_rep.failover_accepted = IB_FAILOVER_ACCEPT_UNSUPPORTED; + g_root.cm_rep.flow_ctrl = TRUE; + g_root.cm_rep.rnr_nak_timeout = 7; + g_root.cm_rep.rnr_retry_cnt = 6; + g_root.cm_rep.pfn_cm_rej_cb = __rej_cb; + g_root.cm_rep.pfn_cm_mra_cb = __mra_cb; + g_root.cm_rep.pfn_cm_rtu_cb = __rtu_cb; + g_root.cm_rep.pfn_cm_lap_cb = __lap_cb; + g_root.cm_rep.pfn_cm_dreq_cb = __dreq_cb; /* Initialize connection RTU parameters. */ - g_root.cm_rtu.pfn_cm_apr_cb = (ib_pfn_cm_apr_cb_t)__apr_cb; - g_root.cm_rtu.pfn_cm_dreq_cb = (ib_pfn_cm_dreq_cb_t)__dreq_cb; + g_root.cm_rtu.pfn_cm_apr_cb = __apr_cb; + g_root.cm_rtu.pfn_cm_dreq_cb = __dreq_cb; /* Initialize disconnection request parameters. */ - g_root.cm_dreq.pfn_cm_drep_cb = (ib_pfn_cm_drep_cb_t)__drep_cb; - g_root.cm_dreq.qp_type = IB_QPT_RELIABLE_CONN; + g_root.cm_dreq.pfn_cm_drep_cb = __drep_cb; + g_root.cm_dreq.qp_type = IB_QPT_RELIABLE_CONN; /* Disconnection reply parameters are all zero. */ } @@ -659,7 +659,7 @@ __post_recvs( -static void +static void AL_API __ca_async_event_cb( ib_async_event_rec_t *p_err_rec ) { @@ -673,32 +673,32 @@ __ca_async_event_cb( -static void +static void AL_API __cm_listen_err_cb( IN ib_listen_err_rec_t *p_listen_err_rec ) { CL_ENTER( CMT_DBG_VERBOSE, cmt_dbg_lvl ); if( !p_listen_err_rec ) - printf( "__listen_err_cb NULL p_listen_err_rec\n" ); + printf( "%s NULL p_listen_err_rec\n", __FUNCTION__ ); CL_EXIT( CMT_DBG_VERBOSE, cmt_dbg_lvl ); } -static void +static void AL_API __cancel_listen_cb( IN void *context ) { CL_ENTER( CMT_DBG_VERBOSE, cmt_dbg_lvl ); if( !context ) - printf( "__cancel_listen_cb NULL context\n" ); + printf( "%s NULL context\n", __FUNCTION__ ); CL_EXIT( CMT_DBG_VERBOSE, cmt_dbg_lvl ); } /* We need to halt the test and recover from the reject error. */ -static void +static void AL_API __rej_cb( IN ib_cm_rej_rec_t *p_cm_rej_rec ) { @@ -719,7 +719,7 @@ __rej_cb( -static void +static void AL_API __req_cb( IN ib_cm_req_rec_t *p_cm_req_rec ) { @@ -763,7 +763,7 @@ __req_cb( -static void +static void AL_API __rep_cb( IN ib_cm_rep_rec_t *p_cm_rep_rec ) { @@ -806,7 +806,7 @@ __rep_cb( -static void +static void AL_API __rtu_cb( IN ib_cm_rtu_rec_t *p_cm_rtu_rec ) { @@ -826,7 +826,7 @@ __rtu_cb( -static void +static void AL_API __mra_cb( IN ib_cm_mra_rec_t *p_cm_mra_rec ) { @@ -837,7 +837,7 @@ __mra_cb( -static void +static void AL_API __apr_cb( IN ib_cm_apr_rec_t *p_cm_apr_rec ) { @@ -848,7 +848,7 @@ __apr_cb( -static void +static void AL_API __lap_cb( IN ib_cm_lap_rec_t *p_cm_lap_rec ) { @@ -859,7 +859,7 @@ __lap_cb( -static void +static void AL_API __dreq_cb( IN ib_cm_dreq_rec_t *p_cm_dreq_rec ) { @@ -904,7 +904,7 @@ __dreq_cb( -static void +static void AL_API __drep_cb( IN ib_cm_drep_rec_t *p_cm_drep_rec ) { @@ -926,7 +926,7 @@ __drep_cb( -static void +static void AL_API __cq_cb( IN const ib_cq_handle_t h_cq, IN void* cq_context ) @@ -1070,7 +1070,7 @@ __init_node( else cq_create.size = 1; /* minimal of one entry */ - cq_create.pfn_comp_cb = (ib_pfn_comp_cb_t)__cq_cb; + cq_create.pfn_comp_cb = __cq_cb; status = ib_create_cq( g_root.h_ca, &cq_create, p_node, NULL, &p_node->h_send_cq ); if( status != IB_SUCCESS ) @@ -1186,7 +1186,7 @@ __destroy_nodes() } /* query function called by ib_query() */ -static void +static void AL_API __sa_query_cb( IN ib_query_rec_t *p_query_rec ) { @@ -1259,7 +1259,7 @@ __query_for_path() query_rec.retry_cnt = 2; query_rec.flags = IB_FLAGS_SYNC; query_rec.query_context = &g_root; - query_rec.pfn_query_cb = (ib_pfn_query_cb_t)__sa_query_cb; + query_rec.pfn_query_cb = __sa_query_cb; status = ib_query( g_root.h_al, &query_rec, NULL ); if( ( status != IB_SUCCESS ) || ( !g_root.path_rec.dlid ) ) @@ -1319,7 +1319,7 @@ __create_messages() /* * PnP callback handler. Record the port GUID of an active port. */ -static ib_api_status_t +static ib_api_status_t AL_API __pnp_cb( IN ib_pnp_rec_t *p_pnp_rec ) { @@ -1379,7 +1379,7 @@ __reg_pnp() cl_memclr( &pnp_req, sizeof( ib_pnp_req_t ) ); pnp_req.pnp_class = IB_PNP_PORT; pnp_req.pnp_context = &g_root; - pnp_req.pfn_pnp_cb = (ib_pfn_pnp_cb_t)__pnp_cb; + pnp_req.pfn_pnp_cb = __pnp_cb; /* Register for PnP events. */ status = ib_reg_pnp( g_root.h_al, &pnp_req, &h_pnp ); @@ -1427,7 +1427,7 @@ __init_root() /* Open the CA. */ status = ib_open_ca( g_root.h_al, g_root.ca_guid, - (ib_pfn_event_cb_t)__ca_async_event_cb, + __ca_async_event_cb, &g_root, &g_root.h_ca ); if( status != IB_SUCCESS ) @@ -1478,7 +1478,7 @@ static void __cleanup() { if( g_root.h_listen ) - ib_cm_cancel( g_root.h_listen, (ib_pfn_destroy_cb_t)__cancel_listen_cb ); + ib_cm_cancel( g_root.h_listen, __cancel_listen_cb ); /* Close AL if it was opened. */ if( g_root.h_al ) @@ -1513,13 +1513,13 @@ __listen() /* The server side listens. */ cm_listen.svc_id = CMT_BASE_SVC_ID + g_root.inst_id; - cm_listen.pfn_cm_req_cb = (ib_pfn_cm_req_cb_t)__req_cb; + cm_listen.pfn_cm_req_cb = __req_cb; cm_listen.qp_type = IB_QPT_RELIABLE_CONN; status = ib_cm_listen( g_root.h_al, &cm_listen, - (ib_pfn_listen_err_cb_t)__cm_listen_err_cb, + __cm_listen_err_cb, &g_root, &g_root.h_listen ); if( status != IB_SUCCESS ) @@ -1706,8 +1706,7 @@ __disconnect() if( g_root.h_listen ) { - ib_cm_cancel( g_root.h_listen, - (const ib_pfn_destroy_cb_t)__cancel_listen_cb ); + ib_cm_cancel( g_root.h_listen, __cancel_listen_cb ); g_root.h_listen = NULL; } /* Calculate the total connection time. */ -- 2.41.0