[IBAL] Make CM debug output useful.

Signed off by: Fab Tillier

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

diff --git a/trunk/core/al/kernel/al_cm_cep.c b/trunk/core/al/kernel/al_cm_cep.c
index b9c1bbff752a6d334a267d79c0e6f14a679dec90..d5f3f2eccb2dc86ad9124a0d6cbf7fd63633d658 100644 (file)
--- a/trunk/core/al/kernel/al_cm_cep.c
+++ b/trunk/core/al/kernel/al_cm_cep.c
@@ -739,6 +739,7 @@ __format_req_av(
        p_cep->av[idx].port_guid = p_port_cep->port_guid;\r
        p_cep->av[idx].attr.port_num = p_port_cep->port_num;\r
 \r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("Received REQ SL %d", conn_req_path_get_svc_lvl( p_path )) );\r
        p_cep->av[idx].attr.sl = conn_req_path_get_svc_lvl( p_path );\r
        p_cep->av[idx].attr.dlid = p_path->local_lid;\r
 \r
@@ -2742,11 +2743,11 @@ pdata_cmp:
 \r
 match:\r
                /* Everything matched. */\r
-               AL_EXIT( AL_DBG_CM );\r
+               AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("] matched CID = %d\n", p_cep->cid) );\r
                return p_cep;\r
        }\r
 \r
-       AL_EXIT( AL_DBG_CM );\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("] not found\n") );\r
        return NULL;\r
 }\r
 \r
@@ -3387,6 +3388,9 @@ __complete_ndi_irp(
        net32_t* p_new_cid = (net32_t*)cl_ioctl_out_buf( p_irp );\r
        kcep_t* p_cep = (kcep_t*)p_mad->send_context1;\r
 \r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM,\r
+               ("Completing al_cep_get_cid IRP with CID = %d\n", p_cep->cid) );\r
+\r
        *p_new_cid = p_cep->cid;\r
        p_irp->IoStatus.Information = sizeof(uint32_t);\r
        p_irp->IoStatus.Status = STATUS_SUCCESS;\r
@@ -3401,7 +3405,7 @@ __cep_queue_mad(
        IN                              kcep_t* const                           p_cep,\r
        IN                              ib_mad_element_t*                       p_mad )\r
 {\r
-       AL_ENTER( AL_DBG_CM );\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("[ CID = %d\n", p_cep->cid) );\r
 \r
        CL_ASSERT( !p_mad->p_next );\r
 \r
@@ -3665,10 +3669,14 @@ kal_cep_alloc(
        KeReleaseInStackQueuedSpinLock( &hdl );\r
 \r
        if( !p_cep )\r
+       {\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Failed\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
+       }\r
 \r
        __bind_cep(p_cep, h_al, NULL, NULL);\r
        *p_cid = p_cep->cid;\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("allocated CID = %d\n", p_cep->cid) );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -3952,7 +3960,8 @@ __cleanup_cep(
        ib_mad_element_t        *p_mad;\r
        kcep_t                          *p_new_cep;\r
 \r
-       AL_ENTER( AL_DBG_CM );\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM,\r
+               ("[ p_cep = %p (CID = %d)\n", p_cep, p_cep->cid) );\r
 \r
        CL_ASSERT( p_cep );\r
        CL_ASSERT( KeGetCurrentIrql() == DISPATCH_LEVEL );\r
@@ -4138,7 +4147,7 @@ al_destroy_cep(
     ib_pfn_destroy_cb_t pfn_destroy_cb;\r
        int32_t                         ref_cnt;\r
 \r
-       AL_ENTER( AL_DBG_CM );\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM,("[ CID = %d\n", *p_cid) );\r
 \r
        CL_ASSERT( h_al );\r
 \r
@@ -4226,7 +4235,7 @@ al_cep_listen(
        intn_t                          cmp;\r
        KLOCK_QUEUE_HANDLE      hdl;\r
 \r
-       AL_ENTER( AL_DBG_CM );\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("[ CID = %d\n", cid) );\r
 \r
        CL_ASSERT( h_al );\r
        CL_ASSERT( p_listen_info );\r
@@ -4678,7 +4687,7 @@ kal_cep_pre_req(
        KLOCK_QUEUE_HANDLE      hdl;\r
        cep_agent_t                     *p_port_cep;\r
 \r
-       AL_ENTER( AL_DBG_CM );\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("[ CID = %d\n", cid) );\r
 \r
        CL_ASSERT( h_al );\r
        CL_ASSERT( p_cm_req );\r
@@ -4791,7 +4800,7 @@ al_cep_send_req(
        KLOCK_QUEUE_HANDLE      hdl;\r
        cep_agent_t                     *p_port_cep;\r
 \r
-       AL_ENTER( AL_DBG_CM );\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("[ CID = %d\n", cid) );\r
 \r
        CL_ASSERT( h_al );\r
 \r
@@ -5127,7 +5136,7 @@ kal_cep_pre_rep(
        kcep_t                          *p_cep;\r
        KLOCK_QUEUE_HANDLE      hdl;\r
 \r
-       AL_ENTER( AL_DBG_CM );\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("[ CID = %d\n", cid) );\r
 \r
        CL_ASSERT( h_al );\r
        CL_ASSERT( p_cm_rep );\r
@@ -5158,7 +5167,7 @@ al_cep_send_rep(
        KLOCK_QUEUE_HANDLE      hdl;\r
        cep_agent_t                     *p_port_cep;\r
 \r
-       AL_ENTER( AL_DBG_CM );\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("[ CID = %d\n", cid) );\r
 \r
        CL_ASSERT( h_al );\r
 \r
@@ -5254,7 +5263,7 @@ al_cep_rtu(
        cep_agent_t                     *p_port_cep;\r
        ib_mad_element_t        *p_mad;\r
 \r
-       AL_ENTER( AL_DBG_CM );\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("[ CID = %d\n", cid) );\r
 \r
        CL_ASSERT( h_al );\r
 \r
@@ -5317,7 +5326,7 @@ al_cep_rej(
        kcep_t                          *p_cep;\r
        KLOCK_QUEUE_HANDLE      hdl;\r
 \r
-       AL_ENTER( AL_DBG_CM );\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("[ CID = %d\n", cid) );\r
 \r
        CL_ASSERT( h_al );\r
 \r
@@ -5410,7 +5419,7 @@ al_cep_mra(
        ib_mad_element_t        *p_mad;\r
        uint8_t                         msg_mraed;\r
 \r
-       AL_ENTER( AL_DBG_CM );\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("[ CID = %d\n", cid) );\r
 \r
        CL_ASSERT( h_al );\r
        CL_ASSERT( p_cm_mra );\r
@@ -5547,7 +5556,7 @@ al_cep_lap(
        cep_agent_t                     *p_port_cep;\r
        ib_mad_element_t        *p_mad;\r
 \r
-       AL_ENTER( AL_DBG_CM );\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("[ CID = %d\n", cid) );\r
 \r
        CL_ASSERT( h_al );\r
        CL_ASSERT( p_cm_lap );\r
@@ -5678,7 +5687,7 @@ al_cep_pre_apr(
        KLOCK_QUEUE_HANDLE      hdl;\r
        cep_agent_t                     *p_port_cep;\r
 \r
-       AL_ENTER( AL_DBG_CM );\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("[ CID = %d\n", cid) );\r
 \r
        CL_ASSERT( h_al );\r
        CL_ASSERT( p_cm_apr );\r
@@ -5766,7 +5775,7 @@ al_cep_send_apr(
        KLOCK_QUEUE_HANDLE      hdl;\r
        cep_agent_t                     *p_port_cep;\r
 \r
-       AL_ENTER( AL_DBG_CM );\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("[ CID = %d\n", cid) );\r
 \r
        CL_ASSERT( h_al );\r
 \r
@@ -5825,7 +5834,7 @@ al_cep_dreq(
        cep_agent_t                     *p_port_cep;\r
        ib_mad_element_t        *p_mad;\r
 \r
-       AL_ENTER( AL_DBG_CM );\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("[ CID = %d\n", cid) );\r
 \r
        CL_ASSERT( h_al );\r
 \r
@@ -5895,7 +5904,7 @@ al_cep_drep(
        cep_agent_t                     *p_port_cep;\r
        ib_mad_element_t        *p_mad;\r
 \r
-       AL_ENTER( AL_DBG_CM );\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("[ CID = %d\n", cid) );\r
 \r
        CL_ASSERT( h_al );\r
 \r
@@ -5946,7 +5955,7 @@ al_cep_migrate(
        kcep_t                          *p_cep;\r
        KLOCK_QUEUE_HANDLE      hdl;\r
 \r
-       AL_ENTER( AL_DBG_CM );\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("[ CID = %d\n", cid) );\r
 \r
        CL_ASSERT( h_al );\r
 \r
@@ -5998,7 +6007,7 @@ al_cep_established(
        kcep_t                          *p_cep;\r
        KLOCK_QUEUE_HANDLE      hdl;\r
 \r
-       AL_ENTER( AL_DBG_CM );\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("[ CID = %d\n", cid) );\r
 \r
        CL_ASSERT( h_al );\r
 \r
@@ -6302,7 +6311,7 @@ al_cep_get_rtr_attr(
        kcep_t                          *p_cep;\r
        KLOCK_QUEUE_HANDLE      hdl;\r
 \r
-       AL_ENTER( AL_DBG_CM );\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("[ CID = %d\n", cid) );\r
 \r
        CL_ASSERT( h_al );\r
        CL_ASSERT( p_rtr );\r
@@ -6370,7 +6379,7 @@ al_cep_get_rts_attr(
        kcep_t                          *p_cep;\r
        KLOCK_QUEUE_HANDLE      hdl;\r
 \r
-       AL_ENTER( AL_DBG_CM );\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("[ CID = %d\n", cid) );\r
 \r
        CL_ASSERT( h_al );\r
        CL_ASSERT( p_rts );\r
@@ -6476,7 +6485,7 @@ al_cep_poll(
        kcep_t                          *p_cep;\r
        KLOCK_QUEUE_HANDLE      hdl;\r
 \r
-       AL_ENTER( AL_DBG_CM );\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("[ CID = %d\n", cid) );\r
 \r
        CL_ASSERT( h_al );\r
        CL_ASSERT( p_new_cid );\r
@@ -6516,7 +6525,7 @@ al_cep_poll(
 \r
 done:\r
        KeReleaseInStackQueuedSpinLock( &hdl );\r
-       AL_EXIT( AL_DBG_CM );\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("] return %d\n", status) );\r
        return status;\r
 }\r
 \r
@@ -6679,7 +6688,7 @@ al_cep_get_cid(
        KLOCK_QUEUE_HANDLE hdl;\r
        ib_mad_element_t* p_mad = NULL;\r
 \r
-       AL_ENTER( AL_DBG_NDI );\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("[ CID = %d\n", cid) );\r
        KeAcquireInStackQueuedSpinLock( &gp_cep_mgr->lock, &hdl );\r
 \r
        p_cep = __lookup_cep( h_al, cid );\r
@@ -6717,7 +6726,7 @@ al_cep_get_cid(
        \r
 exit:\r
        KeReleaseInStackQueuedSpinLock( &hdl );\r
-       AL_EXIT( AL_DBG_NDI );\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("] returned %08x\n", nt_status) );\r
        return nt_status;\r
 }\r
 \r
@@ -6735,7 +6744,7 @@ al_cep_get_pdata(
        KLOCK_QUEUE_HANDLE      hdl;\r
        uint8_t             copy_len;\r
 \r
-       AL_ENTER( AL_DBG_CM );\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("[ CID = %d\n", cid) );\r
 \r
        CL_ASSERT( h_al );\r
 \r