]> git.openfabrics.org - ~shefty/rdma-win.git/commitdiff
[IBAL] Add WPP tracing to KAL and UAL.
authorftillier <ftillier@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Thu, 8 Jun 2006 17:10:14 +0000 (17:10 +0000)
committerftillier <ftillier@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Thu, 8 Jun 2006 17:10:14 +0000 (17:10 +0000)
Signed-off-by: Yossi Leybovich (sleybo@mellanox.co.il)
git-svn-id: svn://openib.tc.cornell.edu/gen1@381 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

67 files changed:
trunk/core/al/al.c
trunk/core/al/al_av.c
trunk/core/al/al_ca.c
trunk/core/al/al_ci_ca_shared.c
trunk/core/al/al_cm_qp.c
trunk/core/al/al_cm_shared.c
trunk/core/al/al_common.c
trunk/core/al/al_common.h
trunk/core/al/al_cq.c
trunk/core/al/al_debug.h
trunk/core/al/al_dm.c
trunk/core/al/al_init.c
trunk/core/al/al_mad.c
trunk/core/al/al_mad_pool.h
trunk/core/al/al_mcast.c
trunk/core/al/al_mgr_shared.c
trunk/core/al/al_mr_shared.c
trunk/core/al/al_mw.c
trunk/core/al/al_pd.c
trunk/core/al/al_qp.c
trunk/core/al/al_query.c
trunk/core/al/al_reg_svc.c
trunk/core/al/al_res_mgr.c
trunk/core/al/al_sub.c
trunk/core/al/kernel/SOURCES
trunk/core/al/kernel/al_ci_ca.c
trunk/core/al/kernel/al_cm.c
trunk/core/al/kernel/al_cm_cep.c
trunk/core/al/kernel/al_cm_conn.c
trunk/core/al/kernel/al_cm_sidr.c
trunk/core/al/kernel/al_dev.c
trunk/core/al/kernel/al_ioc_pnp.c
trunk/core/al/kernel/al_mad_pool.c
trunk/core/al/kernel/al_mgr.c
trunk/core/al/kernel/al_mr.c
trunk/core/al/kernel/al_pnp.c
trunk/core/al/kernel/al_proxy.c
trunk/core/al/kernel/al_proxy_cep.c
trunk/core/al/kernel/al_proxy_cm.c
trunk/core/al/kernel/al_proxy_subnet.c
trunk/core/al/kernel/al_proxy_verbs.c
trunk/core/al/kernel/al_sa_req.c
trunk/core/al/kernel/al_smi.c
trunk/core/al/user/SOURCES
trunk/core/al/user/al_dll.c
trunk/core/al/user/al_mad_pool.c
trunk/core/al/user/ual_av.c
trunk/core/al/user/ual_ca.c
trunk/core/al/user/ual_ci_ca.c
trunk/core/al/user/ual_cm.c
trunk/core/al/user/ual_cm_cep.c
trunk/core/al/user/ual_cq.c
trunk/core/al/user/ual_mad.c
trunk/core/al/user/ual_mad_pool.c
trunk/core/al/user/ual_mcast.c
trunk/core/al/user/ual_mgr.c
trunk/core/al/user/ual_mr.c
trunk/core/al/user/ual_mw.c
trunk/core/al/user/ual_pd.c
trunk/core/al/user/ual_pnp.c
trunk/core/al/user/ual_qp.c
trunk/core/al/user/ual_sa_req.c
trunk/core/al/user/ual_support.h
trunk/core/bus/kernel/SOURCES
trunk/core/bus/kernel/bus_driver.c
trunk/core/bus/kernel/ib_bus.inf
trunk/inc/iba/ib_types.h

index af2fdbdd65c68fb1206cabc8b9d1b15664b8cd69..0a71d4213a1ecfd5b3e500ee47a113778e0057ff 100644 (file)
 #include "al_cm_cep.h"\r
 #include "al_common.h"\r
 #include "al_debug.h"\r
+\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al.tmh"\r
+#endif\r
+\r
 #include "al_mad_pool.h"\r
 #include "al_mgr.h"\r
 #include "al_verbs.h"\r
@@ -67,18 +75,18 @@ do_close_al(
        IN              const   ib_al_handle_t                          h_al )\r
 #endif\r
 {\r
-       CL_ENTER( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MGR );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_al, AL_OBJ_TYPE_H_AL ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_AL_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_AL_HANDLE\n") );\r
                return IB_INVALID_AL_HANDLE;\r
        }\r
 \r
        ref_al_obj( &h_al->obj );\r
        h_al->obj.pfn_destroy( &h_al->obj, NULL );\r
 \r
-       CL_EXIT( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MGR );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -133,7 +141,7 @@ __free_mads(
                status = ib_put_mad( &p_mad_element->element );\r
                if( status != IB_SUCCESS )\r
                {\r
-                       CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("ib_put_mad failed with status %s, continuing.\n",\r
                                ib_get_err_str(status)) );\r
                }\r
@@ -173,16 +181,16 @@ ib_query_ca_by_guid(
        ib_ca_handle_t          h_ca;\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CA );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_al, AL_OBJ_TYPE_H_AL ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_AL_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_AL_HANDLE\n") );\r
                return IB_INVALID_AL_HANDLE;\r
        }\r
        if( !p_size )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -194,7 +202,7 @@ ib_query_ca_by_guid(
        status = ib_query_ca( h_ca, p_ca_attr, p_size );\r
        deref_al_obj( &h_ca->obj );\r
 \r
-       CL_EXIT( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CA );\r
        return status;\r
 }\r
 \r
@@ -408,7 +416,7 @@ ib_cancel_query(
 \r
        if( AL_OBJ_INVALID_HANDLE( h_al, AL_OBJ_TYPE_H_AL ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_AL_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_AL_HANDLE\n") );\r
                return;\r
        }\r
 \r
index 89b248608dc7bba4f90276ca1e02d08a9b61cbe4..503b22bcfa2fd826481c42ba5c04e3a6ebaa354f 100644 (file)
 #include "al.h"\r
 #include "al_av.h"\r
 #include "al_debug.h"\r
+\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_av.tmh"\r
+#endif\r
+\r
 #include "al_pd.h"\r
 #include "al_res_mgr.h"\r
 #include "al_verbs.h"\r
@@ -118,13 +126,13 @@ create_av(
 \r
        if( !p_av_attr || !ph_av )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_pd, AL_OBJ_TYPE_H_PD ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PD_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PD_HANDLE\n") );\r
                return IB_INVALID_PD_HANDLE;\r
        }\r
 \r
@@ -161,18 +169,18 @@ ib_api_status_t
 ib_destroy_av(\r
        IN              const   ib_av_handle_t                          h_av )\r
 {\r
-       CL_ENTER( AL_DBG_AV, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_AV );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_av, AL_OBJ_TYPE_H_AV ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_AV_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_AV_HANDLE\n") );\r
                return IB_INVALID_AV_HANDLE;\r
        }\r
 \r
        ref_al_obj( &h_av->obj );\r
        h_av->obj.pfn_destroy( &h_av->obj, NULL );\r
 \r
-       CL_EXIT( AL_DBG_AV, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_AV );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -235,16 +243,16 @@ query_av(
 {\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_AV, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_AV );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_av, AL_OBJ_TYPE_H_AV ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_AV_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_AV_HANDLE\n") );\r
                return IB_INVALID_AV_HANDLE;\r
        }\r
        if( !p_av_attr || !ph_pd )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -257,7 +265,7 @@ query_av(
                h_av->av_attr = *p_av_attr;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_AV, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_AV );\r
        return status;\r
 }\r
 \r
@@ -280,16 +288,16 @@ modify_av(
 {\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_AV, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_AV );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_av, AL_OBJ_TYPE_H_AV ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_AV_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_AV_HANDLE\n") );\r
                return IB_INVALID_AV_HANDLE;\r
        }\r
        if( !p_av_mod )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -301,6 +309,6 @@ modify_av(
                h_av->av_attr = *p_av_mod;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_AV, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_AV );\r
        return status;\r
 }\r
index 7ebacd5cace920b3d375f96f4740dc87ad369d0a..efc3445e15daecb057b7d5671f9d478c4cb04718 100644 (file)
 #include "al_ca.h"\r
 #include "al_cq.h"\r
 #include "al_debug.h"\r
+\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_ca.tmh"\r
+#endif\r
+\r
 #include "al_mgr.h"\r
 #include "al_mr.h"\r
 #include "al_mw.h"\r
@@ -73,7 +81,7 @@ ib_open_ca(
 \r
        if( AL_OBJ_INVALID_HANDLE( h_al, AL_OBJ_TYPE_H_AL ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_AL_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_AL_HANDLE\n") );\r
                return IB_INVALID_AL_HANDLE;\r
        }\r
 \r
@@ -100,10 +108,10 @@ open_ca(
        ib_api_status_t                 status;\r
        al_obj_type_t                   obj_type = AL_OBJ_TYPE_H_CA;\r
 \r
-       CL_ENTER( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CA );\r
        if( !ph_ca )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -111,7 +119,7 @@ open_ca(
        h_ca = (ib_ca_handle_t)cl_zalloc( sizeof( ib_ca_t ) );\r
        if( !h_ca )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("IB_INSUFFICIENT_MEMORY\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -127,7 +135,7 @@ open_ca(
        if( status != IB_SUCCESS )\r
        {\r
                __free_ca( &h_ca->obj );\r
-               CL_EXIT( AL_DBG_CA, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CA );\r
                return status;\r
        }\r
 \r
@@ -144,7 +152,7 @@ open_ca(
        if( !h_ca->obj.p_ci_ca )\r
        {\r
                h_ca->obj.pfn_destroy( &h_ca->obj, NULL );\r
-               CL_EXIT( AL_DBG_CA, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CA );\r
                return IB_INVALID_GUID;\r
        }\r
 \r
@@ -157,7 +165,7 @@ open_ca(
                if( status != IB_SUCCESS )\r
                {\r
                        h_ca->obj.pfn_destroy( &h_ca->obj, NULL );\r
-                       CL_EXIT( AL_DBG_CA, g_al_dbg_lvl );\r
+                       AL_EXIT( AL_DBG_CA );\r
                        return status;\r
                }\r
        }\r
@@ -165,7 +173,7 @@ open_ca(
 \r
        *ph_ca = h_ca;\r
 \r
-       CL_EXIT( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CA );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -178,18 +186,18 @@ ib_close_ca(
        IN              const   ib_ca_handle_t                          h_ca,\r
        IN              const   ib_pfn_destroy_cb_t                     pfn_destroy_cb OPTIONAL )\r
 {\r
-       CL_ENTER( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CA );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_ca, AL_OBJ_TYPE_H_CA ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_CA_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_CA_HANDLE\n") );\r
                return IB_INVALID_CA_HANDLE;\r
        }\r
 \r
        ref_al_obj( &h_ca->obj );\r
        h_ca->obj.pfn_destroy( &h_ca->obj, pfn_destroy_cb );\r
 \r
-       CL_EXIT( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CA );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -255,22 +263,22 @@ query_ca(
 {\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CA );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_ca, AL_OBJ_TYPE_H_CA ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_CA_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_CA_HANDLE\n") );\r
                return IB_INVALID_CA_HANDLE;\r
        }\r
        if( !p_size )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
        status = verbs_query_ca( h_ca, p_ca_attr, p_size );\r
 \r
-       CL_EXIT( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CA );\r
        return status;\r
 }\r
 \r
@@ -285,22 +293,22 @@ ib_modify_ca(
 {\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CA );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_ca, AL_OBJ_TYPE_H_CA ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_CA_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_CA_HANDLE\n") );\r
                return IB_INVALID_CA_HANDLE;\r
        }\r
        if( !p_port_attr_mod )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
        status = verbs_modify_ca(h_ca, port_num, ca_mod, p_port_attr_mod);\r
 \r
-       CL_EXIT( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CA );\r
        return status;\r
 }\r
 \r
@@ -318,11 +326,11 @@ ib_alloc_pd(
 {\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_PD, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PD );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_ca, AL_OBJ_TYPE_H_CA ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_CA_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_CA_HANDLE\n") );\r
                return IB_INVALID_CA_HANDLE;\r
        }\r
 \r
@@ -332,7 +340,7 @@ ib_alloc_pd(
        if( status == IB_SUCCESS )\r
                deref_al_obj( &(*ph_pd)->obj );\r
 \r
-       CL_EXIT( AL_DBG_PD, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PD );\r
        return status;\r
 }\r
 \r
@@ -348,11 +356,11 @@ ib_create_cq(
 {\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_CQ, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CQ );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_ca, AL_OBJ_TYPE_H_CA ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_CA_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_CA_HANDLE\n") );\r
                return IB_INVALID_CA_HANDLE;\r
        }\r
 \r
@@ -363,7 +371,7 @@ ib_create_cq(
        if( status == IB_SUCCESS )\r
                deref_al_obj( &(*ph_cq)->obj );\r
 \r
-       CL_EXIT( AL_DBG_CQ, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CQ );\r
        return status;\r
 }\r
 \r
index a6b1a9e17bc55fae4bae47bfe3307fe8ee296707..354761e5d0dc69a80e00bfd8e5d2d519c0c152b5 100644 (file)
 #include "al_common.h"\r
 #include "al_cq.h"\r
 #include "al_debug.h"\r
+\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_ci_ca_shared.tmh"\r
+#endif\r
+\r
 #include "al_mgr.h"\r
 #include "al_pnp.h"\r
 #include "al_qp.h"\r
@@ -114,13 +122,13 @@ get_port_info(
        uint32_t                        attr_size;\r
        uint8_t                         i;\r
 \r
-       CL_ENTER( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CA );\r
 \r
        /* Get the size of the CA attribute structure. */\r
        status = ib_query_ca( p_ci_ca->h_ca, NULL, &attr_size );\r
        if( status != IB_INSUFFICIENT_MEMORY )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_query_ca failed with status %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -129,7 +137,7 @@ get_port_info(
        p_ca_attr = cl_malloc( attr_size );\r
        if( !p_ca_attr )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cl_malloc failed to allocate p_ca_attr!\n") );\r
                return IB_INSUFFICIENT_RESOURCES;\r
        }\r
@@ -140,7 +148,7 @@ get_port_info(
        {\r
                cl_free( p_ca_attr );\r
 \r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_query_ca failed with status %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -152,7 +160,7 @@ get_port_info(
        {\r
                cl_free( p_ca_attr );\r
 \r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cl_malloc failed to allocate port_array!\n") );\r
                return IB_INSUFFICIENT_RESOURCES;\r
        }\r
@@ -177,7 +185,7 @@ get_port_info(
 \r
        cl_free( p_ca_attr );\r
 \r
-       CL_EXIT( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CA );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -191,7 +199,7 @@ ci_ca_async_event(
        cl_pool_item_t*                 p_item;\r
        event_item_t*                   p_event_item;\r
 \r
-       CL_ENTER( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CA );\r
 \r
        CL_ASSERT( p_event_rec );\r
 \r
@@ -203,7 +211,7 @@ ci_ca_async_event(
        {\r
                /* Ignore events if the object is being destroyed. */\r
                cl_spinlock_release( &p_obj->lock );\r
-               CL_EXIT( AL_DBG_CA, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CA );\r
                return;\r
        }\r
 \r
@@ -226,7 +234,7 @@ ci_ca_async_event(
        {\r
                /* Could not get an item.  This event will not be reported. */\r
                cl_spinlock_release( &p_obj->lock );\r
-               CL_EXIT( AL_DBG_CA, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CA );\r
                return;\r
        }\r
 \r
@@ -244,7 +252,7 @@ ci_ca_async_event(
        p_event_item->async_item.pfn_callback = ci_ca_process_event_cb;\r
        cl_async_proc_queue( gp_async_proc_mgr, &p_event_item->async_item );\r
 \r
-       CL_EXIT( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CA );\r
 }\r
 \r
 \r
@@ -256,7 +264,7 @@ ci_ca_process_event_cb(
        event_item_t*                   p_event_item;\r
        al_obj_t*                               p_obj;\r
 \r
-       CL_ENTER( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CA );\r
 \r
        CL_ASSERT( p_async_item );\r
 \r
@@ -333,7 +341,7 @@ ci_ca_process_event_cb(
        /* Dereference the object. */\r
        deref_al_obj( p_obj );\r
 \r
-       CL_EXIT( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CA );\r
 }\r
 \r
 \r
@@ -441,11 +449,11 @@ get_port_attr(
        uintn_t                 port_index, gid_index;\r
        ib_port_attr_t  *p_port_attr;\r
 \r
-       CL_ENTER( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CA );\r
 \r
        if( !p_ca_attr || !p_gid )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("No p_ca_attr or p_gid.\n") );\r
                return NULL;\r
        }\r
@@ -460,13 +468,13 @@ get_port_attr(
                        if( !cl_memcmp( &p_port_attr->p_gid_table[gid_index],\r
                                p_gid, sizeof(ib_gid_t) ) )\r
                        {\r
-                               CL_EXIT( AL_DBG_CA, g_al_dbg_lvl );\r
+                               AL_EXIT( AL_DBG_CA );\r
                                return p_port_attr;\r
                        }\r
                }\r
        }\r
 \r
-       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("No match found.\n") );\r
+       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("No match found.\n") );\r
        return NULL;\r
 }\r
 \r
@@ -503,7 +511,7 @@ ci_ca_update_attr(
        uint32_t                        attr_size;\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CA );\r
 \r
        /* Query to get the CA attributes size. */\r
        attr_size = 0;\r
@@ -517,7 +525,7 @@ ci_ca_update_attr(
        p_pnp_attr = (ib_ca_attr_t*)cl_zalloc( attr_size * 2 );\r
        if( !p_pnp_attr )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CA, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_WARNING, AL_DBG_CA,\r
                        ("Unable to allocate buffer for PnP attributes\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -526,7 +534,7 @@ ci_ca_update_attr(
        status = ib_query_ca( p_ci_ca->h_ca, p_pnp_attr, &attr_size );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CA, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_WARNING, AL_DBG_CA,\r
                        ("Unable to query attributes\n") );\r
                cl_free( p_pnp_attr );\r
                return status;\r
@@ -544,7 +552,7 @@ ci_ca_update_attr(
        p_ci_ca->p_user_attr = (ib_ca_attr_t*)(((uint8_t*)p_pnp_attr) + attr_size);\r
        ci_ca_unlock_attr( p_ci_ca );\r
 \r
-       CL_EXIT( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CA );\r
        return IB_SUCCESS;\r
 }\r
 \r
index 518284f3e437c403d528b350b88b376f70b5d89c..7168f266d1fc9f07cb2c444665e36475f6534fe1 100644 (file)
 #include "al_debug.h"\r
 \r
 \r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_cm_qp.tmh"\r
+#endif\r
+\r
 typedef struct _al_listen\r
 {\r
        al_obj_t                                        obj;\r
@@ -101,7 +108,7 @@ __cep_timewait_qp(
                        ( (h_qp->obj.state != CL_INITIALIZED) && \r
                        (h_qp->obj.state != CL_DESTROYING) ) )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_CM, ("IB_INVALID_QP_HANDLE\n") );\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
                        return;\r
                }\r
 \r
@@ -112,7 +119,7 @@ __cep_timewait_qp(
                status = h_qp->pfn_modify_qp( h_qp, &qp_mod, NULL );\r
                if( status != IB_SUCCESS )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("pfn_modify_qp to IB_QPS_ERROR returned %s\n",\r
                                ib_get_err_str( status )) );\r
                        return;\r
@@ -415,7 +422,7 @@ __proc_failed_send(
                __proc_dconn_timeout( h_qp );\r
                break;\r
        default:\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Invalid CM send MAD attribute ID %d.\n", p_mad->attr_id) );\r
                break;\r
        }\r
@@ -720,7 +727,7 @@ __cep_lap_qp(
        status = al_cep_get_rts_attr( p_cm->h_al, p_cm->cid, &qp_mod );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("al_cep_get_rts_attr returned %s.\n", ib_get_err_str(status)) );\r
                goto done;\r
        }\r
@@ -728,7 +735,7 @@ __cep_lap_qp(
        status = ib_modify_qp( p_cm->h_qp, &qp_mod );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_modify_qp for LAP returned %s.\n", ib_get_err_str(status)) );\r
        }\r
 \r
@@ -840,7 +847,7 @@ __proc_conn(
        //      break;\r
 \r
        default:\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Invalid CM recv MAD attribute ID %d.\n", p_mad->attr_id) );\r
        }\r
 \r
@@ -935,7 +942,7 @@ __cm_handler(
        p_async_mad = (cep_async_mad_t*)cl_zalloc( sizeof(cep_async_mad_t) );\r
        if( !p_async_mad )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("failed to cl_zalloc cm_async_mad_t (%d bytes)\n",\r
                        sizeof(cep_async_mad_t)) );\r
                return;\r
@@ -980,7 +987,7 @@ __cep_init_qp(
                status = ib_modify_qp( h_qp, &qp_mod );\r
                if( status != IB_SUCCESS )\r
                {\r
-                       AL_TRACE( AL_DBG_ERROR,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("ib_modify_qp to IB_QPS_RESET returned %s\n",\r
                                ib_get_err_str(status) ) );\r
                }\r
@@ -989,7 +996,7 @@ __cep_init_qp(
                status = ib_modify_qp( h_qp, p_init );\r
                if( status != IB_SUCCESS )\r
                {\r
-                       AL_TRACE( AL_DBG_ERROR,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("ib_modify_qp returned %s.\n", ib_get_err_str(status) ) );\r
                        return status;\r
                }\r
@@ -1011,7 +1018,7 @@ __cep_pre_req(
                ((al_conn_qp_t*)p_cm_req->h_qp)->cid, p_cm_req, &qp_mod );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("al_cep_pre_req returned %s.\n", ib_get_err_str( status )) );\r
                return status;\r
        }\r
@@ -1026,7 +1033,7 @@ __cep_pre_req(
        status = __cep_init_qp( p_cm_req->h_qp, &qp_mod );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__cep_init_qp returned %s\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -1071,7 +1078,7 @@ __cep_conn_req(
        status = al_create_cep( h_al, __cm_handler, p_cm_req->h_qp, &cid );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("al_create_cep returned %s.\n", ib_get_err_str( status )) );\r
                goto done;\r
        }\r
@@ -1088,7 +1095,7 @@ __cep_conn_req(
        status = __cep_pre_req( p_cm_req );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__cep_pre_req returned %s.\n", ib_get_err_str( status )) );\r
                goto err;\r
        }\r
@@ -1106,7 +1113,7 @@ __cep_conn_req(
                //if( p_sync_event )\r
                //      cl_event_destroy( p_sync_event );\r
 \r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("al_cep_send_req returned %s.\n", ib_get_err_str(status)) );\r
 err:\r
                ref_al_obj( &p_qp->qp.obj );\r
@@ -1118,7 +1125,7 @@ err:
        /* wait on event if synchronous operation */\r
        //if( p_sync_event )\r
        //{\r
-       //      CL_TRACE( AL_DBG_CM, g_al_dbg_lvl,\r
+       //      AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
        //              ("event blocked on REQ...\n") );\r
        //      cl_event_wait_on( p_sync_event, EVENT_NO_TIMEOUT, FALSE );\r
 \r
@@ -1141,7 +1148,7 @@ ib_cm_req(
 \r
        if( !p_cm_req )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1149,7 +1156,7 @@ ib_cm_req(
        switch( p_cm_req->qp_type )\r
        {\r
        default:\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("Invalid qp_type.\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Invalid qp_type.\n") );\r
                return IB_INVALID_SETTING;\r
 \r
        case IB_QPT_RELIABLE_CONN:\r
@@ -1157,7 +1164,7 @@ ib_cm_req(
                if( AL_OBJ_INVALID_HANDLE( p_cm_req->h_qp, AL_OBJ_TYPE_H_QP ) ||\r
                        (p_cm_req->h_qp->type != p_cm_req->qp_type) )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
                        return IB_INVALID_QP_HANDLE;\r
                }\r
 \r
@@ -1167,7 +1174,7 @@ ib_cm_req(
        case IB_QPT_UNRELIABLE_DGRM:\r
                if( AL_OBJ_INVALID_HANDLE( p_cm_req->h_al, AL_OBJ_TYPE_H_AL ) )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_AL_HANDLE\n") );\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_AL_HANDLE\n") );\r
                        return IB_INVALID_AL_HANDLE;\r
                }\r
                status = IB_UNSUPPORTED;\r
@@ -1202,7 +1209,7 @@ __cep_rts_qp(
        status = al_cep_get_rtr_attr( h_cm.h_al, h_cm.cid, &qp_mod );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("al_cep_get_rtr_attr returned %s\n", ib_get_err_str( status )) );\r
                return status;\r
        }\r
@@ -1228,7 +1235,7 @@ __cep_rts_qp(
        status = ib_modify_qp( h_qp, &qp_mod );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_modify_qp to RTR returned %s.\n", ib_get_err_str(status) ) );\r
                return status;\r
        }\r
@@ -1237,7 +1244,7 @@ __cep_rts_qp(
        status = al_cep_get_rts_attr( h_cm.h_al, h_cm.cid, &qp_mod );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("al_cep_get_rts_attr returned %s\n", ib_get_err_str( status )) );\r
                return status;\r
        }\r
@@ -1245,7 +1252,7 @@ __cep_rts_qp(
        status = ib_modify_qp( h_qp, &qp_mod );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_modify_qp to RTS returned %s.\n", ib_get_err_str(status) ) );\r
                return status;\r
        }\r
@@ -1270,7 +1277,7 @@ __cep_pre_rep(
        status = __cep_init_qp( p_cm_rep->h_qp, p_qp_mod );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cm_init_qp returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -1282,7 +1289,7 @@ __cep_pre_rep(
                        (ib_recv_wr_t** __ptr64)p_cm_rep->pp_recv_failure );\r
                if( status != IB_SUCCESS )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("ib_post_recv returned %s.\n", ib_get_err_str(status)) );\r
                        return status;\r
                }\r
@@ -1293,7 +1300,7 @@ __cep_pre_rep(
                p_cm_rep->access_ctrl, p_cm_rep->sq_depth, p_cm_rep->rq_depth );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__cep_rts_qp returned %s.\n", ib_get_err_str(status)) );\r
        }\r
 \r
@@ -1320,7 +1327,7 @@ __cep_conn_rep(
        if( cid != AL_INVALID_CID )\r
        {\r
                /* We don't destroy the CEP to allow the user to retry accepting. */\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("QP already connected.\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("QP already connected.\n") );\r
                return IB_INVALID_QP_HANDLE;\r
        }\r
 \r
@@ -1335,7 +1342,7 @@ __cep_conn_rep(
                h_cm.h_al, h_cm.cid, p_cm_rep->h_qp, p_cm_rep, &qp_mod );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("al_cep_pre_rep returned %s.\n", ib_get_err_str( status )) );\r
                goto err;\r
        }\r
@@ -1347,7 +1354,7 @@ __cep_conn_rep(
        status = __cep_pre_rep( h_cm, &qp_mod, p_cm_rep );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__cep_pre_req returned %s\n", ib_get_err_str(status)) );\r
                goto err;\r
        }\r
@@ -1355,7 +1362,7 @@ __cep_conn_rep(
        status = al_cep_send_rep( h_cm.h_al, h_cm.cid );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("al_cep_send_rep returned %s\n", ib_get_err_str(status)) );\r
 err:\r
                cl_atomic_xchg(\r
@@ -1393,7 +1400,7 @@ ib_cm_rep(
 \r
        if( !p_cm_rep )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1402,7 +1409,7 @@ ib_cm_rep(
        switch( p_cm_rep->qp_type )\r
        {\r
        default:\r
-               AL_TRACE( AL_DBG_ERROR, ("Invalid qp_type.\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Invalid qp_type.\n") );\r
                status = IB_INVALID_SETTING;\r
                break;\r
 \r
@@ -1411,12 +1418,12 @@ ib_cm_rep(
                if( AL_OBJ_INVALID_HANDLE( p_cm_rep->h_qp, AL_OBJ_TYPE_H_QP ) ||\r
                        (p_cm_rep->h_qp->type != p_cm_rep->qp_type) )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
                        status = IB_INVALID_QP_HANDLE;\r
                }\r
                else if( p_cm_rep->h_qp->obj.h_al != h_cm_req.h_al )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
                        status = IB_INVALID_QP_HANDLE;\r
                }\r
                break;\r
@@ -1426,7 +1433,7 @@ ib_cm_rep(
                        (AL_OBJ_INVALID_HANDLE( p_cm_rep->h_qp, AL_OBJ_TYPE_H_QP ) ||\r
                        (p_cm_rep->h_qp->type != p_cm_rep->qp_type) ) )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
                        status = IB_INVALID_QP_HANDLE;\r
                }\r
                break;\r
@@ -1464,7 +1471,7 @@ ib_cm_rtu(
 \r
        if( !p_cm_rtu )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1474,7 +1481,7 @@ ib_cm_rtu(
        // */\r
        //if( p_conn->p_sync_event )\r
        //{\r
-       //      CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+       //      AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
        //              ("Connection in invalid state. Sync call in progress.\n" ) );\r
 \r
        //      cm_res_release( p_conn );\r
@@ -1489,7 +1496,7 @@ ib_cm_rtu(
                p_cm_rtu->access_ctrl, p_cm_rtu->sq_depth, p_cm_rtu->rq_depth );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__cep_rts_qp returned %s.\n", ib_get_err_str( status )) );\r
                goto err;\r
        }\r
@@ -1520,7 +1527,7 @@ err:
                        }\r
                }\r
 \r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("al_cep_rtu returned %s.\n", ib_get_err_str( status )) );\r
                return status;\r
        }\r
@@ -1541,14 +1548,14 @@ ib_cm_mra(
 \r
        if( !p_cm_mra )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
        status = al_cep_mra( h_cm.h_al, h_cm.cid, p_cm_mra );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("al_cep_mra returned %s\n", ib_get_err_str( status )) );\r
        }\r
 \r
@@ -1569,7 +1576,7 @@ ib_cm_rej(
 \r
        if( !p_cm_rej )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1607,7 +1614,7 @@ ib_cm_dreq(
 \r
        if( !p_cm_dreq )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1615,7 +1622,7 @@ ib_cm_dreq(
        switch( p_cm_dreq->qp_type )\r
        {\r
        default:\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("Invalid qp_type.\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Invalid qp_type.\n") );\r
                return IB_INVALID_SETTING;\r
 \r
        case IB_QPT_RELIABLE_CONN:\r
@@ -1623,7 +1630,7 @@ ib_cm_dreq(
                if( AL_OBJ_INVALID_HANDLE( p_cm_dreq->h_qp, AL_OBJ_TYPE_H_QP ) ||\r
                        (p_cm_dreq->h_qp->type != p_cm_dreq->qp_type) )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
                        return IB_INVALID_QP_HANDLE;\r
                }\r
                break;\r
@@ -1688,7 +1695,7 @@ ib_cm_drep(
 \r
        if( !p_cm_drep )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1741,7 +1748,7 @@ ib_cm_lap(
 \r
        if( !p_cm_lap )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1749,7 +1756,7 @@ ib_cm_lap(
        switch( p_cm_lap->qp_type )\r
        {\r
        default:\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("Invalid qp_type.\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Invalid qp_type.\n") );\r
                return IB_INVALID_SETTING;\r
 \r
        case IB_QPT_RELIABLE_CONN:\r
@@ -1757,7 +1764,7 @@ ib_cm_lap(
                if( AL_OBJ_INVALID_HANDLE( p_cm_lap->h_qp, AL_OBJ_TYPE_H_QP ) ||\r
                        (p_cm_lap->h_qp->type != p_cm_lap->qp_type) )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
                        return IB_INVALID_QP_HANDLE;\r
                }\r
                break;\r
@@ -1767,7 +1774,7 @@ ib_cm_lap(
                ((al_conn_qp_t*)p_cm_lap->h_qp)->cid, p_cm_lap );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("al_cep_lap returned %s.\n", ib_get_err_str( status )) );\r
        }\r
 \r
@@ -1788,7 +1795,7 @@ ib_cm_apr(
 \r
        if( !p_cm_apr )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1796,7 +1803,7 @@ ib_cm_apr(
        switch( p_cm_apr->qp_type )\r
        {\r
        default:\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("Invalid qp_type.\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Invalid qp_type.\n") );\r
                return IB_INVALID_SETTING;\r
 \r
        case IB_QPT_RELIABLE_CONN:\r
@@ -1804,7 +1811,7 @@ ib_cm_apr(
                if( AL_OBJ_INVALID_HANDLE( p_cm_apr->h_qp, AL_OBJ_TYPE_H_QP ) ||\r
                        (p_cm_apr->h_qp->type != p_cm_apr->qp_type) )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
                        return IB_INVALID_QP_HANDLE;\r
                }\r
                break;\r
@@ -1813,7 +1820,7 @@ ib_cm_apr(
        status = al_cep_pre_apr( h_cm_lap.h_al, h_cm_lap.cid, p_cm_apr, &qp_mod );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("al_cep_pre_apr returned %s.\n", ib_get_err_str( status )) );\r
                return status;\r
        }\r
@@ -1822,7 +1829,7 @@ ib_cm_apr(
        status = ib_modify_qp( h_cm_lap.h_qp, &qp_mod );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_modify_qp for LAP returned %s.\n",\r
                        ib_get_err_str( status )) );\r
                return status;\r
@@ -1847,7 +1854,7 @@ ib_force_apm(
 \r
        if( AL_OBJ_INVALID_HANDLE( h_qp, AL_OBJ_TYPE_H_QP ) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
                return IB_INVALID_QP_HANDLE;\r
        }\r
 \r
@@ -1879,7 +1886,7 @@ __destroying_listen(
                p_obj->h_al, p_listen->cid, deref_al_obj );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("al_destroy_cep returned %s.\n", ib_get_err_str( status )) );\r
                deref_al_obj( p_obj );\r
        }\r
@@ -1941,7 +1948,7 @@ __cep_listen(
        if( status != IB_SUCCESS )\r
        {\r
                p_listen->obj.pfn_destroy( &p_listen->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -1951,7 +1958,7 @@ __cep_listen(
        if( status != IB_SUCCESS )\r
        {\r
                p_listen->obj.pfn_destroy( &p_listen->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("al_create_cep returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -1969,7 +1976,7 @@ __cep_listen(
        if( status != IB_SUCCESS )\r
        {\r
                p_listen->obj.pfn_destroy( &p_listen->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("al_cep_listen returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -1998,19 +2005,19 @@ ib_cm_listen(
 \r
        if( AL_OBJ_INVALID_HANDLE( h_al, AL_OBJ_TYPE_H_AL ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_AL_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_AL_HANDLE\n") );\r
                return IB_INVALID_AL_HANDLE;\r
        }\r
        if( !p_cm_listen || !pfn_listen_err_cb || !ph_cm_listen )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
        status = __cep_listen(h_al, p_cm_listen, pfn_listen_err_cb, listen_context,\r
                ph_cm_listen );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return status;\r
 }\r
 \r
@@ -2024,7 +2031,7 @@ ib_cm_cancel(
 \r
        if( AL_OBJ_INVALID_HANDLE( h_cm_listen, AL_OBJ_TYPE_H_LISTEN ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
 \r
index f46e4289287becc0e5fc1bd64403673ebdc0a3e8..7da15fed6a43ff6935e24572783cc2e6ee4d5cd9 100644 (file)
@@ -44,7 +44,7 @@ __reset_qp(
        ib_qp_mod_t                     qp_mod;\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        cl_memclr( &qp_mod, sizeof(ib_qp_mod_t) );\r
        qp_mod.req_state = IB_QPS_RESET;\r
@@ -52,12 +52,12 @@ __reset_qp(
        status = ib_modify_qp( h_qp, &qp_mod );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_modify_qp to IB_QPS_RESET returned %s\n",\r
                        ib_get_err_str(status) ) );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return status;\r
 }\r
 \r
@@ -74,7 +74,7 @@ __init_qp(
        ib_qp_mod_t                     qp_mod;\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        cl_memclr( &qp_mod, sizeof(ib_qp_mod_t) );\r
        qp_mod.req_state = IB_QPS_INIT;\r
@@ -86,7 +86,7 @@ __init_qp(
        if( !p_port_attr )\r
        {\r
                ci_ca_unlock_attr( h_qp->obj.p_ci_ca );\r
-               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl, ("invalid p_gid\n" ) );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("invalid p_gid\n" ) );\r
                return IB_INVALID_GID;\r
        }\r
 \r
@@ -96,19 +96,19 @@ __init_qp(
 \r
        if( qp_mod.state.init.pkey_index == BAD_PKEY_INDEX )\r
        {\r
-               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl, ("invalid PKEY\n" ) );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("invalid PKEY\n" ) );\r
                return IB_INVALID_PKEY;\r
        }\r
 \r
        status = ib_modify_qp( h_qp, &qp_mod );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_modify_qp to IB_QPS_INIT returned %s\n",\r
                        ib_get_err_str(status) ) );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return status;\r
 }\r
 \r
@@ -139,7 +139,7 @@ cm_init_qp(
                status = __reset_qp( h_qp );\r
                if( status != IB_SUCCESS )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("__reset_qp returned %s\n", ib_get_err_str(status) ) );\r
                        return status;\r
                }\r
@@ -148,7 +148,7 @@ cm_init_qp(
                status = __init_qp( h_qp, p_gid, pkey, access_ctrl );\r
                if( status != IB_SUCCESS )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("__init_qp returned %s.\n", ib_get_err_str(status) ) );\r
                        return status;\r
                }\r
@@ -167,13 +167,13 @@ cm_rts_qp(
 {\r
        ib_api_status_t status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Set the QP to RTR. */\r
        status = ib_modify_qp( h_qp, p_qp_mod_rtr );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_modify_qp to RTR returned %s.\n", ib_get_err_str(status) ) );\r
                return status;\r
        }\r
@@ -182,12 +182,12 @@ cm_rts_qp(
        status = ib_modify_qp( h_qp, p_qp_mod_rts );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_modify_qp to RTS returned %s.\n", ib_get_err_str(status) ) );\r
                return status;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -208,14 +208,14 @@ cm_reset_qp(
        ib_qp_mod_t                     qp_mod;\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Special checks on the QP state for error handling - see above. */\r
        if( !h_qp || !AL_OBJ_IS_TYPE( h_qp, AL_OBJ_TYPE_H_QP ) ||\r
                ( (h_qp->obj.state != CL_INITIALIZED) && \r
                  (h_qp->obj.state != CL_DESTROYING) ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl, ("IB_INVALID_QP_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_WARNING, AL_DBG_CM, ("IB_INVALID_QP_HANDLE\n") );\r
                return IB_INVALID_QP_HANDLE;\r
        }\r
 \r
@@ -232,7 +232,7 @@ cm_reset_qp(
                status = h_qp->pfn_modify_qp( h_qp, &qp_mod, NULL );\r
                if( status != IB_SUCCESS )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("pfn_modify_qp to IB_QPS_ERROR returned %s\n",\r
                                ib_get_err_str(status) ) );\r
                        return status;\r
@@ -246,7 +246,7 @@ cm_reset_qp(
        UNUSED_PARAM( timewait );\r
 #endif /* CL_KERNEL */\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -265,7 +265,7 @@ cm_save_rep_qp_attr(
        IN OUT                  ib_qp_mod_t * const                     p_qp_mod_rtr,\r
        IN OUT                  ib_qp_mod_t * const                     p_qp_mod_rts )\r
 {\r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Update the QP RTR transition information. */\r
        p_qp_mod_rtr->state.rtr.rq_psn = p_cm_rep->h_qp->num;\r
@@ -328,7 +328,7 @@ cm_save_rep_qp_attr(
                cm_local_ack_timeout( ib_path_rec_pkt_life( p_path_rec ),\r
                p_cm_rep->target_ack_delay );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -342,7 +342,7 @@ cm_save_rtu_qp_attr(
        IN              const   ib_cm_rtu_t * const                     p_cm_rtu,\r
        IN OUT                  ib_qp_mod_t * const                     p_qp_mod_rtr )\r
 {\r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Update the QP RTR transition information. */\r
        if( p_cm_rtu->access_ctrl )\r
@@ -363,7 +363,7 @@ cm_save_rtu_qp_attr(
                p_qp_mod_rtr->state.rtr.rq_depth = p_cm_rtu->rq_depth;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
index 061df31fe8b31f845f047c20dabe5ec76a76d43a..6021574563cf87a551df8588c15a49c575abdb21 100644 (file)
 #include "al_ci_ca.h"\r
 #include "al_common.h"\r
 #include "al_debug.h"\r
+\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_common.tmh"\r
+#endif\r
+\r
 #include "al_mgr.h"\r
 #include <complib/cl_math.h>\r
 #include "ib_common.h"\r
@@ -68,7 +76,7 @@ sync_destroy_obj(
        IN              const   ib_pfn_destroy_cb_t                     pfn_destroy_cb );\r
 \r
 \r
-#if defined( _DEBUG_ )\r
+\r
 const char* ib_obj_type_str[] =\r
 {\r
        "AL_OBJ_TYPE_UNKNOWN",\r
@@ -113,7 +121,6 @@ const char* ib_obj_type_str[] =
        "AL_OBJ_TYPE_H_SA_REG",\r
        "AL_OBJ_TYPE_H_FMR"\r
 };\r
-#endif\r
 \r
 \r
 /*\r
@@ -165,10 +172,10 @@ init_al_obj(
 {\r
        cl_status_t                             cl_status;\r
 \r
-       CL_ENTER( AL_DBG_AL_OBJ, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_AL_OBJ );\r
        CL_ASSERT( p_obj && pfn_free );\r
        CL_ASSERT( p_obj->state == CL_UNINITIALIZED );\r
-       CL_TRACE( AL_DBG_AL_OBJ, g_al_dbg_lvl, ("%p\n", p_obj ) );\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_AL_OBJ, ("%p\n", p_obj ) );\r
 \r
        /* Initialize the object. */\r
        p_obj->async_item.pfn_callback = async_destroy_cb;\r
@@ -209,7 +216,7 @@ init_al_obj(
         */\r
        ref_al_obj( p_obj );\r
 \r
-       CL_EXIT( AL_DBG_AL_OBJ, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_AL_OBJ );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -265,7 +272,7 @@ attach_al_obj(
        \r
        CL_ASSERT( p_child_obj->state == CL_INITIALIZED );\r
 \r
-       AL_TRACE( AL_DBG_AL_OBJ,\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_AL_OBJ,\r
                ("%p(%s) to %p(%s)\n",\r
                p_child_obj, ib_get_obj_type( p_child_obj ),\r
                p_parent_obj, ib_get_obj_type( p_parent_obj ) ) );\r
@@ -324,7 +331,7 @@ detach_al_obj(
 {\r
        al_obj_t                                *p_parent_obj;\r
 \r
-       CL_ENTER( AL_DBG_AL_OBJ, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_AL_OBJ );\r
        \r
        p_parent_obj = p_obj->p_parent_obj;\r
        CL_ASSERT( p_obj );\r
@@ -334,7 +341,7 @@ detach_al_obj(
        CL_ASSERT( p_parent_obj->state == CL_INITIALIZED ||\r
                p_parent_obj->state == CL_DESTROYING );\r
 \r
-       CL_TRACE( AL_DBG_AL_OBJ, g_al_dbg_lvl,\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_AL_OBJ,\r
                ("%p(%s) from %p(%s)\n",\r
                p_obj, ib_get_obj_type( p_obj ),\r
                p_parent_obj, ib_get_obj_type( p_parent_obj ) ) );\r
@@ -344,7 +351,7 @@ detach_al_obj(
        cl_qlist_remove_item( &p_parent_obj->obj_list,\r
                (cl_list_item_t*)&p_obj->pool_item );\r
        cl_spinlock_release( &p_parent_obj->lock );\r
-       CL_EXIT( AL_DBG_AL_OBJ, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_AL_OBJ );\r
 }\r
 \r
 \r
@@ -359,13 +366,13 @@ ref_al_obj(
 {\r
        uint32_t        ref_cnt;\r
 \r
-       CL_ENTER( AL_DBG_AL_OBJ, g_al_dbg_lvl );\r
-       CL_TRACE( AL_DBG_AL_OBJ, g_al_dbg_lvl,\r
+       AL_ENTER( AL_DBG_AL_OBJ );\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_AL_OBJ,\r
                ("%p(%s)\n", p_obj, ib_get_obj_type( p_obj ) ) );\r
        ref_cnt = cl_atomic_inc( &p_obj->ref_cnt );\r
        CL_ASSERT( ref_cnt != 1 || p_obj->type == AL_OBJ_TYPE_H_CQ );\r
 \r
-       CL_EXIT( AL_DBG_AL_OBJ, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_AL_OBJ );\r
        return ref_cnt;\r
 }\r
 \r
@@ -381,14 +388,14 @@ deref_al_obj(
 {\r
        int32_t                 ref_cnt;\r
 \r
-       CL_ENTER( AL_DBG_AL_OBJ, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_AL_OBJ );\r
 \r
        CL_ASSERT( p_obj );\r
        CL_ASSERT( p_obj->state == CL_INITIALIZED ||\r
                p_obj->state == CL_DESTROYING );\r
        CL_ASSERT( p_obj->ref_cnt );\r
 \r
-       CL_TRACE( AL_DBG_AL_OBJ, g_al_dbg_lvl,\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_AL_OBJ,\r
                ("%p(%s)\n", p_obj, ib_get_obj_type( p_obj ) ) );\r
 \r
        ref_cnt = cl_atomic_dec( &p_obj->ref_cnt );\r
@@ -413,7 +420,7 @@ deref_al_obj(
                }\r
        }\r
 \r
-       CL_EXIT( AL_DBG_AL_OBJ, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_AL_OBJ );\r
        return ref_cnt;\r
 }\r
 \r
@@ -426,7 +433,7 @@ void
 destroy_al_obj(\r
        IN                              al_obj_t * const                        p_obj )\r
 {\r
-       CL_ENTER( AL_DBG_AL_OBJ, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_AL_OBJ );\r
 \r
        CL_ASSERT( p_obj );\r
        CL_ASSERT( p_obj->state == CL_DESTROYING ||\r
@@ -446,7 +453,7 @@ destroy_al_obj(
        cl_spinlock_destroy( &p_obj->lock );\r
        p_obj->state = CL_DESTROYED;\r
 \r
-       CL_EXIT( AL_DBG_AL_OBJ, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_AL_OBJ );\r
 }\r
 \r
 \r
@@ -456,14 +463,14 @@ async_destroy_obj(
        IN                              struct _al_obj                          *p_obj,\r
        IN              const   ib_pfn_destroy_cb_t                     pfn_destroy_cb )\r
 {\r
-       CL_ENTER( AL_DBG_AL_OBJ, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_AL_OBJ );\r
 \r
        if( pfn_destroy_cb == ib_sync_destroy )\r
                sync_destroy_obj( p_obj, pfn_destroy_cb );\r
        else if( destroy_obj( p_obj, pfn_destroy_cb ) )\r
                deref_al_obj( p_obj );  /* Only destroy the object once. */\r
 \r
-       CL_EXIT( AL_DBG_AL_OBJ, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_AL_OBJ );\r
 }\r
 \r
 \r
@@ -475,7 +482,7 @@ sync_destroy_obj(
 {\r
        cl_status_t             cl_status;\r
 \r
-       CL_ENTER( AL_DBG_AL_OBJ, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_AL_OBJ );\r
 \r
        if( !destroy_obj( p_obj, pfn_destroy_cb ) )\r
        {\r
@@ -504,7 +511,7 @@ sync_destroy_obj(
 \r
                if( cl_status != CL_SUCCESS )\r
                {\r
-                       CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("Error waiting for references to be released - delaying.\n") );\r
                        print_al_obj( p_obj );\r
                        /*\r
@@ -527,7 +534,7 @@ sync_destroy_obj(
                CL_ASSERT( cl_status == CL_SUCCESS );\r
                if( cl_status != CL_SUCCESS )\r
                {\r
-                       CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("Forcing object destruction.\n") );\r
                        print_al_obj( p_obj );\r
                        //print_tail_al_objs();\r
@@ -537,7 +544,7 @@ sync_destroy_obj(
        }\r
        async_destroy_cb( &p_obj->async_item );\r
 \r
-       CL_EXIT( AL_DBG_AL_OBJ, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_AL_OBJ );\r
 }\r
 \r
 \r
@@ -550,13 +557,13 @@ destroy_obj(
        cl_list_item_t                  *p_list_item;\r
        al_obj_t                                *p_child_obj;\r
 \r
-       CL_ENTER( AL_DBG_AL_OBJ, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_AL_OBJ );\r
 \r
        CL_ASSERT( p_obj );\r
        CL_ASSERT( p_obj->state == CL_INITIALIZED ||\r
                p_obj->state == CL_DESTROYING );\r
 \r
-       CL_TRACE( AL_DBG_AL_OBJ, g_al_dbg_lvl,\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_AL_OBJ,\r
                ("%p(%s)\n", p_obj, ib_get_obj_type( p_obj ) ) );\r
 \r
        /*\r
@@ -592,13 +599,13 @@ destroy_obj(
                detach_al_obj( p_obj );\r
 \r
        /*      Destroy all child resources.  No need to lock during destruction. */\r
-       CL_TRACE( AL_DBG_AL_OBJ, g_al_dbg_lvl, ("destroying children\n") );\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_AL_OBJ, ("destroying children\n") );\r
        p_list_item = cl_qlist_tail( &p_obj->obj_list );\r
        while( p_list_item != cl_qlist_end( &p_obj->obj_list ) )\r
        {\r
                p_child_obj = PARENT_STRUCT( p_list_item, al_obj_t, pool_item );\r
                CL_ASSERT( p_child_obj->pfn_destroy );\r
-               CL_TRACE( AL_DBG_AL_OBJ, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_AL_OBJ,\r
                        ("bye bye: %p(%s)\n", p_child_obj,\r
                        ib_get_obj_type( p_child_obj ) ) );\r
                ref_al_obj( p_child_obj );\r
@@ -618,7 +625,7 @@ destroy_obj(
        }\r
 \r
        p_obj->user_destroy_cb = pfn_destroy_cb;\r
-       CL_EXIT( AL_DBG_AL_OBJ, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_AL_OBJ );\r
        return TRUE;\r
 }\r
 \r
@@ -631,7 +638,7 @@ async_destroy_cb(
        al_obj_t                                *p_obj;\r
        al_obj_t                                *p_parent_obj = NULL;\r
 \r
-       CL_ENTER( AL_DBG_AL_OBJ, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_AL_OBJ );\r
 \r
        CL_ASSERT( p_item );\r
        p_obj = PARENT_STRUCT( p_item, al_obj_t, async_item );\r
@@ -639,13 +646,13 @@ async_destroy_cb(
        CL_ASSERT( p_obj->state == CL_DESTROYING );\r
        CL_ASSERT( !p_obj->ref_cnt );\r
 \r
-       CL_TRACE( AL_DBG_AL_OBJ, g_al_dbg_lvl,\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_AL_OBJ,\r
                ("%p\n", p_obj ) );\r
 \r
        /* Cleanup any hardware related resources. */\r
        if( p_obj->pfn_cleanup )\r
        {\r
-               CL_TRACE( AL_DBG_AL_OBJ, g_al_dbg_lvl, ("cleaning up\n" ) );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_AL_OBJ, ("cleaning up\n" ) );\r
                p_obj->pfn_cleanup( p_obj );\r
        }\r
 \r
@@ -659,16 +666,16 @@ async_destroy_cb(
        /* Notify the user that we're done. */\r
        if( p_obj->user_destroy_cb )\r
        {\r
-               CL_TRACE( AL_DBG_AL_OBJ, g_al_dbg_lvl, ("notifying user\n" ) );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_AL_OBJ, ("notifying user\n" ) );\r
                p_obj->user_destroy_cb( (void*)p_obj->context );\r
        }\r
 \r
        /* Free the resources associated with the object. */\r
-       CL_TRACE( AL_DBG_AL_OBJ, g_al_dbg_lvl, ("freeing object\n" ) );\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_AL_OBJ, ("freeing object\n" ) );\r
        p_obj->pfn_free( p_obj );\r
 \r
        /* Dereference the parent after freeing the child. */\r
        if( p_parent_obj )\r
                deref_al_obj( p_parent_obj );\r
-       CL_EXIT( AL_DBG_AL_OBJ, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_AL_OBJ );\r
 }\r
index 789d44ccf2d3d8d06f87d561a3dc1904366a2847..02f0442471914b9fb413110b433afd869bc5ed5c 100644 (file)
@@ -280,7 +280,7 @@ inc_al_obj_desc(
  */\r
 ib_api_status_t\r
 attach_al_obj(\r
-       IN                              al_obj_t * const                        p_parent_obj ,\r
+       IN                              al_obj_t * const                        p_parent_obj,\r
        IN                              al_obj_t * const                        p_child_obj );\r
 \r
 \r
@@ -316,7 +316,7 @@ destroy_al_obj(
 \r
 \r
 \r
-#if defined( _DEBUG_ ) \r
+\r
 extern const char* ib_obj_type_str[];\r
 \r
 static inline const char*\r
@@ -328,7 +328,7 @@ ib_get_obj_type(
 \r
        return( ib_obj_type_str[ AL_BASE_TYPE( p_obj->type ) ] );\r
 }\r
-#endif\r
+\r
 \r
 \r
 \r
index 6505266bde24c505b3c29c257ce2b4f523fb0074..243be6e1520d8c770303fd84c94b09f321b337d0 100644 (file)
 \r
 #include "al_cq.h"\r
 #include "al_debug.h"\r
+\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_cq.tmh"\r
+#endif\r
+\r
 #include "al_ca.h"\r
 #include "al_pd.h"\r
 #include "al_qp.h"\r
@@ -73,13 +81,13 @@ create_cq(
 \r
        if( !p_cq_create || !ph_cq )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
        if( (p_cq_create->pfn_comp_cb && p_cq_create->h_wait_obj) ||\r
                (!p_cq_create->pfn_comp_cb && !p_cq_create->h_wait_obj) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_SETTING\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_SETTING\n") );\r
                return IB_INVALID_SETTING;\r
        }\r
 \r
@@ -153,18 +161,18 @@ ib_destroy_cq(
        IN              const   ib_cq_handle_t                          h_cq,\r
        IN              const   ib_pfn_destroy_cb_t                     pfn_destroy_cb OPTIONAL )\r
 {\r
-       CL_ENTER( AL_DBG_CQ, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CQ );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_cq, AL_OBJ_TYPE_H_CQ ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_CQ_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_CQ_HANDLE\n") );\r
                return IB_INVALID_CQ_HANDLE;\r
        }\r
 \r
        ref_al_obj( &h_cq->obj );\r
        h_cq->obj.pfn_destroy( &h_cq->obj, pfn_destroy_cb );\r
 \r
-       CL_EXIT( AL_DBG_CQ, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CQ );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -287,22 +295,22 @@ modify_cq(
 {\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_CQ, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CQ );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_cq, AL_OBJ_TYPE_H_CQ ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_CQ_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_CQ_HANDLE\n") );\r
                return IB_INVALID_CQ_HANDLE;\r
        }\r
        if( !p_size )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
        status = verbs_modify_cq( h_cq, p_size );\r
 \r
-       CL_EXIT( AL_DBG_CQ, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CQ );\r
        return status;\r
 }\r
 \r
@@ -326,22 +334,22 @@ query_cq(
 {\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_CQ, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CQ );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_cq, AL_OBJ_TYPE_H_CQ ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_CQ_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_CQ_HANDLE\n") );\r
                return IB_INVALID_CQ_HANDLE;\r
        }\r
        if( !p_size )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
        status = verbs_query_cq( h_cq, p_size );\r
 \r
-       CL_EXIT( AL_DBG_CQ, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CQ );\r
        return status;\r
 }\r
 \r
@@ -354,22 +362,22 @@ ib_peek_cq(
 {\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_CQ, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CQ );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_cq, AL_OBJ_TYPE_H_CQ ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_CQ_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_CQ_HANDLE\n") );\r
                return IB_INVALID_CQ_HANDLE;\r
        }\r
        if( !p_n_cqes )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
        status = verbs_peek_cq( h_cq, p_n_cqes );\r
 \r
-       CL_EXIT( AL_DBG_CQ, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CQ );\r
        return status;\r
 }\r
 \r
@@ -386,16 +394,16 @@ ib_poll_cq(
        PERF_DECLARE( VerbsPollCq );\r
 \r
        cl_perf_start( IbPollCq );\r
-       CL_ENTER( AL_DBG_CQ, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CQ );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_cq, AL_OBJ_TYPE_H_CQ ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_CQ_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_CQ_HANDLE\n") );\r
                return IB_INVALID_CQ_HANDLE;\r
        }\r
        if( !pp_free_wclist || !pp_done_wclist )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -403,7 +411,7 @@ ib_poll_cq(
        status = verbs_poll_cq( h_cq, pp_free_wclist, pp_done_wclist );\r
        cl_perf_stop( &g_perf, VerbsPollCq );\r
 \r
-       CL_EXIT( AL_DBG_CQ, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CQ );\r
        cl_perf_stop( &g_perf, IbPollCq );\r
        return status;\r
 }\r
@@ -417,17 +425,17 @@ ib_rearm_cq(
 {\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_CQ, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CQ );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_cq, AL_OBJ_TYPE_H_CQ ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_CQ_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_CQ_HANDLE\n") );\r
                return IB_INVALID_CQ_HANDLE;\r
        }\r
 \r
        status = verbs_rearm_cq( h_cq, solicited );\r
 \r
-       CL_EXIT( AL_DBG_CQ, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CQ );\r
        return status;\r
 }\r
 \r
@@ -440,22 +448,22 @@ ib_rearm_n_cq(
 {\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_CQ, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CQ );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_cq, AL_OBJ_TYPE_H_CQ ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_CQ_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_CQ_HANDLE\n") );\r
                return IB_INVALID_CQ_HANDLE;\r
        }\r
        if( !n_cqes )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
        status = verbs_rearm_n_cq( h_cq, n_cqes );\r
 \r
-       CL_EXIT( AL_DBG_CQ, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CQ );\r
        return status;\r
 }\r
 \r
index 030a6bca57dacbd422a19c6cf411b4ee00ec0714..fd0a037576e4204ce27679eae5c494f00e7cd275 100644 (file)
 #define __AL_DEBUG_H__\r
 \r
 #ifndef __MODULE__\r
-#define __MODULE__     "al"\r
+#define __MODULE__     "[AL]"\r
 #endif\r
 \r
 #include <complib/cl_debug.h>\r
 #include <complib/cl_perf.h>\r
 \r
+extern uint32_t                        g_al_dbg_level;\r
+extern uint32_t                        g_al_dbg_flags;\r
+\r
+#if defined(EVENT_TRACING)\r
+//\r
+// Software Tracing Definitions \r
+//\r
+\r
+#ifndef CL_KERNEL\r
+\r
+#define WPP_CONTROL_GUIDS \\r
+       WPP_DEFINE_CONTROL_GUID(ALCtlGuid1,(B199CE55,F8BF,4147,B119,DACD1E5987A6),  \\r
+       WPP_DEFINE_BIT( AL_DBG_ERROR) \\r
+       WPP_DEFINE_BIT( AL_DBG_AL_OBJ) \\r
+       WPP_DEFINE_BIT( AL_DBG_HDL) \\r
+       WPP_DEFINE_BIT( AL_DBG_SMI) \\r
+       WPP_DEFINE_BIT( AL_DBG_SMI_CB) \\r
+       WPP_DEFINE_BIT( AL_DBG_MAD_POOL) \\r
+       WPP_DEFINE_BIT( AL_DBG_MAD_SVC) \\r
+       WPP_DEFINE_BIT( AL_DBG_PNP) \\r
+       WPP_DEFINE_BIT( AL_DBG_CM) \\r
+       WPP_DEFINE_BIT( AL_DBG_CA) \\r
+       WPP_DEFINE_BIT( AL_DBG_MR) \\r
+       WPP_DEFINE_BIT( AL_DBG_MGR)\\r
+       WPP_DEFINE_BIT( AL_DBG_DEV)\\r
+       WPP_DEFINE_BIT( AL_DBG_MCAST)\\r
+       WPP_DEFINE_BIT( AL_DBG_PD)\\r
+       WPP_DEFINE_BIT( AL_DBG_AV)\\r
+       WPP_DEFINE_BIT( AL_DBG_CQ)\\r
+       WPP_DEFINE_BIT( AL_DBG_QP)\\r
+       WPP_DEFINE_BIT( AL_DBG_MW)\\r
+       WPP_DEFINE_BIT( AL_DBG_PROXY_CB)\\r
+       WPP_DEFINE_BIT( AL_DBG_UAL)\\r
+       WPP_DEFINE_BIT( AL_DBG_QUERY)\\r
+       WPP_DEFINE_BIT( AL_DBG_SA_REQ)\\r
+       WPP_DEFINE_BIT( AL_DBG_IOC)\\r
+       WPP_DEFINE_BIT( AL_DBG_SUB)\\r
+       WPP_DEFINE_BIT( AL_DBG_MAD))\r
+\r
+#else\r
+\r
+#define WPP_CONTROL_GUIDS \\r
+       WPP_DEFINE_CONTROL_GUID(ALCtlGuid2,(99DC84E3,B106,431e,88A6,4DD20C9BBDE3),  \\r
+       WPP_DEFINE_BIT( AL_DBG_ERROR) \\r
+       WPP_DEFINE_BIT( AL_DBG_AL_OBJ) \\r
+       WPP_DEFINE_BIT( AL_DBG_HDL) \\r
+       WPP_DEFINE_BIT( AL_DBG_SMI) \\r
+       WPP_DEFINE_BIT( AL_DBG_SMI_CB) \\r
+       WPP_DEFINE_BIT( AL_DBG_MAD_POOL) \\r
+       WPP_DEFINE_BIT( AL_DBG_MAD_SVC) \\r
+       WPP_DEFINE_BIT( AL_DBG_PNP) \\r
+       WPP_DEFINE_BIT( AL_DBG_CM) \\r
+       WPP_DEFINE_BIT( AL_DBG_CA) \\r
+       WPP_DEFINE_BIT( AL_DBG_MR) \\r
+       WPP_DEFINE_BIT( AL_DBG_MGR)\\r
+       WPP_DEFINE_BIT( AL_DBG_DEV)\\r
+       WPP_DEFINE_BIT( AL_DBG_MCAST)\\r
+       WPP_DEFINE_BIT( AL_DBG_PD)\\r
+       WPP_DEFINE_BIT( AL_DBG_AV)\\r
+       WPP_DEFINE_BIT( AL_DBG_CQ)\\r
+       WPP_DEFINE_BIT( AL_DBG_QP)\\r
+       WPP_DEFINE_BIT( AL_DBG_MW)\\r
+       WPP_DEFINE_BIT( AL_DBG_PROXY_CB)\\r
+       WPP_DEFINE_BIT( AL_DBG_UAL)\\r
+       WPP_DEFINE_BIT( AL_DBG_QUERY)\\r
+       WPP_DEFINE_BIT( AL_DBG_SA_REQ)\\r
+       WPP_DEFINE_BIT( AL_DBG_IOC)\\r
+       WPP_DEFINE_BIT( AL_DBG_SUB)\\r
+       WPP_DEFINE_BIT( AL_DBG_MAD))\r
+\r
+#endif\r
+\r
+\r
+#define WPP_LEVEL_FLAGS_ENABLED(lvl, flags) (WPP_LEVEL_ENABLED(flags) && WPP_CONTROL(WPP_BIT_ ## flags).Level  >= lvl)\r
+#define WPP_LEVEL_FLAGS_LOGGER(lvl,flags) WPP_LEVEL_LOGGER(flags)\r
+#define WPP_FLAG_ENABLED(flags)(WPP_LEVEL_ENABLED(flags) && WPP_CONTROL(WPP_BIT_ ## flags).Level  >= TRACE_LEVEL_VERBOSE)\r
+#define WPP_FLAG_LOGGER(flags) WPP_LEVEL_LOGGER(flags)\r
+\r
+\r
+// begin_wpp config\r
+// AL_ENTER( FLAG );\r
+// AL_EXIT( FLAG );\r
+// USEPREFIX(AL_PRINT, "%!STDPREFIX! %!FUNC!() :");\r
+// USESUFFIX(AL_ENTER, " %!FUNC!():[");\r
+// USESUFFIX(AL_EXIT, " %!FUNC!():]");\r
+// end_wpp\r
+\r
+\r
+\r
+#else\r
+\r
+#include <wmistr.h>\r
+#include <evntrace.h>\r
+\r
+/*\r
+ * Debug macros\r
+ */\r
+\r
 \r
 /* Debug message source */\r
-#define        AL_DBG_AL_OBJ   (1 << 0)\r
-#define AL_DBG_HDL             (1 << 1)\r
+#define AL_DBG_ERR     (1 << 0)\r
+#define AL_DBG_AL_OBJ  (1 << 1)\r
+#define AL_DBG_HDL             (1 << 2)\r
 #define AL_DBG_SMI             (1 << 4)\r
 #define AL_DBG_SMI_CB  (1 << 5)\r
-#define        AL_DBG_MAD_POOL (1 << 7)\r
+#define AL_DBG_MAD_POOL        (1 << 7)\r
 #define AL_DBG_MAD_SVC (1 << 8)\r
 #define AL_DBG_PNP             (1 << 9)\r
 #define AL_DBG_CM              (1 << 10)\r
 #define AL_DBG_SA_REQ  (1 << 26)\r
 #define AL_DBG_IOC             (1 << 27)\r
 #define AL_DBG_SUB             (1 << 28)\r
+#define AL_DBG_MAD             (1 << 29) //TODO \r
+\r
+#define AL_DBG_ERROR   (CL_DBG_ERROR | AL_DBG_ERR)\r
+\r
+#if DBG\r
+\r
+// assignment of _level_ is need to to overcome warning C4127\r
+#define AL_PRINT( _level_,_flag_,_msg_)  \\r
+       { \\r
+               if( g_al_dbg_level >= (_level_) ) \\r
+                       CL_TRACE( _flag_, g_al_dbg_level, _msg_ ); \\r
+       }\r
+\r
 \r
-/* Debug message type */\r
-#define AL_DBG_FUNC            (1 << 29)\r
-#define AL_DBG_WARN            (1 << 30)\r
-#define AL_DBG_ERROR   CL_DBG_ERROR\r
+#define AL_PRINT_EXIT( _level_,_flag_,_msg_) \\r
+       { \\r
+               if( g_al_dbg_level >= (_level_) ) \\r
+                       CL_TRACE( _flag_, g_al_dbg_level, _msg_ );\\r
+               AL_EXIT( _flag_ );\\r
+       }\r
 \r
-#define        AL_DBG_NONE             CL_DBG_DISABLE\r
-#define AL_DBG_FULL            CL_DBG_ALL\r
+#define AL_ENTER( _flag_) \\r
+       { \\r
+               if( g_al_dbg_level >= TRACE_LEVEL_VERBOSE ) \\r
+                       CL_ENTER( _flag_, g_al_dbg_level ); \\r
+       }\r
 \r
-#define AL_DBG_MAD             (AL_DBG_SMI | AL_DBG_SMI_CB | \\r
-                                                AL_DBG_MAD_POOL | AL_DBG_MAD_SVC)\r
-#define AL_DBG_NORMAL  AL_DBG_ERROR\r
-#define AL_DBG_VERBOSE (AL_DBG_FULL & (~AL_DBG_AL_OBJ))\r
+#define AL_EXIT( _flag_)\\r
+       { \\r
+               if( g_al_dbg_level >= TRACE_LEVEL_VERBOSE ) \\r
+                       CL_EXIT( _flag_, g_al_dbg_level ); \\r
+       }\r
 \r
-extern uint32_t                        g_al_dbg_lvl;\r
 \r
-/* Macros for simplifying CL_ENTER, CL_TRACE, etc. */\r
-#define AL_ENTER( msg_lvl )                            \\r
-       CL_ENTER( (msg_lvl | AL_DBG_FUNC), g_al_dbg_lvl )\r
+#else\r
 \r
-#define AL_EXIT( msg_lvl )                             \\r
-       CL_EXIT( (msg_lvl | AL_DBG_FUNC), g_al_dbg_lvl )\r
+#define AL_PRINT( lvl, flags, msg)\r
 \r
-#define AL_TRACE( msg_lvl, msg )               \\r
-       CL_TRACE( (msg_lvl), g_al_dbg_lvl, msg )\r
+#define AL_PRINT_EXIT( _level_,_flag_,_msg_)\r
+\r
+#define AL_ENTER( _flag_)\r
+\r
+#define AL_EXIT( _flag_)\r
+\r
+\r
+#endif\r
 \r
-#define AL_TRACE_EXIT( msg_lvl, msg )  \\r
-       CL_TRACE_EXIT( (msg_lvl), g_al_dbg_lvl, msg )\r
+#endif //EVENT_TRACING\r
 \r
-#define AL_PRINT( msg_lvl, msg )               \\r
-       CL_PRINT( (msg_lvl), g_al_dbg_lvl, msg )\r
 \r
 \r
 enum al_perf_counters\r
index 9d95fa6172c71d2dae8ca02896084e7bf02fc269..c858c762b70ce88a44ca2476580c4d2cfba943e2 100644 (file)
 \r
 #include "al_ca.h"\r
 #include "al_debug.h"\r
+\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_dm.tmh"\r
+#endif\r
+\r
 #include "al_dm.h"\r
 #include "al_mgr.h"\r
 #include "ib_common.h"\r
@@ -206,16 +214,16 @@ ib_create_ioc(
 {\r
        ib_ioc_handle_t                 h_ioc;\r
 \r
-       CL_ENTER( AL_DBG_IOC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_IOC );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_ca, AL_OBJ_TYPE_H_CA ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_CA_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_CA_HANDLE\n") );\r
                return IB_INVALID_CA_HANDLE;\r
        }\r
        if( !p_ioc_profile || !ph_ioc )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -233,7 +241,7 @@ ib_create_ioc(
        /* Return the IOC handle to the user. */\r
        *ph_ioc = h_ioc;\r
 \r
-       CL_EXIT( AL_DBG_IOC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_IOC );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -243,18 +251,18 @@ ib_api_status_t
 ib_destroy_ioc(\r
        IN              const   ib_ioc_handle_t                         h_ioc )\r
 {\r
-       CL_ENTER( AL_DBG_IOC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_IOC );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_ioc, AL_OBJ_TYPE_H_IOC ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
 \r
        ref_al_obj( &h_ioc->obj );\r
        h_ioc->obj.pfn_destroy( &h_ioc->obj, NULL );\r
 \r
-       CL_EXIT( AL_DBG_IOC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_IOC );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -304,11 +312,11 @@ ib_reg_ioc(
        al_iou_t*                               p_iou;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_IOC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_IOC );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_ioc, AL_OBJ_TYPE_H_IOC ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
 \r
@@ -320,7 +328,7 @@ ib_reg_ioc(
        /* Register the IOC with the IO unit. */\r
        status = add_ioc( p_iou, h_ioc );\r
 \r
-       CL_EXIT( AL_DBG_IOC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_IOC );\r
        return status;\r
 }\r
 \r
@@ -335,16 +343,16 @@ ib_add_svc_entry(
        ib_svc_handle_t                 h_svc;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_IOC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_IOC );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_ioc, AL_OBJ_TYPE_H_IOC ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
        if( !p_svc_entry || !ph_svc )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -368,13 +376,13 @@ ib_add_svc_entry(
        if( h_ioc->ioc_profile.num_svc_entries == MAX_NUM_SVC_ENTRIES )\r
        {\r
                cl_spinlock_release( &h_ioc->obj.lock );\r
-               CL_EXIT( AL_DBG_IOC, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_IOC );\r
                return IB_INSUFFICIENT_RESOURCES;\r
        }\r
        h_svc = cl_zalloc( sizeof( ib_svc_handle_t ) );\r
        if( !h_svc )\r
        {\r
-               CL_EXIT( AL_DBG_IOC, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_IOC );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
 \r
@@ -390,7 +398,7 @@ ib_add_svc_entry(
        if( status != IB_SUCCESS )\r
        {\r
                free_svc_entry( &h_svc->obj );\r
-               CL_EXIT( AL_DBG_IOC, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_IOC );\r
                return status;\r
        }\r
 \r
@@ -399,7 +407,7 @@ ib_add_svc_entry(
        if( status != IB_SUCCESS )\r
        {\r
                h_svc->obj.pfn_destroy( &h_svc->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -418,7 +426,7 @@ ib_add_svc_entry(
        /* Release the reference taken in init_al_obj. */\r
        deref_al_obj( &h_svc->obj );\r
 \r
-       CL_EXIT( AL_DBG_IOC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_IOC );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -430,11 +438,11 @@ ib_remove_svc_entry(
 {\r
        ib_ioc_handle_t                 h_ioc;\r
 \r
-       CL_ENTER( AL_DBG_IOC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_IOC );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_svc, AL_OBJ_TYPE_H_SVC_ENTRY ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
 \r
@@ -472,7 +480,7 @@ ib_remove_svc_entry(
        /* No longer in use by this thread. */\r
        cl_atomic_dec( &h_ioc->in_use_cnt );\r
 \r
-       CL_EXIT( AL_DBG_IOC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_IOC );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -616,7 +624,7 @@ get_ioc(
        if( status != IB_SUCCESS )\r
        {\r
                h_ioc->obj.pfn_destroy( &h_ioc->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return NULL;\r
        }\r
@@ -847,7 +855,7 @@ create_dm_agent(
        if( status != IB_SUCCESS )\r
        {\r
                gp_dm_agent->obj.pfn_destroy( &gp_dm_agent->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -1058,7 +1066,7 @@ create_iou(
        {\r
                p_iou->obj.pfn_destroy( &p_iou->obj, NULL );\r
                cl_spinlock_release( &gp_dm_agent->lock );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -1069,7 +1077,7 @@ create_iou(
        if( !h_ca )\r
        {\r
                p_iou->obj.pfn_destroy( &p_iou->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("acquire_ca for GUID %016I64x failed.\n", p_pnp_rec->guid) );\r
                return IB_INVALID_CA_HANDLE;\r
        }\r
@@ -1195,7 +1203,7 @@ create_iou_port(
        if( status != IB_SUCCESS )\r
        {\r
                p_iou_port->obj.pfn_destroy( &p_iou_port->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
index f087575a990bfe89745a5e064972ee8a17e379b0..2b2aca5e2a02187a86f1405cebacbb18998dacb7 100644 (file)
  */\r
 \r
 #include "al_debug.h"\r
+\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_init.tmh"\r
+#endif\r
+\r
 #include "al_dev.h"\r
 #include "al_init.h"\r
 #include "al_mgr.h"\r
@@ -39,9 +47,8 @@
 \r
 \r
 \r
-uint32_t                               g_al_dbg_lvl = AL_DBG_ERROR;\r
-\r
-\r
+uint32_t                               g_al_dbg_level = TRACE_LEVEL_ERROR;\r
+uint32_t                               g_al_dbg_flags = 0xf0;\r
 /*\r
  * Device driver initialization routine.\r
  */\r
@@ -51,8 +58,8 @@ al_initialize( void )
        cl_status_t             cl_status;\r
        ib_api_status_t status = IB_ERROR;\r
 \r
-       CL_ENTER( AL_DBG_DEV, g_al_dbg_lvl );\r
-       CL_TRACE( AL_DBG_DEV, g_al_dbg_lvl, ("Hello World! =)\n") );\r
+       AL_ENTER( AL_DBG_DEV );\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_DEV, ("Hello World! =)\n") );\r
 \r
        /*\r
         * Initialize access layer services.\r
@@ -64,7 +71,7 @@ al_initialize( void )
 #endif\r
        if( !gp_async_proc_mgr )\r
        {\r
-               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl, ("alloc_async_proc failed.\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("alloc_async_proc failed.\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
        gp_async_pnp_mgr = gp_async_proc_mgr + 1;\r
@@ -76,7 +83,7 @@ al_initialize( void )
        cl_status = cl_async_proc_init( gp_async_obj_mgr, 1, "AL_OBJ" );\r
        if( cl_status != CL_SUCCESS )\r
        {\r
-               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Failed to init async_obj_mgr: status = 0x%x.\n", cl_status) );\r
                return ib_convert_cl_status( cl_status );\r
        }\r
@@ -84,7 +91,7 @@ al_initialize( void )
        cl_status = cl_async_proc_init( gp_async_proc_mgr, 1, "Althread" );\r
        if( cl_status != CL_SUCCESS )\r
        {\r
-               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Failed to init async_proc_mgr: status = 0x%x.\n", cl_status) );\r
                return ib_convert_cl_status( cl_status );\r
        }\r
@@ -92,7 +99,7 @@ al_initialize( void )
        cl_status = cl_async_proc_init( gp_async_pnp_mgr, 1, "AL_PNP" );\r
        if( cl_status != CL_SUCCESS )\r
        {\r
-               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Failed to init async_pnp_mgr: status = 0x%x.\n", cl_status) );\r
                return ib_convert_cl_status( cl_status );\r
        }\r
@@ -100,12 +107,12 @@ al_initialize( void )
        status = create_al_mgr();\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("init_al_mgr: status = 0x%x.\n", status) );\r
                return status;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_DEV, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_DEV );\r
        return status;\r
 }\r
 \r
@@ -117,20 +124,20 @@ al_initialize( void )
 void\r
 al_cleanup( void )\r
 {\r
-       CL_ENTER( AL_DBG_DEV, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_DEV );\r
 \r
        /*\r
         * Destroy access layer device interface.\r
         */\r
-       CL_TRACE( AL_DBG_DEV, g_al_dbg_lvl, ("Destroying %s device.\n",\r
-               AL_DEVICE_NAME) );\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_DEV, ("Destroying %s device.\n",\r
+               (const char *)AL_DEVICE_NAME) );\r
 \r
        /*\r
         * Destroy access layer services.\r
         */\r
        if( gp_al_mgr )\r
        {\r
-               CL_TRACE( AL_DBG_DEV, g_al_dbg_lvl, ("Destroying AL Mgr.\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_DEV, ("Destroying AL Mgr.\n") );\r
                ref_al_obj( &gp_al_mgr->obj );\r
                gp_al_mgr->obj.pfn_destroy( &gp_al_mgr->obj, NULL );\r
        }\r
@@ -138,7 +145,7 @@ al_cleanup( void )
 #if AL_OBJ_PRIVATE_ASYNC_PROC\r
        if( gp_async_obj_mgr )\r
        {\r
-               CL_TRACE( AL_DBG_DEV, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_DEV,\r
                        ("Destroying async obj mgr.\n") );\r
                cl_async_proc_destroy( gp_async_obj_mgr );\r
                gp_async_obj_mgr = NULL;\r
@@ -147,7 +154,7 @@ al_cleanup( void )
 \r
        if( gp_async_pnp_mgr )\r
        {\r
-               CL_TRACE( AL_DBG_DEV, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_DEV,\r
                        ("Destroying async pnp mgr.\n") );\r
                cl_async_proc_destroy( gp_async_pnp_mgr );\r
                gp_async_pnp_mgr = NULL;\r
@@ -155,12 +162,12 @@ al_cleanup( void )
 \r
        if( gp_async_proc_mgr )\r
        {\r
-               CL_TRACE( AL_DBG_DEV, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_DEV,\r
                        ("Destroying async proc mgr.\n") );\r
                cl_async_proc_destroy( gp_async_proc_mgr );\r
                cl_free( gp_async_proc_mgr );\r
                gp_async_proc_mgr = NULL;\r
        }\r
 \r
-       CL_TRACE_EXIT( AL_DBG_DEV, g_al_dbg_lvl, ("Goodbye Cruel World =(\n") );\r
+       AL_PRINT_EXIT( TRACE_LEVEL_WARNING, AL_DBG_DEV, ("Goodbye Cruel World =(\n") );\r
 }\r
index 4038e9ceae5c78a2e9083fcc272feb3ef9d0df4b..00066a56ff721e51547a5475f774a9ade584d833 100644 (file)
 \r
 #include "al.h"\r
 #include "al_debug.h"\r
+\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_mad.tmh"\r
+#endif\r
+\r
 #include "al_cq.h"\r
 #include "al_mad.h"\r
 #include "al_qp.h"\r
@@ -291,7 +299,7 @@ build_mad_recv(
        IN                              ib_mad_element_t*                       p_mad_element,\r
        IN                              ib_wc_t*                                        p_wc )\r
 {\r
-       CL_ENTER( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( p_mad_element );\r
        CL_ASSERT( p_wc );\r
@@ -329,7 +337,7 @@ build_mad_recv(
        if( p_wc->recv.ud.recv_opt & IB_RECV_OPT_IMMEDIATE )\r
                p_mad_element->immediate_data = p_wc->recv.ud.immediate_data;\r
 \r
-       CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI );\r
 }\r
 \r
 \r
@@ -351,11 +359,11 @@ create_mad_disp(
        ib_api_status_t                 status;\r
        cl_status_t                             cl_status;\r
 \r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
        h_mad_disp = cl_zalloc( sizeof( al_mad_disp_t ) );\r
        if( !h_mad_disp )\r
        {\r
-               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl, ("insufficient memory\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("insufficient memory\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
 \r
@@ -367,7 +375,7 @@ create_mad_disp(
                NULL, __cleanup_mad_disp, __free_mad_disp );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl, ("init obj: %s\n",\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("init obj: %s\n",\r
                        ib_get_err_str(status)) );\r
                __free_mad_disp( &h_mad_disp->obj );\r
                return status;\r
@@ -376,7 +384,7 @@ create_mad_disp(
        if( status != IB_SUCCESS )\r
        {\r
                h_mad_disp->obj.pfn_destroy( &h_mad_disp->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -409,7 +417,7 @@ create_mad_disp(
        /* Release the reference taken in init_al_obj. */\r
        deref_al_obj( &h_mad_disp->obj );\r
 \r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -421,7 +429,7 @@ __cleanup_mad_disp(
 {\r
        al_mad_disp_handle_t    h_mad_disp;\r
 \r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
        CL_ASSERT( p_obj );\r
        h_mad_disp = PARENT_STRUCT( p_obj, al_mad_disp_t, obj );\r
 \r
@@ -429,7 +437,7 @@ __cleanup_mad_disp(
        if( h_mad_disp->h_qp )\r
                deref_al_obj( &h_mad_disp->h_qp->obj );\r
 \r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
 }\r
 \r
 \r
@@ -440,7 +448,7 @@ __free_mad_disp(
 {\r
        al_mad_disp_handle_t    h_mad_disp;\r
 \r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
        CL_ASSERT( p_obj );\r
        h_mad_disp = PARENT_STRUCT( p_obj, al_mad_disp_t, obj );\r
 \r
@@ -448,7 +456,7 @@ __free_mad_disp(
        cl_vector_destroy( &h_mad_disp->version_vector );\r
        destroy_al_obj( p_obj );\r
        cl_free( h_mad_disp );\r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
 }\r
 \r
 \r
@@ -465,7 +473,7 @@ __mad_disp_reg(
        size_t                                  i;\r
        cl_status_t                             cl_status;\r
 \r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
        cl_spinlock_acquire( &h_mad_disp->obj.lock );\r
 \r
        /* Find an empty slot in the client vector for the registration. */\r
@@ -503,7 +511,7 @@ __mad_disp_reg(
                if( !__mad_disp_reg_unsol( h_mad_disp, h_mad_reg, p_mad_svc ) )\r
                {\r
                        cl_spinlock_release( &h_mad_disp->obj.lock );\r
-                       CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl, ("reg unsol failed\n") );\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("reg unsol failed\n") );\r
                        return NULL;\r
                }\r
        }\r
@@ -516,7 +524,7 @@ __mad_disp_reg(
        /* The MAD service needs to take a reference on the dispatcher. */\r
        ref_al_obj( &h_mad_disp->obj );\r
 \r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
        return h_mad_reg;\r
 }\r
 \r
@@ -621,7 +629,7 @@ __mad_disp_reg_unsol(
        uint8_t                         i;\r
 \r
        /* Ensure that we are ready to handle this version number. */\r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
        cl_status = cl_vector_set_min_size( &h_mad_disp->version_vector,\r
                __mgmt_version_index( p_mad_svc->mgmt_version ) + 1 );\r
        if( cl_status != CL_SUCCESS )\r
@@ -653,7 +661,7 @@ __mad_disp_reg_unsol(
                        /* No one else can be registered for this method. */\r
                        if( cl_ptr_vector_get( p_method_ptr_vector, i ) )\r
                        {\r
-                               CL_TRACE(AL_DBG_ERROR, g_al_dbg_lvl, \r
+                               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                        ("Other client already registered for Un-Solicited Method "\r
                                        "%u for version %u of class %u.\n", i, p_mad_svc->mgmt_version,\r
                                        p_mad_svc->mgmt_class ) );\r
@@ -669,7 +677,7 @@ __mad_disp_reg_unsol(
                {\r
                        cl_ptr_vector_set( p_method_ptr_vector, i, h_mad_reg );\r
 \r
-                       CL_TRACE( AL_DBG_MAD_SVC, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MAD_SVC,\r
                                ("Register version:%u (%u) class:0x%02X(%u) method:0x%02X Hdl:%p\n",\r
                                p_mad_svc->mgmt_version,\r
                                __mgmt_version_index( p_mad_svc->mgmt_version ),\r
@@ -680,7 +688,7 @@ __mad_disp_reg_unsol(
                }\r
        }\r
 \r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
        return TRUE;\r
 }\r
 \r
@@ -718,7 +726,7 @@ __mad_disp_dereg(
        cl_ptr_vector_t                 *p_method_ptr_vector;\r
        size_t                                  i;\r
 \r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
        h_mad_disp = h_mad_reg->h_mad_disp;\r
 \r
        cl_spinlock_acquire( &h_mad_disp->obj.lock );\r
@@ -749,7 +757,7 @@ __mad_disp_dereg(
 \r
        /* The MAD service no longer requires access to the MAD dispatcher. */\r
        deref_al_obj( &h_mad_disp->obj );\r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
 }\r
 \r
 \r
@@ -765,7 +773,7 @@ __mad_disp_queue_send(
         * Increment the reference count on the registration to ensure that\r
         * the MAD service does not go away until the send completes.\r
         */\r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
        cl_atomic_inc( &h_mad_reg->ref_cnt );\r
        ref_al_obj( &h_mad_reg->h_mad_svc->obj );\r
 \r
@@ -778,7 +786,7 @@ __mad_disp_queue_send(
         * If we are the originator of the transaction, we need to modify the\r
         * TID to ensure that duplicate TIDs are not used by multiple clients.\r
         */\r
-       CL_TRACE( AL_DBG_MAD_SVC, g_al_dbg_lvl, ("dispatching TID: 0x%0"PRIx64"\n",\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MAD_SVC, ("dispatching TID: 0x%I64x\n",\r
                p_mad_hdr->trans_id) );\r
        p_mad_wr->client_tid = p_mad_hdr->trans_id;\r
        if( __use_tid_routing( p_mad_hdr, TRUE ) )\r
@@ -790,8 +798,8 @@ __mad_disp_queue_send(
                al_set_al_tid( &p_mad_hdr->trans_id, h_mad_reg->client_id );\r
 #pragma warning( pop )\r
 \r
-               CL_TRACE( AL_DBG_MAD_SVC, g_al_dbg_lvl,\r
-                       ("modified TID to: 0x%0"PRIx64"\n", p_mad_hdr->trans_id) );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MAD_SVC,\r
+                       ("modified TID to: 0x%0I64x\n", p_mad_hdr->trans_id) );\r
        }\r
 \r
        /* Post the work request to the QP. */\r
@@ -799,7 +807,7 @@ __mad_disp_queue_send(
        h_mad_reg->h_mad_disp->h_qp->pfn_queue_mad(\r
                h_mad_reg->h_mad_disp->h_qp, p_mad_wr );\r
 \r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
 }\r
 \r
 \r
@@ -828,9 +836,9 @@ mad_disp_send_done(
        al_mad_reg_handle_t             h_mad_reg;\r
        ib_mad_t                                *p_mad_hdr;\r
 \r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
 \r
-       CL_TRACE( AL_DBG_MAD_SVC, g_al_dbg_lvl, ("p_mad_wr 0x%p\n", p_mad_wr ) );\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MAD_SVC, ("p_mad_wr 0x%p\n", p_mad_wr ) );\r
 \r
        /* Get the MAD header. */\r
        p_mad_hdr = get_mad_hdr_from_wr( p_mad_wr );\r
@@ -843,7 +851,7 @@ mad_disp_send_done(
        CL_ASSERT( h_mad_reg && (h_mad_reg->client_id == p_mad_wr->client_id) );\r
 \r
        /* Reset the TID and WR ID. */\r
-       CL_TRACE( AL_DBG_MAD_SVC, g_al_dbg_lvl, ("send done TID: 0x%"PRIx64"\n",\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MAD_SVC, ("send done TID: 0x%I64x\n",\r
                p_mad_hdr->trans_id) );\r
        p_mad_hdr->trans_id = p_mad_wr->client_tid;\r
        p_mad_wr->send_wr.wr_id = 0;\r
@@ -856,7 +864,7 @@ mad_disp_send_done(
        deref_al_obj( &h_mad_reg->h_mad_svc->obj );\r
        cl_atomic_dec( &h_mad_reg->ref_cnt );\r
 \r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
 }\r
 \r
 \r
@@ -878,11 +886,11 @@ mad_disp_recv_done(
        cl_ptr_vector_t                 *p_method_ptr_vector;\r
        uint8_t                                 method;\r
 \r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
        p_mad_hdr = ib_get_mad_buf( p_mad_element );\r
 \r
-       CL_TRACE( AL_DBG_MAD_SVC, g_al_dbg_lvl,\r
-               ("TID = 0x%"PRIx64 "\n"\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MAD_SVC,\r
+               ("TID = 0x%I64x\n"\r
                 "class = 0x%x.\n"\r
                 "version = 0x%x.\n"\r
                 "method = 0x%x.\n",\r
@@ -896,7 +904,7 @@ mad_disp_recv_done(
        if( __use_tid_routing( p_mad_hdr, FALSE ) )\r
        {\r
                /* The MAD was received in response to a send. */\r
-               CL_TRACE( AL_DBG_MAD_SVC, g_al_dbg_lvl, ("routing based on TID\n"));\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MAD_SVC, ("routing based on TID\n"));\r
 \r
                /* Verify that we have a registration entry. */\r
                if( al_get_al_tid( p_mad_hdr->trans_id ) >=\r
@@ -904,7 +912,7 @@ mad_disp_recv_done(
                {\r
                        /* No clients for this version-class-method. */\r
                        cl_spinlock_release( &h_mad_disp->obj.lock );\r
-                       CL_TRACE_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl,\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_WARNING, AL_DBG_MAD_SVC,\r
                                ("invalid client ID\n") );\r
                        return IB_NOT_FOUND;\r
                }\r
@@ -923,7 +931,7 @@ mad_disp_recv_done(
        }\r
        else\r
        {\r
-               CL_TRACE( AL_DBG_MAD_SVC, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MAD_SVC,\r
                        ("routing based on version, class, method\n"));\r
 \r
                /* The receive is unsolicited.  Find the client. */\r
@@ -932,7 +940,7 @@ mad_disp_recv_done(
                {\r
                        /* No clients for this version of MADs. */\r
                        cl_spinlock_release( &h_mad_disp->obj.lock );\r
-                       CL_TRACE_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl,\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_WARNING, AL_DBG_MAD_SVC,\r
                                ("no clients registered for this class version\n") );\r
                        return IB_NOT_FOUND;\r
                }\r
@@ -946,7 +954,7 @@ mad_disp_recv_done(
                {\r
                        /* No clients for this version-class. */\r
                        cl_spinlock_release( &h_mad_disp->obj.lock );\r
-                       CL_TRACE_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl,\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_WARNING, AL_DBG_MAD_SVC,\r
                                ("no clients registered for this class\n") );\r
                        return IB_NOT_FOUND;\r
                }\r
@@ -960,7 +968,7 @@ mad_disp_recv_done(
                {\r
                        /* No clients for this version-class-method. */\r
                        cl_spinlock_release( &h_mad_disp->obj.lock );\r
-                       CL_TRACE_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl,\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_WARNING, AL_DBG_MAD_SVC,\r
                                ("no clients registered for this method-out of range\n") );\r
                        return IB_NOT_FOUND;\r
                }\r
@@ -970,7 +978,7 @@ mad_disp_recv_done(
                {\r
                        /* No clients for this version-class-method. */\r
                        cl_spinlock_release( &h_mad_disp->obj.lock );\r
-                       CL_TRACE_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl,\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_WARNING, AL_DBG_MAD_SVC,\r
                                ("no clients registered for method %u of class %u(%u) version %u(%u)\n",\r
                                 method,\r
                                 p_mad_hdr->mgmt_class,\r
@@ -986,7 +994,7 @@ mad_disp_recv_done(
        if( !h_mad_reg->ref_cnt )\r
        {\r
                cl_spinlock_release( &h_mad_disp->obj.lock );\r
-               CL_TRACE_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_WARNING, AL_DBG_MAD_SVC,\r
                        ("no client registered\n") );\r
                return IB_NOT_FOUND;\r
        }\r
@@ -1002,7 +1010,7 @@ mad_disp_recv_done(
 \r
        h_mad_reg->pfn_recv_done( h_mad_svc, p_mad_element );\r
        deref_al_obj( &h_mad_svc->obj );\r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -1019,12 +1027,12 @@ __use_tid_routing(
        ib_rmpp_mad_t           *p_rmpp_mad;\r
        boolean_t                       is_orig;\r
 \r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
 \r
        /* CM MADs are never TID routed. */\r
        if( p_mad_hdr->mgmt_class == IB_MCLASS_COMM_MGMT )\r
        {\r
-               CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MAD_SVC );\r
                return FALSE;\r
        }\r
 \r
@@ -1068,7 +1076,7 @@ __use_tid_routing(
        if( !are_we_sender )\r
                is_orig = !is_orig;\r
 \r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
        return is_orig;\r
 }\r
 \r
@@ -1097,7 +1105,7 @@ reg_mad_svc(
        al_qp_alias_t           *p_qp_alias;\r
        ib_qp_attr_t            qp_attr;\r
 \r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
        CL_ASSERT( h_qp );\r
 \r
        switch( h_qp->type )\r
@@ -1110,13 +1118,13 @@ reg_mad_svc(
                break;\r
 \r
        default:\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
        if( !p_mad_svc || !ph_mad_svc )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1151,7 +1159,7 @@ reg_mad_svc(
        if( status != IB_SUCCESS )\r
        {\r
                h_mad_svc->obj.pfn_destroy( &h_mad_svc->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -1192,7 +1200,7 @@ reg_mad_svc(
 \r
        *ph_mad_svc = h_mad_svc;\r
 \r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -1211,7 +1219,7 @@ __destroying_mad_svc(
        KIRQL                                   old_irql;\r
 #endif\r
 \r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
        CL_ASSERT( p_obj );\r
        h_mad_svc = PARENT_STRUCT( p_obj, al_mad_svc_t, obj );\r
 \r
@@ -1245,7 +1253,7 @@ __destroying_mad_svc(
                 p_list_item != cl_qlist_end( &h_mad_svc->send_list );\r
                 p_list_item = cl_qlist_next( p_list_item ) )\r
        {\r
-               CL_TRACE( AL_DBG_MAD_SVC, g_al_dbg_lvl, ("canceling MAD\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MAD_SVC, ("canceling MAD\n") );\r
                h_send = PARENT_STRUCT( p_list_item, al_mad_send_t, pool_item );\r
                h_send->canceled = TRUE;\r
        }\r
@@ -1297,7 +1305,7 @@ __destroying_mad_svc(
        }\r
 #endif\r
 \r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
 }\r
 \r
 \r
@@ -1361,28 +1369,28 @@ ib_send_mad(
        ib_mad_element_t                        *p_cur_mad, *p_next_mad;\r
 #endif\r
 \r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_mad_svc, AL_OBJ_TYPE_H_MAD_SVC ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
        if( !p_mad_element_list ||\r
                ( p_mad_element_list->p_next && !pp_mad_failure ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
 #ifndef CL_KERNEL\r
        /* This is a send from user mode using special QP alias */\r
-       CL_TRACE( AL_DBG_MAD_SVC, g_al_dbg_lvl,\r
-               ("ib_send_mad: ual_context non-zero, TID = 0x%"PRIx64 ".\n",\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MAD_SVC,\r
+               ("ib_send_mad: ual_context non-zero, TID = 0x%I64x.\n",\r
                ((ib_mad_t*)(ib_get_mad_buf( p_mad_element_list )))->trans_id ));\r
        status = spl_qp_mad_send( h_mad_svc, p_mad_element_list,\r
                pp_mad_failure );\r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
        return status;\r
 #else\r
        /* Post each send on the list. */\r
@@ -1396,7 +1404,7 @@ ib_send_mad(
                        al_mad_element_t, element ) );\r
                if( !h_send )\r
                {\r
-                       CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl, ("unable to get mad_send\n") );\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("unable to get mad_send\n") );\r
                        if( pp_mad_failure )\r
                                *pp_mad_failure = p_cur_mad;\r
                        return IB_INSUFFICIENT_RESOURCES;\r
@@ -1406,7 +1414,7 @@ ib_send_mad(
                status = __init_send_mad( h_mad_svc, h_send, p_cur_mad );\r
                if( status != IB_SUCCESS )\r
                {\r
-                       CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl, ("init_send_mad failed: %s\n",\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("init_send_mad failed: %s\n",\r
                                ib_get_err_str(status)) );\r
                        put_mad_send( h_send );\r
                        if( pp_mad_failure )\r
@@ -1437,7 +1445,7 @@ ib_send_mad(
         */\r
        __mad_disp_resume_send( h_mad_svc->h_mad_reg );\r
 \r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
        return status;\r
 #endif\r
 }\r
@@ -1454,7 +1462,7 @@ __init_send_mad(
        uint8_t                         rmpp_version;\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
 \r
        /* Initialize tracking the send. */\r
        h_send->p_send_mad = p_mad_element;\r
@@ -1467,13 +1475,13 @@ __init_send_mad(
        if( h_send->uses_rmpp )\r
        {\r
                /* The RMPP header is present. */\r
-               CL_TRACE( AL_DBG_MAD_SVC, g_al_dbg_lvl, ("RMPP is activated\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MAD_SVC, ("RMPP is activated\n") );\r
                p_rmpp_hdr = (ib_rmpp_mad_t*)p_mad_element->p_mad_buf;\r
 \r
                /* We only support version 1. */\r
                if( rmpp_version != DEFAULT_RMPP_VERSION )\r
                {\r
-                       CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl, ("unsupported version\n") );\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("unsupported version\n") );\r
                        return IB_INVALID_SETTING;\r
                }\r
 \r
@@ -1513,7 +1521,7 @@ __init_send_mad(
                }\r
        }\r
 \r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -1603,7 +1611,7 @@ __queue_rmpp_seg(
 {\r
        ib_rmpp_mad_t           *p_rmpp_hdr;\r
 \r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
 \r
        CL_ASSERT( h_mad_reg && h_send );\r
        CL_ASSERT( h_send->cur_seg <= h_send->seg_limit );\r
@@ -1667,7 +1675,7 @@ __queue_rmpp_seg(
        /* Send the MAD. */\r
        __queue_mad_wr( h_mad_reg, h_send );\r
 \r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
 }\r
 \r
 \r
@@ -1686,7 +1694,7 @@ __queue_mad_wr(
        uint8_t                         *p_rmpp_src, *p_rmpp_dst;\r
        uintn_t                         hdr_len, offset, max_len;\r
 \r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
        p_send_wr = &h_send->mad_wr.send_wr;\r
 \r
        cl_memclr( p_send_wr, sizeof( ib_send_wr_t ) );\r
@@ -1749,7 +1757,7 @@ __queue_mad_wr(
 \r
        __mad_disp_queue_send( h_mad_reg, &h_send->mad_wr );\r
 \r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
 }\r
 \r
 \r
@@ -1783,23 +1791,23 @@ ib_cancel_mad(
        ib_api_status_t                 status;\r
 #endif\r
 \r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_mad_svc, AL_OBJ_TYPE_H_MAD_SVC ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
        if( !p_mad_element )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
 #ifndef CL_KERNEL\r
        /* This is a send from user mode using special QP alias */\r
        status = spl_qp_cancel_mad( h_mad_svc, p_mad_element );\r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
        return status;\r
 #else\r
        /* Search for the MAD in our MAD list.  It may have already completed. */\r
@@ -1810,7 +1818,7 @@ ib_cancel_mad(
        if( !p_list_item )\r
        {\r
                cl_spinlock_release( &h_mad_svc->obj.lock );\r
-               CL_TRACE( AL_DBG_MAD_SVC, g_al_dbg_lvl, ("mad not found\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MAD_SVC, ("mad not found\n") );\r
                return IB_NOT_FOUND;\r
        }\r
 \r
@@ -1826,7 +1834,7 @@ ib_cancel_mad(
        }\r
 \r
        cl_spinlock_release( &h_mad_svc->obj.lock );\r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
        return IB_SUCCESS;\r
 #endif\r
 }\r
@@ -1847,12 +1855,12 @@ ib_delay_mad(
 \r
        if( AL_OBJ_INVALID_HANDLE( h_mad_svc, AL_OBJ_TYPE_H_MAD_SVC ) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
        if( !p_mad_element )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1871,7 +1879,7 @@ ib_delay_mad(
        if( !p_list_item )\r
        {\r
                cl_spinlock_release( &h_mad_svc->obj.lock );\r
-               AL_TRACE( AL_DBG_MAD_SVC, ("MAD not found\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MAD_SVC, ("MAD not found\n") );\r
                return IB_NOT_FOUND;\r
        }\r
 \r
@@ -1901,11 +1909,11 @@ __mad_svc_send_done(
 {\r
        ib_mad_send_handle_t    h_send;\r
 \r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
        CL_ASSERT( h_mad_svc && p_mad_wr && !p_wc->p_next );\r
 \r
        h_send = PARENT_STRUCT( p_mad_wr, al_mad_send_t, mad_wr );\r
-       CL_TRACE( AL_DBG_MAD_SVC, g_al_dbg_lvl, ("send callback TID:0x%"PRIx64"\n",\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MAD_SVC, ("send callback TID:0x%I64x\n",\r
                __get_send_tid( h_send )) );\r
 \r
        /* We need to synchronize access to the list as well as the MAD request. */\r
@@ -1914,7 +1922,7 @@ __mad_svc_send_done(
        /* Complete internally sent MADs. */\r
        if( __is_internal_send( h_mad_svc->svc_type, h_send->p_send_mad ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl, ("internal send\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_WARNING, AL_DBG_MAD_SVC, ("internal send\n") );\r
                cl_qlist_remove_item( &h_mad_svc->send_list,\r
                        (cl_list_item_t*)&h_send->pool_item );\r
                cl_spinlock_release( &h_mad_svc->obj.lock );\r
@@ -1943,8 +1951,8 @@ __mad_svc_send_done(
                if( h_send->uses_rmpp && (h_send->cur_seg <= h_send->seg_limit) )\r
                {\r
                        /* Send the next segment. */\r
-                       CL_TRACE( AL_DBG_MAD_SVC, g_al_dbg_lvl,\r
-                               ("sending next RMPP segment for TID:0x%"PRIx64"\n",\r
+                       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MAD_SVC,\r
+                               ("sending next RMPP segment for TID:0x%I64x\n",\r
                                __get_send_tid( h_send )) );\r
 \r
                        __queue_rmpp_seg( h_mad_svc->h_mad_reg, h_send );\r
@@ -1952,8 +1960,8 @@ __mad_svc_send_done(
                else\r
                {\r
                        /* Continue waiting for a response or ACK. */\r
-                       CL_TRACE( AL_DBG_MAD_SVC, g_al_dbg_lvl,\r
-                               ("waiting for response for TID:0x%"PRIx64"\n",\r
+                       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MAD_SVC,\r
+                               ("waiting for response for TID:0x%I64x\n",\r
                                __get_send_tid( h_send )) );\r
 \r
                        __set_retry_time( h_send );\r
@@ -1969,7 +1977,7 @@ __mad_svc_send_done(
         */\r
        __mad_disp_resume_send( h_mad_svc->h_mad_reg );\r
 \r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
 }\r
 \r
 \r
@@ -1983,9 +1991,9 @@ __notify_send_comp(
        IN                              ib_mad_send_handle_t            h_send,\r
        IN                              ib_wc_status_t                          wc_status )\r
 {\r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
 \r
-       CL_TRACE( AL_DBG_MAD_SVC, g_al_dbg_lvl, ("completing TID:0x%"PRIx64"\n",\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MAD_SVC, ("completing TID:0x%I64x\n",\r
                __get_send_tid( h_send )) );\r
 \r
        h_send->p_send_mad->status = wc_status;\r
@@ -2003,7 +2011,7 @@ __notify_send_comp(
 \r
        __cleanup_mad_send( h_mad_svc, h_send );\r
 \r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
 }\r
 \r
 \r
@@ -2037,19 +2045,19 @@ __is_send_mad_done(
        IN                              ib_mad_send_handle_t            h_send,\r
        IN                              ib_wc_t                                         *p_wc )\r
 {\r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
 \r
        /* Complete the send if the request failed. */\r
        if( p_wc->status != IB_WCS_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("y-send failed\n" ) );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("y-send failed\n" ) );\r
                return TRUE;\r
        }\r
 \r
        /* Complete the send if it has been canceled. */\r
        if( h_send->canceled )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_WARNING, AL_DBG_MAD_SVC,\r
                        ("y-send was canceled\n") );\r
                return TRUE;\r
        }\r
@@ -2057,7 +2065,7 @@ __is_send_mad_done(
        /* Complete the send if we have its response. */\r
        if( h_send->p_resp_mad )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_WARNING, AL_DBG_MAD_SVC,\r
                        ("y-response received\n") );\r
                return TRUE;\r
        }\r
@@ -2065,7 +2073,7 @@ __is_send_mad_done(
        /* RMPP sends cannot complete until all segments have been acked. */\r
        if( h_send->uses_rmpp && (h_send->ack_seg < h_send->total_seg) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_WARNING, AL_DBG_MAD_SVC,\r
                        ("more RMPP segments to send\n") );\r
                return FALSE;\r
        }\r
@@ -2076,13 +2084,13 @@ __is_send_mad_done(
         */\r
        if( h_send->p_send_mad->resp_expected )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_WARNING, AL_DBG_MAD_SVC,\r
                        ("no-waiting on response\n") );\r
                return FALSE;\r
        }\r
        else\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl, ("send completed\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_WARNING, AL_DBG_MAD_SVC, ("send completed\n") );\r
                return TRUE;\r
        }\r
 }\r
@@ -2102,7 +2110,7 @@ __mad_svc_match_recv(
        cl_list_item_t                  *p_list_item;\r
        ib_mad_send_handle_t    h_send;\r
 \r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
 \r
        p_recv_hdr = p_recv_mad->p_mad_buf;\r
 \r
@@ -2114,7 +2122,7 @@ __mad_svc_match_recv(
                h_send = PARENT_STRUCT( p_list_item, al_mad_send_t, pool_item );\r
 \r
                /* Match on the transaction ID, ignoring internally generated sends. */\r
-               CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MAD_SVC );\r
                if( (p_recv_hdr->trans_id == h_send->mad_wr.client_tid) &&\r
                         !__is_internal_send( h_mad_svc->svc_type, h_send->p_send_mad ) )\r
                {\r
@@ -2135,18 +2143,18 @@ __mad_svc_recv_done(
        ib_mad_t                                *p_mad_hdr;\r
        ib_api_status_t                 cl_status;\r
 \r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
 \r
        p_mad_hdr = ib_get_mad_buf( p_mad_element );\r
-       CL_TRACE( AL_DBG_MAD_SVC, g_al_dbg_lvl, ("recv done TID:0x%"PRIx64"\n",\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MAD_SVC, ("recv done TID:0x%I64x\n",\r
                p_mad_hdr->trans_id) );\r
 \r
        /* Raw MAD services get all receives. */\r
        if( h_mad_svc->svc_type == IB_MAD_SVC_RAW )\r
        {\r
                /* Report the receive. */\r
-               CL_TRACE_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl,\r
-                       ("recv TID:0x%"PRIx64"\n", p_mad_hdr->trans_id) );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_WARNING, AL_DBG_MAD_SVC,\r
+                       ("recv TID:0x%I64x\n", p_mad_hdr->trans_id) );\r
                h_mad_svc->pfn_user_recv_cb( h_mad_svc, (void*)h_mad_svc->obj.context,\r
                        p_mad_element );\r
                return;\r
@@ -2158,8 +2166,8 @@ __mad_svc_recv_done(
         */\r
        if( p_mad_hdr->status & IB_MAD_STATUS_BUSY )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
-                       ("responder busy TID:0x%"PRIx64"\n", p_mad_hdr->trans_id) );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
+                       ("responder busy TID:0x%I64x\n", p_mad_hdr->trans_id) );\r
                ib_put_mad( p_mad_element );\r
                return;\r
        }\r
@@ -2172,7 +2180,7 @@ __mad_svc_recv_done(
                if( cl_status != CL_SUCCESS )\r
                {\r
                        /* The reassembly is not done. */\r
-                       CL_TRACE_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl,\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_WARNING, AL_DBG_MAD_SVC,\r
                                ("no RMPP receive to report\n") );\r
                        return;\r
                }\r
@@ -2198,12 +2206,12 @@ __mad_svc_recv_done(
        else\r
        {\r
                /* Report the receive. */\r
-               CL_TRACE( AL_DBG_MAD_SVC, g_al_dbg_lvl, ("unsol recv TID:0x%"PRIx64"\n",\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MAD_SVC, ("unsol recv TID:0x%I64x\n",\r
                        p_mad_hdr->trans_id) );\r
                h_mad_svc->pfn_user_recv_cb( h_mad_svc, (void*)h_mad_svc->obj.context,\r
                        p_mad_element );\r
        }\r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
 }\r
 \r
 \r
@@ -2224,7 +2232,7 @@ __process_recv_resp(
         * Try to find the send.  The send may have already timed out or\r
         * have been canceled, so we need to search for it.\r
         */\r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
        p_mad_hdr = ib_get_mad_buf( p_mad_element );\r
        cl_spinlock_acquire( &h_mad_svc->obj.lock );\r
 \r
@@ -2232,8 +2240,8 @@ __process_recv_resp(
        if( !h_send )\r
        {\r
                /* A matching send was not found. */\r
-               CL_TRACE_EXIT( AL_DBG_WARN, g_al_dbg_lvl,\r
-                       ("unmatched resp TID:0x%"PRIx64"\n", p_mad_hdr->trans_id) );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_WARNING, AL_DBG_MAD_SVC,\r
+                       ("unmatched resp TID:0x%I64x\n", p_mad_hdr->trans_id) );\r
                cl_spinlock_release( &h_mad_svc->obj.lock );\r
                ib_put_mad( p_mad_element );\r
                return;\r
@@ -2249,15 +2257,15 @@ __process_recv_resp(
        if( h_send->retry_time == MAX_TIME )\r
        {\r
                /* The send is currently active.  Do not report it. */\r
-               CL_TRACE( AL_DBG_MAD_SVC, g_al_dbg_lvl,\r
-                       ("resp send active TID:0x%"PRIx64"\n", p_mad_hdr->trans_id) );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MAD_SVC,\r
+                       ("resp send active TID:0x%I64x\n", p_mad_hdr->trans_id) );\r
                h_send->p_resp_mad = p_mad_element;\r
                cl_spinlock_release( &h_mad_svc->obj.lock );\r
        }\r
        else\r
        {\r
-               CL_TRACE( AL_DBG_MAD_SVC, g_al_dbg_lvl,\r
-                       ("resp received TID:0x%"PRIx64"\n", p_mad_hdr->trans_id) );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MAD_SVC,\r
+                       ("resp received TID:0x%I64x\n", p_mad_hdr->trans_id) );\r
 \r
                /* Report the send completion below. */\r
                cl_qlist_remove_item( &h_mad_svc->send_list,\r
@@ -2273,7 +2281,7 @@ __process_recv_resp(
                        h_send->p_send_mad );\r
                __cleanup_mad_send( h_mad_svc, h_send );\r
        }\r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
 }\r
 \r
 \r
@@ -2288,11 +2296,11 @@ __recv_requires_rmpp(
 {\r
        ib_rmpp_mad_t                           *p_rmpp_mad;\r
 \r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
 \r
        p_rmpp_mad = (ib_rmpp_mad_t*)ib_get_mad_buf( p_mad_element );\r
 \r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
 \r
        switch( mad_svc_type )\r
        {\r
@@ -2356,7 +2364,7 @@ __do_rmpp_recv(
        ib_rmpp_mad_t           *p_rmpp_mad;\r
        cl_status_t                     cl_status;\r
 \r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
 \r
        p_rmpp_mad = ib_get_mad_buf( *pp_mad_element );\r
        CL_ASSERT( ib_rmpp_is_flag_set( p_rmpp_mad, IB_RMPP_FLAG_ACTIVE ) );\r
@@ -2390,7 +2398,7 @@ __do_rmpp_recv(
                break;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
        return cl_status;\r
 }\r
 \r
@@ -2799,7 +2807,7 @@ __process_rmpp_ack(
        boolean_t                               send_done = FALSE;\r
        ib_wc_status_t                  wc_status = IB_WCS_SUCCESS;\r
 \r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
        p_rmpp_mad = (ib_rmpp_mad_t*)ib_get_mad_buf( p_mad_element );\r
 \r
        /*\r
@@ -2811,7 +2819,7 @@ __process_rmpp_ack(
        if( !h_send )\r
        {\r
                cl_spinlock_release( &h_mad_svc->obj.lock );\r
-               CL_TRACE_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_WARNING, AL_DBG_MAD_SVC,\r
                        ("ACK cannot find a matching send\n") );\r
                return;\r
        }\r
@@ -2820,7 +2828,7 @@ __process_rmpp_ack(
        if( cl_ntoh32( p_rmpp_mad->seg_num ) < h_send->ack_seg )\r
        {\r
                cl_spinlock_release( &h_mad_svc->obj.lock );\r
-               CL_TRACE_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_WARNING, AL_DBG_MAD_SVC,\r
                        ("old ACK - being dropped\n") );\r
                return;\r
        }\r
@@ -2841,7 +2849,7 @@ __process_rmpp_ack(
        if( h_send->retry_time == MAX_TIME )\r
        {\r
                cl_spinlock_release( &h_mad_svc->obj.lock );\r
-               CL_TRACE_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_WARNING, AL_DBG_MAD_SVC,\r
                        ("ACK processed, waiting for send to complete\n") );\r
                return;\r
        }\r
@@ -2885,7 +2893,7 @@ __process_rmpp_ack(
         */\r
        __mad_disp_resume_send( h_mad_svc->h_mad_reg );\r
 \r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
 }\r
 \r
 \r
@@ -2901,7 +2909,7 @@ __process_rmpp_nack(
        ib_mad_send_handle_t    h_send;\r
        ib_rmpp_mad_t                   *p_rmpp_mad;\r
 \r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
        p_rmpp_mad = (ib_rmpp_mad_t*)ib_get_mad_buf( p_mad_element );\r
 \r
        /* Search for the send.  The send may have timed out or been canceled. */\r
@@ -2918,7 +2926,7 @@ __process_rmpp_nack(
        {\r
                h_send->canceled = TRUE;\r
                cl_spinlock_release( &h_mad_svc->obj.lock );\r
-               CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MAD_SVC );\r
                return;\r
        }\r
 \r
@@ -2928,7 +2936,7 @@ __process_rmpp_nack(
        cl_spinlock_release( &h_mad_svc->obj.lock );\r
        __notify_send_comp( h_mad_svc, h_send, IB_WCS_CANCELED );\r
 \r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
 }\r
 \r
 \r
@@ -2949,11 +2957,11 @@ static void
 __send_timer_cb(\r
        IN                              void                                            *context )\r
 {\r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
 \r
        __check_send_queue( (ib_mad_svc_handle_t)context );\r
 \r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
 }\r
 \r
 \r
@@ -2971,7 +2979,7 @@ __check_send_queue(
        uint64_t                                cur_time;\r
        cl_qlist_t                              timeout_list;\r
 \r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
 \r
        /*\r
         * The timeout out list is used to call the user back without\r
@@ -2994,7 +3002,7 @@ __check_send_queue(
                if( h_send->retry_time == MAX_TIME )\r
                {\r
                        /* The request is still active. */\r
-                       CL_TRACE( AL_DBG_MAD_SVC, g_al_dbg_lvl, ("active TID:0x%"PRIx64"\n",\r
+                       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MAD_SVC, ("active TID:0x%I64x\n",\r
                                __get_send_tid( h_send )) );\r
                        continue;\r
                }\r
@@ -3004,7 +3012,7 @@ __check_send_queue(
                if( h_send->canceled )\r
                {\r
                        /* The request has been canceled. */\r
-                       CL_TRACE( AL_DBG_MAD_SVC, g_al_dbg_lvl, ("canceling TID:0x%"PRIx64"\n",\r
+                       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MAD_SVC, ("canceling TID:0x%I64x\n",\r
                                __get_send_tid( h_send )) );\r
 \r
                        h_send->p_send_mad->status = IB_WCS_CANCELED;\r
@@ -3017,7 +3025,7 @@ __check_send_queue(
                if( cur_time < h_send->retry_time )\r
                {\r
                        /* The request has not timed out. */\r
-                       CL_TRACE( AL_DBG_MAD_SVC, g_al_dbg_lvl, ("waiting on TID:0x%"PRIx64"\n",\r
+                       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MAD_SVC, ("waiting on TID:0x%I64x\n",\r
                                __get_send_tid( h_send )) );\r
 \r
                        /* Set the retry timer to the minimum needed time, in ms. */\r
@@ -3029,7 +3037,7 @@ __check_send_queue(
                /* See if we need to retry the send operation. */\r
                if( h_send->retry_cnt )\r
                {\r
-                       CL_TRACE( AL_DBG_MAD_SVC, g_al_dbg_lvl, ("retrying TID:0x%"PRIx64"\n",\r
+                       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MAD_SVC, ("retrying TID:0x%I64x\n",\r
                                __get_send_tid( h_send )) );\r
 \r
                        /* Retry the send. */\r
@@ -3061,8 +3069,8 @@ __check_send_queue(
                        continue;\r
                }\r
                /* The request has timed out or failed to be retried. */\r
-               AL_TRACE( AL_DBG_MAD_SVC | AL_DBG_WARN,\r
-                       ("timing out TID:0x%"PRIx64"\n", __get_send_tid( h_send )) );\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_MAD_SVC,\r
+                       ("timing out TID:0x%I64x\n", __get_send_tid( h_send )) );\r
 \r
                h_send->p_send_mad->status = IB_WCS_TIMEOUT_RETRY_ERR;\r
                cl_qlist_remove_item( &h_mad_svc->send_list, p_list_item );\r
@@ -3088,7 +3096,7 @@ __check_send_queue(
                __cleanup_mad_send( h_mad_svc, h_send );\r
                p_list_item = cl_qlist_remove_head( &timeout_list );\r
        }\r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
 }\r
 \r
 \r
@@ -3102,7 +3110,7 @@ __recv_timer_cb(
        cl_list_item_t                  *p_list_item, *p_next_item;\r
        boolean_t                               restart_timer;\r
 \r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
 \r
        h_mad_svc = (ib_mad_svc_handle_t)context;\r
 \r
@@ -3134,7 +3142,7 @@ __recv_timer_cb(
 \r
        if( restart_timer )\r
                cl_timer_start( &h_mad_svc->recv_timer, AL_REASSEMBLY_TIMEOUT );\r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
 }\r
 \r
 \r
@@ -3148,22 +3156,22 @@ ib_local_mad(
 {\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_ca, AL_OBJ_TYPE_H_CA ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_CA_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_CA_HANDLE\n") );\r
                return IB_INVALID_CA_HANDLE;\r
        }\r
        if( !p_mad_in || !p_mad_out )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
        status = verbs_local_mad( h_ca, port_num, p_mad_in, p_mad_out );\r
 \r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
        return status;\r
 }\r
 \r
index 6ebd9c5d154016951be020cc47834334cc93dfd0..ce2b75a8ac1ee6a56a06e3a6a5d797f0e33c96b1 100644 (file)
@@ -117,7 +117,7 @@ reg_mad_pool(
 /* Deregister a MAD pool key if it is of the expected type. */\r
 ib_api_status_t\r
 dereg_mad_pool(\r
-       IN              const   ib_pool_key_t                           pool_key ,\r
+       IN              const   ib_pool_key_t                           pool_key,\r
        IN              const   al_key_type_t                           expected_type );\r
 \r
 \r
index 14cb159b3ba01a76b4f4403b96144dc6c2464c6c..7dfca76e8df3bf8fb5052db010f5119e0917e05d 100644 (file)
 #include "al.h"\r
 #include "al_ca.h"\r
 #include "al_debug.h"\r
+\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_mcast.tmh"\r
+#endif\r
+\r
 #include "al_mgr.h"\r
 #include "al_qp.h"\r
 #include "al_verbs.h"\r
@@ -102,7 +110,7 @@ al_join_mcast(
        cl_status_t                             cl_status;\r
        boolean_t                               sync;\r
 \r
-       CL_ENTER( AL_DBG_MCAST, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MCAST );\r
 \r
        /*\r
         * Validate the port GUID.  There is no need to validate the pkey index as\r
@@ -113,7 +121,7 @@ al_join_mcast(
        status = get_port_num( h_qp->obj.p_ci_ca, p_mcast_req->port_guid, NULL );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("get_port_num failed, status: %s\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -122,7 +130,7 @@ al_join_mcast(
        h_mcast = cl_zalloc( sizeof( ib_mcast_t ) );\r
        if( !h_mcast )\r
        {\r
-               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl, ("zalloc of h_mcast failed\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("zalloc of h_mcast failed\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
 \r
@@ -137,7 +145,7 @@ al_join_mcast(
        {\r
                if( !cl_is_blockable() )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("Thread context not blockable\n") );\r
                        __free_mcast( &h_mcast->obj );\r
                        return IB_INVALID_SETTING;\r
@@ -146,7 +154,7 @@ al_join_mcast(
                cl_status = cl_event_init( &h_mcast->event, TRUE );\r
                if( cl_status != CL_SUCCESS )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("unable to initialize event for sync operation\n") );\r
                        __free_mcast( &h_mcast->obj );\r
                        return ib_convert_cl_status( cl_status );\r
@@ -158,7 +166,7 @@ al_join_mcast(
                __destroying_mcast, __cleanup_mcast, __free_mcast );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("init_al_obj returned %s\n", ib_get_err_str( status )) );\r
                __free_mcast( &h_mcast->obj );\r
                return status;\r
@@ -178,7 +186,7 @@ al_join_mcast(
        if( status != IB_SUCCESS )\r
        {\r
                h_mcast->obj.pfn_destroy( &h_mcast->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -200,7 +208,7 @@ al_join_mcast(
        }\r
        else\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("unable to send join request: %s\n", ib_get_err_str(status)) );\r
                h_mcast->obj.pfn_destroy( &h_mcast->obj, NULL );\r
        }\r
@@ -210,7 +218,7 @@ al_join_mcast(
         * have the SA req outstanding.\r
         */\r
 \r
-       CL_EXIT( AL_DBG_MCAST, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MCAST );\r
        return status;\r
 }\r
 \r
@@ -223,7 +231,7 @@ __destroying_mcast(
        ib_user_query_t                 sa_mad_data;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_MCAST, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MCAST );\r
 \r
        h_mcast = PARENT_STRUCT( p_obj, ib_mcast_t, obj );\r
 \r
@@ -268,7 +276,7 @@ __destroying_mcast(
        if( status != IB_SUCCESS )\r
                deref_al_obj( &h_mcast->obj );\r
 \r
-       CL_EXIT( AL_DBG_MCAST, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MCAST );\r
 }\r
 \r
 \r
@@ -279,7 +287,7 @@ __cleanup_mcast(
        ib_mcast_handle_t               h_mcast;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_MCAST, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MCAST );\r
 \r
        h_mcast = PARENT_STRUCT( p_obj, ib_mcast_t, obj );\r
 \r
@@ -291,17 +299,17 @@ __cleanup_mcast(
         */\r
        if( h_mcast->h_ci_mcast )\r
        {\r
-               CL_TRACE( AL_DBG_MCAST, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MCAST,\r
                        ("detaching from multicast group\n") );\r
                status = verbs_detach_mcast( h_mcast );\r
                if( status != IB_SUCCESS )\r
                {\r
-                       CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("detach failed: %s\n", ib_get_err_str(status)) );\r
                }\r
        }\r
 \r
-       CL_EXIT( AL_DBG_MCAST, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MCAST );\r
 }\r
 \r
 \r
@@ -331,7 +339,7 @@ send_join(
        ib_user_query_t                 sa_mad_data;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_MCAST, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MCAST );\r
 \r
        /* Set the request information. */\r
        p_mcast->sa_reg_req.pfn_sa_req_cb = join_req_cb;\r
@@ -349,7 +357,7 @@ send_join(
 \r
        if( p_mcast_req->create )\r
        {\r
-               CL_TRACE( AL_DBG_MCAST, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MCAST,\r
                        ("requesting creation of mcast group\n") );\r
 \r
                /* Set the necessary creation components. */\r
@@ -397,7 +405,7 @@ send_join(
        status = al_send_sa_req( &p_mcast->sa_reg_req, p_mcast->port_guid,\r
                p_mcast_req->timeout_ms, p_mcast_req->retry_cnt, &sa_mad_data, 0 );\r
 \r
-       CL_EXIT( AL_DBG_MCAST, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MCAST );\r
        return status;\r
 }\r
 \r
@@ -413,7 +421,7 @@ join_req_cb(
        ib_mcast_handle_t               h_mcast;\r
        ib_sa_mad_t                             *p_sa_mad;\r
 \r
-       CL_ENTER( AL_DBG_MCAST, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MCAST );\r
        h_mcast = PARENT_STRUCT( p_sa_req, ib_mcast_t, sa_reg_req );\r
 \r
        /* Record the status of the join request. */\r
@@ -421,14 +429,14 @@ join_req_cb(
 \r
        if( p_mad_response )\r
        {\r
-               CL_TRACE( AL_DBG_MCAST, g_al_dbg_lvl, ("processing response\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MCAST, ("processing response\n") );\r
                p_sa_mad = (ib_sa_mad_t*)ib_get_mad_buf( p_mad_response );\r
                h_mcast->resp_status = p_sa_mad->status;\r
 \r
                /* Record the join membership information. */\r
                if( h_mcast->req_status == IB_SUCCESS )\r
                {\r
-                       CL_TRACE( AL_DBG_MCAST, g_al_dbg_lvl, ("join successful\n") );\r
+                       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MCAST, ("join successful\n") );\r
                        h_mcast->member_rec = *((ib_member_rec_t*)p_sa_mad->data);\r
                }\r
 \r
@@ -460,7 +468,7 @@ join_async_cb(
        ib_mcast_rec_t                  mcast_rec;\r
        boolean_t                               sync;\r
 \r
-       CL_ENTER( AL_DBG_MCAST, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MCAST );\r
 \r
        h_mcast = PARENT_STRUCT( p_item, ib_mcast_t, async );\r
 \r
@@ -527,7 +535,7 @@ join_async_cb(
        else\r
                deref_al_obj( &h_mcast->obj );\r
 \r
-       CL_EXIT( AL_DBG_MCAST, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MCAST );\r
 }\r
 \r
 \r
@@ -538,11 +546,11 @@ ib_leave_mcast(
        IN              const   ib_pfn_destroy_cb_t                     pfn_destroy_cb OPTIONAL )\r
 {\r
 \r
-       CL_ENTER( AL_DBG_MCAST, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MCAST );\r
 \r
        if( !h_mcast )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("IB_INVALID_MCAST_HANDLE\n") );\r
                return IB_INVALID_MCAST_HANDLE;\r
        }\r
@@ -565,7 +573,7 @@ leave_req_cb(
 {\r
        ib_mcast_handle_t               h_mcast;\r
 \r
-       CL_ENTER( AL_DBG_MCAST, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MCAST );\r
        h_mcast = PARENT_STRUCT( p_sa_req, ib_mcast_t, sa_dereg_req );\r
 \r
        if( p_mad_response )\r
@@ -576,7 +584,7 @@ leave_req_cb(
         * the SA operation is complete.\r
         */\r
        deref_al_obj( &h_mcast->obj );\r
-       CL_EXIT( AL_DBG_MCAST, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MCAST );\r
 }\r
 \r
 \r
@@ -621,7 +629,7 @@ al_attach_mcast(
        if( status != IB_SUCCESS )\r
        {\r
                h_attach->obj.pfn_destroy( &h_attach->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
index 33ddcc126bc1f95a92466a3cd50154b5a50bfe6b..4830707560f1a9a859ddaf57cd816cb615bc58e7 100644 (file)
 #include "al.h"\r
 #include "al_common.h"\r
 #include "al_debug.h"\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_mgr_shared.tmh"\r
+#endif\r
 #include "al_ci_ca.h"\r
 #include "ib_common.h"\r
 #include "al_debug.h"\r
@@ -55,7 +61,7 @@ print_al_obj(
 \r
        UNUSED_PARAM( p_obj );\r
 \r
-       CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                ("AL object %p(%s), parent: %p ref_cnt: %d\n",\r
                p_obj, ib_get_obj_type( p_obj ), p_obj->p_parent_obj,\r
                p_obj->ref_cnt) );\r
@@ -119,7 +125,7 @@ find_ci_ca(
        cl_list_item_t          *p_list_item;\r
        al_ci_ca_t                      *p_ci_ca;\r
 \r
-       CL_ENTER( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MGR );\r
 \r
        for( p_list_item = cl_qlist_head( &gp_al_mgr->ci_ca_list );\r
                 p_list_item != cl_qlist_end( &gp_al_mgr->ci_ca_list );\r
@@ -129,14 +135,14 @@ find_ci_ca(
                if( p_ci_ca->verbs.guid == ci_ca_guid &&\r
                        p_ci_ca->obj.state == CL_INITIALIZED )\r
                {\r
-                       CL_TRACE( AL_DBG_MGR, g_al_dbg_lvl,\r
-                               ("find_ci_ca:CA guid %"PRIx64".\n", ci_ca_guid) );\r
-                       CL_EXIT( AL_DBG_MGR, g_al_dbg_lvl );\r
+                       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MGR,\r
+                               ("find_ci_ca:CA guid %I64x.\n", ci_ca_guid) );\r
+                       AL_EXIT( AL_DBG_MGR );\r
                        return p_ci_ca;\r
                }\r
        }\r
 \r
-       CL_EXIT( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MGR );\r
        return NULL;\r
 }\r
 \r
@@ -168,9 +174,9 @@ void
 release_ci_ca(\r
        IN              const   ib_ca_handle_t                          h_ca )\r
 {\r
-       CL_ENTER( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MGR );\r
        remove_ca( h_ca );\r
-       CL_EXIT( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MGR );\r
 }\r
 \r
 \r
@@ -179,12 +185,12 @@ void
 add_ci_ca(\r
        IN                              al_ci_ca_t* const                       p_ci_ca )\r
 {\r
-       CL_ENTER( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MGR );\r
        cl_spinlock_acquire( &gp_al_mgr->obj.lock );\r
        cl_qlist_insert_tail( &gp_al_mgr->ci_ca_list, &p_ci_ca->list_item );\r
        ref_al_obj( &gp_al_mgr->obj );\r
        cl_spinlock_release( &gp_al_mgr->obj.lock );\r
-       CL_EXIT( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MGR );\r
 }\r
 \r
 \r
@@ -192,12 +198,12 @@ void
 remove_ci_ca(\r
        IN                              al_ci_ca_t* const                       p_ci_ca )\r
 {\r
-       CL_ENTER( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MGR );\r
        cl_spinlock_acquire( &gp_al_mgr->obj.lock );\r
        cl_qlist_remove_item( &gp_al_mgr->ci_ca_list, &p_ci_ca->list_item );\r
        cl_spinlock_release( &gp_al_mgr->obj.lock );\r
        deref_al_obj( &gp_al_mgr->obj );\r
-       CL_EXIT( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MGR );\r
 }\r
 \r
 \r
@@ -244,7 +250,7 @@ __get_guid_by_gid (
        ib_ca_attr_t            *p_ca_attr = NULL;\r
        ib_port_attr_t          *p_port_attr = NULL;\r
 \r
-       CL_ENTER( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MGR );\r
 \r
        CL_ASSERT( h_al && p_gid && p_guid );\r
 \r
@@ -331,7 +337,7 @@ end:
        if ( p_guid_array )\r
                cl_free( p_guid_array );\r
 \r
-       CL_EXIT( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MGR );\r
        return status;\r
 }\r
 \r
@@ -345,22 +351,22 @@ ib_get_ca_by_gid(
 {\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MGR );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_al, AL_OBJ_TYPE_H_AL ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_AL_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_AL_HANDLE\n") );\r
                return IB_INVALID_AL_HANDLE;\r
        }\r
        if( !p_gid || !p_ca_guid )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
        status = __get_guid_by_gid( h_al, p_gid, SEARCH_CA_GUID, p_ca_guid );\r
 \r
-       CL_EXIT( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MGR );\r
        return status;\r
 }\r
 \r
@@ -374,22 +380,22 @@ ib_get_port_by_gid(
 {\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MGR );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_al, AL_OBJ_TYPE_H_AL ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_AL_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_AL_HANDLE\n") );\r
                return IB_INVALID_AL_HANDLE;\r
        }\r
        if( !p_gid || !p_port_guid )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
        status = __get_guid_by_gid( h_al, p_gid, SEARCH_PORT_GUID, p_port_guid );\r
 \r
-       CL_EXIT( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MGR );\r
        return status;\r
 }\r
 \r
@@ -408,16 +414,16 @@ ib_get_ca_guids(
        al_ci_ca_t                      *p_ci_ca;\r
        uintn_t                         guid_cnt;\r
 \r
-       CL_ENTER( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MGR );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_al, AL_OBJ_TYPE_H_AL ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_AL_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_AL_HANDLE\n") );\r
                return IB_INVALID_AL_HANDLE;\r
        }\r
        if( !p_guid_cnt )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -439,7 +445,7 @@ ib_get_ca_guids(
                /* Return the actual count. */\r
                *p_guid_cnt = guid_cnt;\r
 \r
-               CL_EXIT( AL_DBG_MGR, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MGR );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
 \r
@@ -459,7 +465,7 @@ ib_get_ca_guids(
        /* Allow CA additions or removals. */\r
        cl_spinlock_release( &gp_al_mgr->obj.lock );\r
 \r
-       CL_EXIT( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MGR );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -496,7 +502,7 @@ __get_ca_guid(
        al_ci_ca_t                      *p_ci_ca;\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MGR );\r
 \r
        /* Prevent CA additions or removals. */\r
        cl_spinlock_acquire( &gp_al_mgr->obj.lock );\r
@@ -506,7 +512,7 @@ __get_ca_guid(
                index >= cl_qlist_count( &gp_al_mgr->ci_ca_list ) )\r
        {\r
                cl_spinlock_release( &gp_al_mgr->obj.lock );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_INDEX\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_INDEX\n") );\r
                return IB_INVALID_INDEX;\r
        }\r
 \r
@@ -534,7 +540,7 @@ __get_ca_guid(
 \r
        cl_spinlock_release( &gp_al_mgr->obj.lock );\r
 \r
-       CL_EXIT( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MGR );\r
        return status;\r
 }\r
 \r
@@ -564,7 +570,7 @@ __get_port_guid(
        al_ci_ca_t                      *p_ci_ca;\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MGR );\r
 \r
        /* Prevent CA additions or removals. */\r
        cl_spinlock_acquire( &gp_al_mgr->obj.lock );\r
@@ -611,7 +617,7 @@ __get_port_guid(
                status = IB_INVALID_INDEX;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MGR );\r
        return status;\r
 }\r
 \r
@@ -627,16 +633,16 @@ ib_get_guid(
 {\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MGR );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_al, AL_OBJ_TYPE_H_AL ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_AL_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_AL_HANDLE\n") );\r
                return IB_INVALID_AL_HANDLE;\r
        }\r
        if( !p_guid )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -651,16 +657,16 @@ ib_get_guid(
                break;\r
 \r
        case IB_PNP_IOC:\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("IOC GUIDs not supported at this time\n") );\r
                return IB_UNSUPPORTED;\r
 \r
        default:\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_SETTING\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_SETTING\n") );\r
                return IB_INVALID_SETTING;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MGR );\r
        return status;\r
 }\r
 \r
index 27afa988746bb04fcbf29983ba2a401e35666d28..8fc389dacf29eb34ea8b6da6d3ad97f14c6b5fdd 100644 (file)
 #include <iba/ib_al.h>\r
 #include "al.h"\r
 #include "al_debug.h"\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_mr_shared.tmh"\r
+#endif\r
 #include "al_mr.h"\r
 #include "al_pd.h"\r
 #include "al_res_mgr.h"\r
@@ -159,11 +165,11 @@ ib_reg_mem(
 {\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_MR, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MR );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_pd, AL_OBJ_TYPE_H_PD ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PD_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PD_HANDLE\n") );\r
                return IB_INVALID_PD_HANDLE;\r
        }\r
 \r
@@ -191,11 +197,11 @@ reg_mem(
        ib_mr_handle_t                  h_mr;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_MR, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MR );\r
 \r
        if( !p_mr_create || !p_lkey || !p_rkey || !ph_mr )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -203,7 +209,7 @@ reg_mem(
        h_mr = alloc_mr();\r
        if( !h_mr )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("unable to allocate memory handle\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -212,7 +218,7 @@ reg_mem(
        if( status != IB_SUCCESS )\r
        {\r
                h_mr->obj.pfn_destroy( &h_mr->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -222,14 +228,14 @@ reg_mem(
        if( status != IB_SUCCESS )\r
        {\r
                h_mr->obj.pfn_destroy( &h_mr->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("unable to register memory: %s\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
 \r
        *ph_mr = h_mr;\r
 \r
-       CL_EXIT( AL_DBG_MR, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MR );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -247,16 +253,16 @@ ib_reg_phys(
        ib_mr_handle_t                  h_mr;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_MR, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MR );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_pd, AL_OBJ_TYPE_H_PD ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PD_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PD_HANDLE\n") );\r
                return IB_INVALID_PD_HANDLE;\r
        }\r
        if( !p_vaddr || !p_lkey || !p_rkey || !ph_mr )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -264,7 +270,7 @@ ib_reg_phys(
        h_mr = alloc_mr();\r
        if( !h_mr )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("unable to allocate memory handle\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -273,7 +279,7 @@ ib_reg_phys(
        if( status != IB_SUCCESS )\r
        {\r
                h_mr->obj.pfn_destroy( &h_mr->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -283,7 +289,7 @@ ib_reg_phys(
                p_lkey, p_rkey, h_mr );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("unable to register memory: %s\n", ib_get_err_str(status)) );\r
                h_mr->obj.pfn_destroy( &h_mr->obj, NULL );\r
                return status;\r
@@ -294,7 +300,7 @@ ib_reg_phys(
        /* Release the reference taken in alloc_mr for initialization. */\r
        deref_al_obj( &h_mr->obj );\r
 \r
-       CL_EXIT( AL_DBG_MR, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MR );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -311,7 +317,7 @@ ib_rereg_mem(
 {\r
        if( AL_OBJ_INVALID_HANDLE( h_mr, AL_OBJ_TYPE_H_MR ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_MR_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_MR_HANDLE\n") );\r
                return IB_INVALID_MR_HANDLE;\r
        }\r
 \r
@@ -332,24 +338,24 @@ rereg_mem(
 {\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_MR, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MR );\r
 \r
        if( ( mr_mod_mask & IB_MR_MOD_PD ) )\r
        {\r
                if( AL_OBJ_INVALID_HANDLE( h_pd, AL_OBJ_TYPE_H_PD ) )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_PD_HANDLE\n") );\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PD_HANDLE\n") );\r
                        return IB_INVALID_PD_HANDLE;\r
                }\r
                if( h_pd->obj.h_al != h_mr->obj.h_al )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_PD_HANDLE\n") );\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PD_HANDLE\n") );\r
                        return IB_INVALID_PD_HANDLE;\r
                }\r
        }\r
        if( !p_lkey || !p_rkey )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -360,14 +366,14 @@ rereg_mem(
        /* If we're changing the PD, we need to update the object hierarchy. */\r
        if( h_pd && (status == IB_SUCCESS) )\r
        {\r
-               CL_TRACE( AL_DBG_MR, g_al_dbg_lvl, ("associating MR with new PD\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MR, ("associating MR with new PD\n") );\r
                detach_al_obj( &h_mr->obj );\r
                deref_al_obj( h_mr->obj.p_parent_obj );\r
                status = attach_al_obj( &h_pd->obj, &h_mr->obj );\r
                CL_ASSERT( status );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_MR, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MR );\r
        return status;\r
 }\r
 \r
@@ -385,29 +391,29 @@ ib_rereg_phys(
 {\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_MR, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MR );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_mr, AL_OBJ_TYPE_H_MR ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_MR_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_MR_HANDLE\n") );\r
                return IB_INVALID_MR_HANDLE;\r
        }\r
        if( ( mr_mod_mask & IB_MR_MOD_PD ) )\r
        {\r
                if( AL_OBJ_INVALID_HANDLE( h_pd, AL_OBJ_TYPE_H_PD ) )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_PD_HANDLE\n") );\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PD_HANDLE\n") );\r
                        return IB_INVALID_PD_HANDLE;\r
                }\r
                if( h_pd->obj.p_parent_obj != h_mr->obj.p_parent_obj->p_parent_obj )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_PD_HANDLE\n") );\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PD_HANDLE\n") );\r
                        return IB_INVALID_PD_HANDLE;\r
                }\r
        }\r
        if( !p_vaddr || !p_lkey || !p_rkey )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -418,14 +424,14 @@ ib_rereg_phys(
        /* If we're changing the PD, we need to update the object hierarchy. */\r
        if( h_pd && (status == IB_SUCCESS) )\r
        {\r
-               CL_TRACE( AL_DBG_MR, g_al_dbg_lvl, ("associating MR with new PD\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MR, ("associating MR with new PD\n") );\r
                detach_al_obj( &h_mr->obj );\r
                deref_al_obj( h_mr->obj.p_parent_obj );\r
                status = attach_al_obj( &h_pd->obj, &h_mr->obj );\r
                CL_ASSERT( status );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_MR, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MR );\r
        return status;\r
 }\r
 \r
@@ -445,12 +451,12 @@ ib_reg_shared(
 \r
        if( AL_OBJ_INVALID_HANDLE( h_mr, AL_OBJ_TYPE_H_MR ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_MR_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_MR_HANDLE\n") );\r
                return IB_INVALID_MR_HANDLE;\r
        }\r
        if( AL_OBJ_INVALID_HANDLE( h_pd, AL_OBJ_TYPE_H_PD ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PD_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PD_HANDLE\n") );\r
                return IB_INVALID_PD_HANDLE;\r
        }\r
 \r
@@ -480,11 +486,11 @@ reg_shared(
        ib_mr_handle_t                  h_new_mr;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_MR, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MR );\r
 \r
        if( !p_vaddr || !p_lkey || !p_rkey || !ph_mr )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -492,7 +498,7 @@ reg_shared(
        h_new_mr = alloc_mr();\r
        if( !h_new_mr )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("unable to allocate memory handle\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -501,7 +507,7 @@ reg_shared(
        if( status != IB_SUCCESS )\r
        {\r
                h_new_mr->obj.pfn_destroy( &h_new_mr->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -512,14 +518,14 @@ reg_shared(
        if( status != IB_SUCCESS )\r
        {\r
                h_new_mr->obj.pfn_destroy( &h_new_mr->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("unable to register memory: %s\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
 \r
        *ph_mr = h_new_mr;\r
 \r
-       CL_EXIT( AL_DBG_MR, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MR );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -531,11 +537,11 @@ ib_dereg_mr(
 {\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_MR, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MR );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_mr, AL_OBJ_TYPE_H_MR ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_MR_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_MR_HANDLE\n") );\r
                return IB_INVALID_MR_HANDLE;\r
        }\r
 \r
@@ -545,7 +551,7 @@ ib_dereg_mr(
        if( status != IB_SUCCESS )\r
                deref_al_obj( &h_mr->obj );\r
 \r
-       CL_EXIT( AL_DBG_MR, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MR );\r
        return status;\r
 }\r
 \r
@@ -561,7 +567,7 @@ dereg_mr(
 \r
        if( !verbs_check_mr(h_mr) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_MR_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_MR_HANDLE\n") );\r
                return IB_INVALID_MR_HANDLE;\r
        }\r
 \r
@@ -584,7 +590,7 @@ dereg_mr(
                h_mr->obj.pfn_destroy( &h_mr->obj, NULL );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_MR, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MR );\r
        return status;\r
 }\r
 \r
@@ -597,16 +603,16 @@ ib_query_mr(
 {\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_MR, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MR );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_mr, AL_OBJ_TYPE_H_MR ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_MR_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_MR_HANDLE\n") );\r
                return IB_INVALID_MR_HANDLE;\r
        }\r
        if( !p_mr_attr )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -619,10 +625,10 @@ ib_query_mr(
        }\r
        else\r
        {\r
-               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("unable to query memory region: %s\n", ib_get_err_str(status)) );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_MR, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MR );\r
        return status;\r
 }\r
index 76e13c93cbd6c918596f04684bd2ea5c34bb6b66..b7a30a5d16e52ea3fe19915f0416b922bf27c233 100644 (file)
 #include <iba/ib_al.h>\r
 \r
 #include "al_debug.h"\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_mw.tmh"\r
+#endif\r
 #include "al_mw.h"\r
 #include "al_pd.h"\r
 #include "al_verbs.h"\r
@@ -66,7 +72,7 @@ create_mw(
 \r
        if( !p_rkey || !ph_mw )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -94,7 +100,7 @@ create_mw(
        if( status != IB_SUCCESS )\r
        {\r
                h_mw->obj.pfn_destroy( &h_mw->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -123,11 +129,11 @@ ib_destroy_mw(
 {\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_MW, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MW );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_mw, AL_OBJ_TYPE_H_MW ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_MW_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_MW_HANDLE\n") );\r
                return IB_INVALID_MW_HANDLE;\r
        }\r
 \r
@@ -138,7 +144,7 @@ ib_destroy_mw(
        if( status != IB_SUCCESS )\r
                deref_al_obj( &h_mw->obj );\r
 \r
-       CL_EXIT( AL_DBG_MW, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MW );\r
        return status;\r
 }\r
 \r
@@ -150,11 +156,11 @@ destroy_mw(
 {\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_MW, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MW );\r
 \r
        if( !verbs_check_mw( h_mw ) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_MW_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_MW_HANDLE\n") );\r
                return IB_INVALID_MW_HANDLE;\r
        }\r
 \r
@@ -226,16 +232,16 @@ query_mw(
        ib_pd_handle_t                  h_ci_pd;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_MW, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MW );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_mw, AL_OBJ_TYPE_H_MW ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_MW_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_MW_HANDLE\n") );\r
                return IB_INVALID_MW_HANDLE;\r
        }\r
        if( !ph_pd || !p_rkey )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -248,6 +254,6 @@ query_mw(
                CL_ASSERT( (*ph_pd)->h_ci_pd == h_ci_pd );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_MW, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MW );\r
        return status;\r
 }\r
index bce9adb1bc056213ba7ff0bfd70f4ff1f8e05af8..16c426cb388fb1b0f00c5620559d686736d0ffe3 100644 (file)
 #include "al_ca.h"\r
 #include "al_cq.h"\r
 #include "al_debug.h"\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_pd.tmh"\r
+#endif\r
 #include "al_mgr.h"\r
 #include "al_mr.h"\r
 #include "al_mw.h"\r
@@ -79,7 +85,7 @@ alloc_pd(
 \r
        if( !ph_pd )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -109,7 +115,7 @@ alloc_pd(
        if( status != IB_SUCCESS )\r
        {\r
                h_pd->obj.pfn_destroy( &h_pd->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -151,18 +157,18 @@ ib_dealloc_pd(
        IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   ib_pfn_destroy_cb_t                     pfn_destroy_cb OPTIONAL )\r
 {\r
-       CL_ENTER( AL_DBG_PD, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PD );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_pd, AL_OBJ_TYPE_H_PD ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PD_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PD_HANDLE\n") );\r
                return IB_INVALID_PD_HANDLE;\r
        }\r
 \r
        ref_al_obj( &h_pd->obj );\r
        h_pd->obj.pfn_destroy( &h_pd->obj, pfn_destroy_cb );\r
 \r
-       CL_EXIT( AL_DBG_PD, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PD );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -265,11 +271,11 @@ ib_create_qp(
 {\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_QP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_QP );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_pd, AL_OBJ_TYPE_H_PD ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PD_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PD_HANDLE\n") );\r
                return IB_INVALID_PD_HANDLE;\r
        }\r
 \r
@@ -280,7 +286,7 @@ ib_create_qp(
        if( status == IB_SUCCESS )\r
                deref_al_obj( &(*ph_qp)->obj );\r
 \r
-       CL_EXIT( AL_DBG_QP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_QP );\r
        return status;\r
 }\r
 \r
@@ -298,11 +304,11 @@ ib_get_spl_qp(
 {\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_QP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_QP );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_pd, AL_OBJ_TYPE_H_PD ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PD_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PD_HANDLE\n") );\r
                return IB_INVALID_PD_HANDLE;\r
        }\r
 \r
@@ -313,7 +319,7 @@ ib_get_spl_qp(
        if( status == IB_SUCCESS )\r
                deref_al_obj( &(*ph_qp)->obj );\r
 \r
-       CL_EXIT( AL_DBG_QP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_QP );\r
        return status;\r
 }\r
 \r
@@ -327,11 +333,11 @@ ib_create_av(
 {\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_AV, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_AV );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_pd, AL_OBJ_TYPE_H_PD ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PD_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PD_HANDLE\n") );\r
                return IB_INVALID_PD_HANDLE;\r
        }\r
 \r
@@ -341,7 +347,7 @@ ib_create_av(
        if( status == IB_SUCCESS )\r
                deref_al_obj( &(*ph_av)->obj );\r
 \r
-       CL_EXIT( AL_DBG_AV, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_AV );\r
        return status;\r
 }\r
 \r
@@ -355,11 +361,11 @@ ib_create_mw(
 {\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_MW, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MW );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_pd, AL_OBJ_TYPE_H_PD ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PD_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PD_HANDLE\n") );\r
                return IB_INVALID_PD_HANDLE;\r
        }\r
 \r
@@ -368,7 +374,7 @@ ib_create_mw(
        if( status == IB_SUCCESS )\r
                deref_al_obj( &(*ph_mw)->obj );\r
 \r
-       CL_EXIT( AL_DBG_MW, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MW );\r
        return status;\r
 }\r
 \r
index b28c050a248514eb32117c3de6766259238c9653..bcd2f5ae9b0cab96e91528ac5326318f8bdaac84 100644 (file)
 #include "al_cm_cep.h"\r
 #include "al_cq.h"\r
 #include "al_debug.h"\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_qp.tmh"\r
+#endif\r
 #include "al_mad.h"\r
 #include "al_mad_pool.h"\r
 #include "al_mcast.h"\r
@@ -284,7 +290,7 @@ create_qp(
 \r
        if( !p_qp_create || !ph_qp )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -377,7 +383,7 @@ get_spl_qp(
 \r
        if( !p_qp_create || !ph_qp )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -990,18 +996,18 @@ ib_destroy_qp(
        IN              const   ib_qp_handle_t                          h_qp,\r
        IN              const   ib_pfn_destroy_cb_t                     pfn_destroy_cb OPTIONAL )\r
 {\r
-       CL_ENTER( AL_DBG_QP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_QP );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_qp, AL_OBJ_TYPE_H_QP ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_QP_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
                return IB_INVALID_QP_HANDLE;\r
        }\r
 \r
        ref_al_obj( &h_qp->obj );\r
        h_qp->obj.pfn_destroy( &h_qp->obj, pfn_destroy_cb );\r
 \r
-       CL_EXIT( AL_DBG_QP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_QP );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -1061,7 +1067,7 @@ destroying_qp(
                        status = dereg_mad_pool( p_qp_alias->pool_key, AL_KEY_ALIAS );\r
                        if( status != IB_SUCCESS )\r
                        {\r
-                               AL_TRACE( AL_DBG_ERROR, ("dereg_mad_pool returned %s.\n",\r
+                               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("dereg_mad_pool returned %s.\n",\r
                                        ib_get_err_str(status)) );\r
                                deref_al_obj( &p_qp_alias->pool_key->obj );\r
                        }\r
@@ -1131,7 +1137,7 @@ cleanup_qp(
                status = verbs_destroy_qp( h_qp );\r
                if( status != IB_SUCCESS )\r
                {\r
-                       CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("verbs_destroy_qp failed with status %s.\n",\r
                                ib_get_err_str(status)) );\r
                }\r
@@ -1233,23 +1239,23 @@ query_qp(
 {\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_QP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_QP );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_qp, AL_OBJ_TYPE_H_QP ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_QP_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
                return IB_INVALID_QP_HANDLE;\r
        }\r
        if( !p_qp_attr )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
        status = verbs_query_qp( h_qp, p_qp_attr );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_EXIT( AL_DBG_QP, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_QP );\r
                return status;\r
        }\r
 \r
@@ -1259,7 +1265,7 @@ query_qp(
        p_qp_attr->h_sq_cq = h_qp->h_send_cq;\r
        p_qp_attr->qp_type = h_qp->type;\r
 \r
-       CL_EXIT( AL_DBG_QP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_QP );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -1283,22 +1289,22 @@ modify_qp(
 {\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_QP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_QP );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_qp, AL_OBJ_TYPE_H_QP ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_QP_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
                return IB_INVALID_QP_HANDLE;\r
        }\r
        if( !p_qp_mod )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
        status = h_qp->pfn_modify_qp( h_qp, p_qp_mod, p_umv_buf );\r
 \r
-       CL_EXIT( AL_DBG_QP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_QP );\r
        return status;\r
 }\r
 \r
@@ -1347,11 +1353,11 @@ ib_init_dgrm_svc(
 {\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_QP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_QP );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_qp, AL_OBJ_TYPE_H_QP ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_QP_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
                return IB_INVALID_QP_HANDLE;\r
        }\r
 \r
@@ -1367,20 +1373,20 @@ ib_init_dgrm_svc(
        case IB_QPT_MAD:\r
                if( !p_dgrm_info )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("IB_INVALID_PARAMETER\n") );\r
                        return IB_INVALID_PARAMETER;\r
                }\r
                break;\r
 \r
        default:\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
        status = h_qp->pfn_init_dgrm_svc( h_qp, p_dgrm_info );\r
 \r
-       CL_EXIT( AL_DBG_QP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_QP );\r
        return status;\r
 }\r
 \r
@@ -1504,11 +1510,11 @@ ib_reg_mad_svc(
 {\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_SVC );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_qp, AL_OBJ_TYPE_H_QP ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_QP_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
                return IB_INVALID_QP_HANDLE;\r
        }\r
 \r
@@ -1518,7 +1524,7 @@ ib_reg_mad_svc(
        if( status == IB_SUCCESS )\r
                deref_al_obj( &(*ph_mad_svc)->obj );\r
 \r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_SVC );\r
        return status;\r
 }\r
 \r
@@ -1530,22 +1536,22 @@ ib_join_mcast(
 {\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_MCAST, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MCAST );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_qp, AL_OBJ_TYPE_H_QP ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_QP_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
                return IB_INVALID_QP_HANDLE;\r
        }\r
        if( !p_mcast_req )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
        status = h_qp->pfn_join_mcast( h_qp, p_mcast_req );\r
 \r
-       CL_EXIT( AL_DBG_MCAST, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MCAST );\r
        return status;\r
 }\r
 \r
@@ -1565,16 +1571,16 @@ ib_post_send(
        PERF_DECLARE( PostSend );\r
 \r
        cl_perf_start( IbPostSend );\r
-       CL_ENTER( AL_DBG_QP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_QP );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_qp, AL_OBJ_TYPE_H_QP ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_QP_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
                return IB_INVALID_QP_HANDLE;\r
        }\r
        if( !p_send_wr || ( p_send_wr->p_next && !pp_send_failure ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1583,7 +1589,7 @@ ib_post_send(
                h_qp->pfn_post_send( h_qp->h_send_qp, p_send_wr, pp_send_failure );\r
        cl_perf_stop( &g_perf, PostSend );\r
 \r
-       CL_EXIT( AL_DBG_QP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_QP );\r
        cl_perf_stop( &g_perf, IbPostSend );\r
        return status;\r
 }\r
@@ -1777,23 +1783,23 @@ ib_post_recv(
 {\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_QP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_QP );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_qp, AL_OBJ_TYPE_H_QP ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_QP_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
                return IB_INVALID_QP_HANDLE;\r
        }\r
        if( !p_recv_wr || ( p_recv_wr->p_next && !pp_recv_failure ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
        status =\r
                h_qp->pfn_post_recv( h_qp->h_recv_qp, p_recv_wr, pp_recv_failure );\r
 \r
-       CL_EXIT( AL_DBG_QP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_QP );\r
        return status;\r
 }\r
 \r
@@ -2052,21 +2058,21 @@ ib_bind_mw(
        ib_mr_handle_t                  h_mr;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_MW, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MW );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_mw, AL_OBJ_TYPE_H_MW ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_MW_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_MW_HANDLE\n") );\r
                return IB_INVALID_MW_HANDLE;\r
        }\r
        if( AL_OBJ_INVALID_HANDLE( h_qp, AL_OBJ_TYPE_H_QP ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_QP_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
                return IB_INVALID_QP_HANDLE;\r
        }\r
        if( !p_mw_bind || !p_rkey )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -2078,6 +2084,6 @@ ib_bind_mw(
 \r
        p_mw_bind->h_mr = h_mr;\r
 \r
-       CL_EXIT( AL_DBG_MW, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MW );\r
        return status;\r
 }\r
index 8dc88981cd55e9e156023ff4762e01b1aa12b56b..dd86d3b4c29e02a3cfdad7a4371debf86bd82edf 100644 (file)
 #include "al_ca.h"\r
 #include "al_common.h"\r
 #include "al_debug.h"\r
+\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_query.tmh"\r
+#endif\r
 #include "al_mgr.h"\r
 #include "al_query.h"\r
 #include "ib_common.h"\r
@@ -66,21 +73,21 @@ ib_query(
        al_query_t                              *p_query;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_QUERY, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_QUERY );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_al, AL_OBJ_TYPE_H_AL ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_AL_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_AL_HANDLE\n") );\r
                return IB_INVALID_AL_HANDLE;\r
        }\r
        if( !p_query_req )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
        if( (p_query_req->flags & IB_FLAGS_SYNC) && !cl_is_blockable() )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_UNSUPPORTED\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_UNSUPPORTED\n") );\r
                return IB_UNSUPPORTED;\r
        }\r
 \r
@@ -88,7 +95,7 @@ ib_query(
        p_query = cl_zalloc( sizeof( al_query_t ) );\r
        if( !p_query )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("insufficient memory\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("insufficient memory\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
 \r
@@ -112,7 +119,7 @@ ib_query(
        status = query_sa( p_query, p_query_req, p_query_req->flags );\r
        if( status != IB_SUCCESS && status != IB_INVALID_GUID )\r
        {\r
-               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("query_sa failed: %s\n", ib_get_err_str(status) ) );\r
        }\r
 \r
@@ -123,7 +130,7 @@ ib_query(
                cl_free( p_query );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_QUERY, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_QUERY );\r
        return status;\r
 }\r
 \r
@@ -149,7 +156,7 @@ query_sa(
        }       rec;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_QUERY, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_QUERY );\r
 \r
        cl_memclr( &rec, sizeof(rec) );\r
 \r
@@ -161,7 +168,7 @@ query_sa(
        switch( p_query_req->query_type )\r
        {\r
        case IB_QUERY_USER_DEFINED:\r
-               CL_TRACE( AL_DBG_QUERY, g_al_dbg_lvl, ("USER_DEFINED\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_QUERY, ("USER_DEFINED\n") );\r
                p_sa_req = (ib_user_query_t* __ptr64)p_query_req->p_query_input;\r
                if( !p_sa_req->method )\r
                {\r
@@ -171,7 +178,7 @@ query_sa(
                break;\r
 \r
        case IB_QUERY_ALL_SVC_RECS:\r
-               CL_TRACE( AL_DBG_QUERY, g_al_dbg_lvl, ("IB_QUERY_ALL_SVC_RECS\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_QUERY, ("IB_QUERY_ALL_SVC_RECS\n") );\r
                sa_req.attr_id = IB_MAD_ATTR_SERVICE_RECORD;\r
                sa_req.attr_size = sizeof( ib_service_record_t );\r
                sa_req.comp_mask = 0;\r
@@ -179,7 +186,7 @@ query_sa(
                break;\r
 \r
        case IB_QUERY_SVC_REC_BY_NAME:\r
-               CL_TRACE( AL_DBG_QUERY, g_al_dbg_lvl, ("SVC_REC_BY_NAME\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_QUERY, ("SVC_REC_BY_NAME\n") );\r
                sa_req.attr_id = IB_MAD_ATTR_SERVICE_RECORD;\r
                sa_req.attr_size = sizeof( ib_service_record_t );\r
                sa_req.comp_mask = IB_SR_COMPMASK_SNAME;\r
@@ -189,7 +196,7 @@ query_sa(
                break;\r
 \r
        case IB_QUERY_SVC_REC_BY_ID:\r
-               CL_TRACE( AL_DBG_QUERY, g_al_dbg_lvl, ("SVC_REC_BY_ID\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_QUERY, ("SVC_REC_BY_ID\n") );\r
                sa_req.attr_id = IB_MAD_ATTR_SERVICE_RECORD;\r
                sa_req.attr_size = sizeof( ib_service_record_t );\r
                sa_req.comp_mask = IB_SR_COMPMASK_SID;\r
@@ -198,7 +205,7 @@ query_sa(
                break;\r
 \r
        case IB_QUERY_CLASS_PORT_INFO:\r
-               CL_TRACE( AL_DBG_QUERY, g_al_dbg_lvl, ("IB_QUERY_CLASS_PORT_INFO\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_QUERY, ("IB_QUERY_CLASS_PORT_INFO\n") );\r
                sa_req.method = IB_MAD_METHOD_GET;\r
                sa_req.attr_id = IB_MAD_ATTR_CLASS_PORT_INFO;\r
                sa_req.attr_size = sizeof( ib_class_port_info_t );\r
@@ -207,7 +214,7 @@ query_sa(
                break;\r
 \r
        case IB_QUERY_NODE_REC_BY_NODE_GUID:\r
-               CL_TRACE( AL_DBG_QUERY, g_al_dbg_lvl, ("NODE_REC_BY_NODE_GUID\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_QUERY, ("NODE_REC_BY_NODE_GUID\n") );\r
                /*\r
                 *      15.2.5.2:\r
                 * if >1 ports on of a CA/RTR the subnet return multiple\r
@@ -222,7 +229,7 @@ query_sa(
                break;\r
 \r
        case IB_QUERY_PORT_REC_BY_LID:\r
-               CL_TRACE( AL_DBG_QUERY, g_al_dbg_lvl, ("PORT_REC_BY_LID\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_QUERY, ("PORT_REC_BY_LID\n") );\r
                sa_req.attr_id = IB_MAD_ATTR_PORTINFO_RECORD;\r
                sa_req.attr_size = sizeof( ib_portinfo_record_t );\r
                sa_req.comp_mask = IB_PIR_COMPMASK_BASELID;\r
@@ -232,7 +239,7 @@ query_sa(
                break;\r
 \r
        case IB_QUERY_PATH_REC_BY_PORT_GUIDS:\r
-               CL_TRACE( AL_DBG_QUERY, g_al_dbg_lvl, ("PATH_REC_BY_PORT_GUIDS\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_QUERY, ("PATH_REC_BY_PORT_GUIDS\n") );\r
                sa_req.attr_id = IB_MAD_ATTR_PATH_RECORD;\r
                sa_req.attr_size = sizeof( ib_path_rec_t );\r
                sa_req.comp_mask = (IB_PR_COMPMASK_DGID |\r
@@ -246,7 +253,7 @@ query_sa(
                break;\r
 \r
        case IB_QUERY_PATH_REC_BY_GIDS:\r
-               CL_TRACE( AL_DBG_QUERY, g_al_dbg_lvl, ("PATH_REC_BY_GIDS\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_QUERY, ("PATH_REC_BY_GIDS\n") );\r
                sa_req.attr_id = IB_MAD_ATTR_PATH_RECORD;\r
                sa_req.attr_size = sizeof( ib_path_rec_t );\r
                sa_req.comp_mask = (IB_PR_COMPMASK_DGID |\r
@@ -260,7 +267,7 @@ query_sa(
                break;\r
 \r
        case IB_QUERY_PATH_REC_BY_LIDS:\r
-               CL_TRACE( AL_DBG_QUERY, g_al_dbg_lvl, ("PATH_REC_BY_LIDS\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_QUERY, ("PATH_REC_BY_LIDS\n") );\r
                /* SGID must be provided for GET_TABLE requests. */\r
                sa_req.method = IB_MAD_METHOD_GET;\r
                sa_req.attr_id = IB_MAD_ATTR_PATH_RECORD;\r
@@ -278,7 +285,7 @@ query_sa(
                break;\r
 \r
        default:\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("UNKNOWN\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("UNKNOWN\n") );\r
                CL_ASSERT( p_query_req->query_type == IB_QUERY_USER_DEFINED ||\r
                        p_query_req->query_type == IB_QUERY_ALL_SVC_RECS ||\r
                        p_query_req->query_type == IB_QUERY_SVC_REC_BY_NAME ||\r
@@ -296,7 +303,7 @@ query_sa(
        status = al_send_sa_req(\r
                &p_query->sa_req, p_query_req->port_guid, p_query_req->timeout_ms,\r
                p_query_req->retry_cnt, p_sa_req, flags );\r
-       CL_EXIT( AL_DBG_QUERY, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_QUERY );\r
        return status;\r
 }\r
 \r
@@ -314,7 +321,7 @@ query_req_cb(
        ib_query_rec_t          query_rec;\r
        ib_sa_mad_t                     *p_sa_mad;\r
 \r
-       CL_ENTER( AL_DBG_QUERY, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_QUERY );\r
        p_query = PARENT_STRUCT( p_sa_req, al_query_t, sa_req );\r
 \r
        /* Initialize the results of the query. */\r
@@ -326,7 +333,7 @@ query_req_cb(
        /* Form the result of the query, if we got one. */\r
        if( query_rec.status == IB_SUCCESS )\r
        {\r
-               CL_TRACE( AL_DBG_QUERY, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_QUERY,\r
                        ("query succeeded\n") );\r
 \r
                CL_ASSERT( p_mad_response );\r
@@ -347,7 +354,7 @@ query_req_cb(
        }\r
        else\r
        {\r
-               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("query failed: %s\n", ib_get_err_str(query_rec.status) ) );\r
                if( p_mad_response )\r
                        query_rec.p_result_mad = p_mad_response;\r
@@ -367,5 +374,5 @@ query_req_cb(
        al_remove_query( p_query );\r
        cl_free( p_query );\r
 \r
-       CL_EXIT( AL_DBG_QUERY, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_QUERY );\r
 }\r
index 2dd0912395c550fa6922286c68e487bc0e67031e..42911e386f83a6ac8d38dd553e31fd37c4343724 100644 (file)
 \r
 #include "al.h"\r
 #include "al_debug.h"\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_reg_svc.tmh"\r
+#endif\r
 #include "al_reg_svc.h"\r
 #include "ib_common.h"\r
 #include "al_mgr.h"\r
@@ -262,12 +268,12 @@ ib_reg_svc(
 \r
        if( AL_OBJ_INVALID_HANDLE( h_al, AL_OBJ_TYPE_H_AL ) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_AL_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_AL_HANDLE\n") );\r
                return IB_INVALID_AL_HANDLE;\r
        }\r
        if( !p_reg_svc_req )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -285,7 +291,7 @@ ib_reg_svc(
                __destroying_sa_reg, NULL, __free_sa_reg );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("init_al_obj returned %s.\n", ib_get_err_str( status )) );\r
                __free_sa_reg( &h_sa_reg->obj );\r
                return status;\r
@@ -296,7 +302,7 @@ ib_reg_svc(
        if( status != IB_SUCCESS )\r
        {\r
                h_sa_reg->obj.pfn_destroy( &h_sa_reg->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str( status )) );\r
                return status;\r
        }\r
@@ -315,7 +321,7 @@ ib_reg_svc(
        status = sa_reg_svc( h_sa_reg, p_reg_svc_req );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("sa_reg_svc failed: %s\n", ib_get_err_str(status) ) );\r
                h_sa_reg->state = SA_REG_ERROR;\r
 \r
@@ -340,7 +346,7 @@ ib_dereg_svc(
 \r
        if( !h_reg_svc )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
 \r
index 98a2684511851adfe93b368d64acd377e0deab2c..d6902d7b2c41901102b663f38878b4a232d85c22 100644 (file)
 #include "al_res_mgr.h"\r
 #include "al_debug.h"\r
 \r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_res_mgr.tmh"\r
+#endif\r
+\r
 \r
 #define AL_MR_POOL_SIZE                        (4096 / sizeof( ib_mr_t ))\r
 #define AL_AV_POOL_SIZE                        (4096 / sizeof( ib_av_t ))\r
@@ -86,7 +93,7 @@ create_res_mgr(
        if( status != IB_SUCCESS )\r
        {\r
                gp_res_mgr->obj.pfn_destroy( &gp_res_mgr->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
index 5ad202e0c560995fd93c3100016900665cc9e9cf..edc2b71c34c156bb861835f5b533ab5a585ec104 100644 (file)
 #include "al.h"\r
 #include "al_common.h"\r
 #include "al_debug.h"\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_sub.tmh"\r
+#endif\r
 #include "al_sub.h"\r
 \r
 \r
@@ -46,22 +52,22 @@ ib_subscribe(
 {\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_SUB, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SUB );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_al, AL_OBJ_TYPE_H_AL ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_AL_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_AL_HANDLE\n") );\r
                return IB_INVALID_AL_HANDLE;\r
        }\r
        if( !p_sub_req || !ph_sub )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
        status = IB_UNSUPPORTED;\r
 \r
-       CL_EXIT( AL_DBG_SUB, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SUB );\r
        return status;\r
 }\r
 \r
@@ -71,16 +77,16 @@ ib_unsubscribe(
        IN              const   ib_sub_handle_t                         h_sub,\r
        IN              const   ib_pfn_destroy_cb_t                     pfn_destroy_cb OPTIONAL )\r
 {\r
-       CL_ENTER( AL_DBG_SUB, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SUB );\r
 \r
        if( !h_sub )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
 \r
        UNUSED_PARAM( pfn_destroy_cb );\r
 \r
-       CL_EXIT( AL_DBG_SUB, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SUB );\r
        return IB_UNSUPPORTED;\r
 }\r
index bb8307318e93e26de4747b2fbf5eb770adcafe61..6799a922204baf53042a5048b23e5b60880e6fa5 100644 (file)
@@ -2,6 +2,15 @@ TARGETNAME=ibal
 TARGETPATH=..\..\..\bin\kernel\obj$(BUILD_ALT_DIR)\r
 TARGETTYPE=DRIVER_LIBRARY\r
 \r
+\r
+\r
+!if $(FREEBUILD)\r
+#ENABLE_EVENT_TRACING=1\r
+!else\r
+#ENABLE_EVENT_TRACING=1\r
+!endif\r
+\r
+\r
 DLLDEF=al_exports.def\r
 \r
 SOURCES= ibal.rc                       \\r
@@ -60,4 +69,15 @@ TARGETLIBS= \
 TARGETLIBS= $(TARGETLIBS) $(DDK_LIB_PATH)\ntstrsafe.lib\r
 !endif\r
 \r
+\r
+!IFDEF ENABLE_EVENT_TRACING\r
+\r
+C_DEFINES = $(C_DEFINES) -DEVENT_TRACING\r
+\r
+RUN_WPP = $(SOURCES) -km -ext: .c .h .C .H \\r
+       -scan:..\al_debug.h \\r
+       -func:AL_PRINT(LEVEL,FLAGS,(MSG,...)) \\r
+       -func:AL_PRINT_EXIT(LEVEL,FLAGS,(MSG,...))\r
+!ENDIF\r
+\r
 MSC_WARNING_LEVEL= /W4\r
index 8a078d8793e036b9c38d9dc3390b7121f48729ac..29a68bb9de16894b9a80a4c6ff276ae2c81db389 100644 (file)
 #include "al_verbs.h"\r
 #include "al_cq.h"\r
 #include "al_debug.h"\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_ci_ca.tmh"\r
+#endif\r
 #include "al_mad_pool.h"\r
 #include "al_mgr.h"\r
 #include "al_mr.h"\r
@@ -83,7 +89,7 @@ create_ci_ca(
        cl_status_t                             cl_status;\r
        al_ci_ca_t                              *p_ci_ca;\r
 \r
-       CL_ENTER( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CA );\r
 \r
        CL_ASSERT( p_ci );\r
 \r
@@ -91,7 +97,7 @@ create_ci_ca(
        p_ci_ca = (al_ci_ca_t*)cl_zalloc( sizeof( al_ci_ca_t ) );\r
        if( !p_ci_ca )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cl_zalloc failed\n") );\r
                return  IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -108,7 +114,7 @@ create_ci_ca(
        if( cl_status != CL_SUCCESS )\r
        {\r
                free_ci_ca( &p_ci_ca->obj );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cl_spinlock_init failed, status = 0x%x.\n",\r
                        ib_convert_cl_status( cl_status ) ) );\r
                return ib_convert_cl_status( cl_status );\r
@@ -121,7 +127,7 @@ create_ci_ca(
        if( cl_status != CL_SUCCESS )\r
        {\r
                free_ci_ca( &p_ci_ca->obj );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cl_qpool_init failed, status = 0x%x.\n", \r
                        ib_convert_cl_status( cl_status ) ) );\r
                return ib_convert_cl_status( cl_status );\r
@@ -132,7 +138,7 @@ create_ci_ca(
        if( status != IB_SUCCESS )\r
        {\r
                free_ci_ca( &p_ci_ca->obj );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("init_al_obj failed, status = 0x%x.\n", status) );\r
                return status;\r
        }\r
@@ -140,7 +146,7 @@ create_ci_ca(
        if( status != IB_SUCCESS )\r
        {\r
                p_ci_ca->obj.pfn_destroy( &p_ci_ca->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -153,7 +159,7 @@ create_ci_ca(
        if( status != IB_SUCCESS )\r
        {\r
                p_ci_ca->obj.pfn_destroy( &p_ci_ca->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("open_ca failed, status = 0x%x.\n", status) );\r
                return status;\r
        }\r
@@ -173,7 +179,7 @@ create_ci_ca(
        if( status != IB_SUCCESS )\r
        {\r
                p_ci_ca->obj.pfn_destroy( &p_ci_ca->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_open_ca failed, status = 0x%x.\n", status) );\r
                return status;\r
        }\r
@@ -183,7 +189,7 @@ create_ci_ca(
        if( status != IB_SUCCESS )\r
        {\r
                p_ci_ca->obj.pfn_destroy( &p_ci_ca->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("get_port_guids failed, status = 0x%x.\n", status) );\r
                return status;\r
        }\r
@@ -194,7 +200,7 @@ create_ci_ca(
        if( status != IB_SUCCESS )\r
        {\r
                p_ci_ca->obj.pfn_destroy( &p_ci_ca->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_alloc_pd failed, status = 0x%x.\n", status) );\r
                return status;\r
        }\r
@@ -205,7 +211,7 @@ create_ci_ca(
        if( status != IB_SUCCESS )\r
        {\r
                p_ci_ca->obj.pfn_destroy( &p_ci_ca->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_alloc_pd alias failed, status = 0x%x.\n", status) );\r
                return status;\r
        }\r
@@ -215,7 +221,7 @@ create_ci_ca(
        if( status != IB_SUCCESS )\r
        {\r
                p_ci_ca->obj.pfn_destroy( &p_ci_ca->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_reg_mad_pool failed, status = 0x%x.\n", status) );\r
                return status;\r
        }\r
@@ -229,7 +235,7 @@ create_ci_ca(
        {\r
                /* Destroy the CA */\r
                p_ci_ca->obj.pfn_destroy( &p_ci_ca->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("al_pnp_add_ca failed, status = 0x%x.\n", status) );\r
                return status;\r
        }\r
@@ -237,7 +243,7 @@ create_ci_ca(
        /* Release the reference taken in init_al_obj. */\r
        deref_al_obj( &p_ci_ca->obj );\r
 \r
-       CL_EXIT( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CA );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -291,7 +297,7 @@ cleanup_ci_ca(
        ib_api_status_t         status;\r
        al_ci_ca_t                      *p_ci_ca;\r
 \r
-       CL_ENTER( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CA );\r
 \r
        CL_ASSERT( p_obj );\r
        p_ci_ca = PARENT_STRUCT( p_obj, al_ci_ca_t, obj );\r
@@ -305,7 +311,7 @@ cleanup_ci_ca(
                CL_ASSERT( status == IB_SUCCESS );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CA );\r
 }\r
 \r
 \r
@@ -333,7 +339,7 @@ ci_ca_async_event_cb(
 {\r
        ib_async_event_rec_t    event_rec;\r
 \r
-       CL_ENTER( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CA );\r
 \r
        CL_ASSERT( p_event_record );\r
 \r
@@ -343,7 +349,7 @@ ci_ca_async_event_cb(
 \r
        ci_ca_async_event( &event_rec );\r
 \r
-       CL_EXIT( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CA );\r
 }\r
 \r
 \r
@@ -456,16 +462,16 @@ ci_call(
        void* __ptr64 *         p_handle_array;\r
        ib_api_status_t status;\r
 \r
-       CL_ENTER( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CA );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_ca, AL_OBJ_TYPE_H_CA ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_CA_HANDLE\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_CA_HANDLE\n") );\r
                return IB_INVALID_CA_HANDLE;\r
        }\r
        if( !p_ci_op )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
        p_handle_array = NULL;\r
@@ -498,6 +504,6 @@ ci_call(
        if ( num_handles )\r
                cl_free( p_handle_array );\r
 \r
-       CL_EXIT( AL_DBG_QUERY, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_QUERY );\r
        return status;\r
 }\r
index f28cbeedf920bb34252b7d1c978161c1d5fa28f4..ea77deded98aebc06594fc9a73ff23e2df95c3b2 100644 (file)
 #include "al_cm.h"\r
 #include "al_cm_shared.h"\r
 #include "al_debug.h"\r
+\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_cm.tmh"\r
+#endif\r
+\r
 #include "al_mgr.h"\r
 #include "al_qp.h"\r
 \r
@@ -104,10 +112,10 @@ __parse_cm_info()
        al_conn_t               *p_conn;\r
        uint32_t                i;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        cl_spinlock_acquire( &gp_cm->obj.lock );\r
-       CL_TRACE( AL_DBG_CM, g_al_dbg_lvl,\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                ("CM info:\n"\r
                "\tactive_listen_list..: %"PRIdSIZE_T"\n"\r
                "\tinactive_listen_list: %"PRIdSIZE_T"\n"\r
@@ -124,7 +132,7 @@ __parse_cm_info()
                cl_pool_count( &gp_cm->req_pool ),\r
                cl_qmap_count( &gp_cm->conn_map ) ) );\r
        /* walk lists for connection info */\r
-       CL_TRACE( AL_DBG_CM, g_al_dbg_lvl,("Active listens:\n") );\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("Active listens:\n") );\r
        i = 1;\r
 \r
        for( p_item = cl_qlist_head( &gp_cm->active_listen_list );\r
@@ -133,11 +141,11 @@ __parse_cm_info()
        {\r
                p_listen = PARENT_STRUCT( p_item, al_listen_t, list_item );\r
 \r
-               CL_TRACE( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                        ("\n%d)\n"\r
-                        "\tservice_id...:0x%"PRIx64"\n"\r
+                        "\tservice_id...:0x%I64x\n"\r
                         "\tlid..........:0x%x\n"\r
-                        "\tport_guid....:0x%"PRIx64"\n"\r
+                        "\tport_guid....:0x%I64x\n"\r
                         "\tqp_type......:%d\n",\r
                         i++,\r
                         p_listen->info.svc_id, p_listen->info.lid,\r
@@ -145,7 +153,7 @@ __parse_cm_info()
        }\r
 \r
 \r
-       CL_TRACE( AL_DBG_CM, g_al_dbg_lvl,("Inactive listens:\n") );\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("Inactive listens:\n") );\r
        i = 1;\r
 \r
        for( p_item = cl_qlist_head( &gp_cm->inactive_listen_list );\r
@@ -154,11 +162,11 @@ __parse_cm_info()
        {\r
                p_listen = PARENT_STRUCT( p_item, al_listen_t, list_item );\r
 \r
-               CL_TRACE( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                        ("\n%d)\n"\r
-                        "\tservice_id...:0x%"PRIx64"\n"\r
+                        "\tservice_id...:0x%I64x\n"\r
                         "\tlid..........:0x%x\n"\r
-                        "\tport_guid....:0x%"PRIx64"\n"\r
+                        "\tport_guid....:0x%I64x\n"\r
                         "\tqp_type......:%d\n",\r
                         i++,\r
                         p_listen->info.svc_id, p_listen->info.lid,\r
@@ -166,7 +174,7 @@ __parse_cm_info()
        }\r
 \r
 \r
-       CL_TRACE( AL_DBG_CM, g_al_dbg_lvl,("In Timewait:\n") );\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("In Timewait:\n") );\r
        i = 1;\r
 \r
        for( p_item = cl_qlist_head( &gp_cm->time_wait_list );\r
@@ -175,7 +183,7 @@ __parse_cm_info()
        {\r
                p_conn = PARENT_STRUCT( p_item, al_conn_t, map_item );\r
 \r
-               CL_TRACE( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                        ("\n%d)\n"\r
                         "\tstate........:%d\n"\r
                         "\tref_cnt......:%d\n"\r
@@ -192,7 +200,7 @@ __parse_cm_info()
 \r
        cl_spinlock_release( &gp_cm->obj.lock );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 #endif\r
 }\r
 \r
@@ -204,13 +212,13 @@ __parse_cm_info()
 __cm_pnp_dereg_cb(\r
        IN                              void                                            *context )\r
 {\r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        UNUSED_PARAM( context );\r
 \r
        deref_al_obj( &gp_cm->obj );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -223,7 +231,7 @@ __destroying_cm(
 {\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        CL_ASSERT( &gp_cm->obj == p_obj );\r
        UNUSED_PARAM( p_obj );\r
@@ -234,7 +242,7 @@ __destroying_cm(
                status = ib_dereg_pnp( gp_cm->h_pnp, __cm_pnp_dereg_cb );\r
                if( status != IB_SUCCESS )\r
                {\r
-                       CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("ib_dereg_pnp failed with status %s.\n",\r
                                ib_get_err_str(status)) );\r
                        deref_al_obj( &gp_cm->obj );\r
@@ -243,7 +251,7 @@ __destroying_cm(
 \r
        /* Cancel all timewait timers. */\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -254,7 +262,7 @@ void
 __free_cm(\r
        IN                              al_obj_t*                                       p_obj )\r
 {\r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        CL_ASSERT( &gp_cm->obj == p_obj );\r
        /* All listen request should have been cleaned up by this point. */\r
@@ -282,7 +290,7 @@ __free_cm(
        cl_free( gp_cm );\r
        gp_cm = NULL;\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -295,7 +303,7 @@ __destroying_port_cm(
 {\r
        cm_port_agent_t         *p_port_cm;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_port_cm = PARENT_STRUCT( p_obj, cm_port_agent_t, obj );\r
 \r
@@ -311,7 +319,7 @@ __destroying_port_cm(
                p_port_cm->h_pd = NULL;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -326,7 +334,7 @@ __free_port_cm(
 {\r
        cm_port_agent_t         *p_port_cm;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_port_cm = PARENT_STRUCT( p_obj, cm_port_agent_t, obj );\r
 \r
@@ -339,7 +347,7 @@ __free_port_cm(
        destroy_al_obj( &p_port_cm->obj );\r
        cl_free( p_port_cm );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -353,7 +361,7 @@ __get_av(
        ib_av_attr_t    av_attr;\r
        cl_list_item_t  *p_list_item;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        cl_spinlock_acquire( &p_port_cm->lock );\r
 \r
@@ -426,7 +434,7 @@ __get_av(
                }\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return status;\r
 }\r
 \r
@@ -438,7 +446,7 @@ __put_av(
        ib_av_t                 *h_av;\r
        uint32_t                ref_cnt;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        h_av = p_mad->h_av;\r
 \r
@@ -460,7 +468,7 @@ __put_av(
                cl_spinlock_release( &p_port_cm->lock );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -475,7 +483,7 @@ __get_conn(
        al_conn_t               *p_conn;\r
        uint8_t                 counter;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
        CL_ASSERT( h_al && h_al->obj.type == AL_OBJ_TYPE_H_AL );\r
 \r
        cl_spinlock_acquire( &gp_cm->obj.lock );\r
@@ -483,7 +491,7 @@ __get_conn(
        if( !p_item )\r
        {\r
                cl_spinlock_release( &gp_cm->obj.lock );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cl_qpool_get failed for al_conn_t.\n") );\r
                return NULL;\r
        }\r
@@ -495,7 +503,7 @@ __get_conn(
        {\r
                cl_qpool_put( &gp_cm->conn_pool, (cl_pool_item_t*)&p_conn->map_item );\r
                cl_spinlock_release( &gp_cm->obj.lock );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cl_pool_get failed for conn_req_t.\n") );\r
                return NULL;\r
        }\r
@@ -574,13 +582,13 @@ __get_conn(
                p_conn->p_req_info = NULL;\r
                cl_qpool_put( &gp_cm->conn_pool, (cl_pool_item_t*)&p_conn->map_item );\r
                cl_spinlock_release( &gp_cm->obj.lock );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("al_insert_conn failed for conn_req_t.\n") );\r
                return NULL;\r
        }\r
 \r
        ref_al_obj( &gp_cm->obj );\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return p_conn;\r
 }\r
 \r
@@ -588,11 +596,11 @@ void
 __ref_conn(\r
        IN                              al_conn_t* const                        p_conn )\r
 {\r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        cl_atomic_inc( &p_conn->ref_cnt );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -619,7 +627,7 @@ __deref_conn(
 {\r
        ib_qp_handle_t  h_qp;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /*\r
         * Destruction of the connection object and unbinding it from the QP\r
@@ -697,7 +705,7 @@ __deref_conn(
                if( h_qp )\r
                {\r
                        /* We shouldn't have a QP at this point. */\r
-                       CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("QP (%p) still referenced by connection object\n", h_qp) );\r
                        cm_reset_qp( h_qp, 0 );\r
                        deref_al_obj( &h_qp->obj );\r
@@ -709,7 +717,7 @@ __deref_conn(
                cl_spinlock_release( &gp_cm->obj.lock );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -761,7 +769,7 @@ __cm_send(
        ib_api_status_t         status;\r
        ib_grh_t                        grh;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        CL_ASSERT( p_conn );\r
 \r
@@ -769,7 +777,7 @@ __cm_send(
        status = ib_get_mad( p_port_cm->pool_key, MAD_BLOCK_SIZE, &p_mad );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_get_mad failed with status %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -843,7 +851,7 @@ __cm_send(
        {\r
                __deref_conn( p_conn );\r
                ib_put_mad( p_mad );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__get_av failed with status %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -856,12 +864,12 @@ __cm_send(
                p_conn->p_send_mad = NULL;\r
                __deref_conn( p_conn );\r
                ib_put_mad( p_mad );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_send_mad failed with status %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -874,7 +882,7 @@ __cm_send_mad(
 {\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        CL_ASSERT( p_port_cm );\r
        CL_ASSERT( p_mad );\r
@@ -893,7 +901,7 @@ __cm_send_mad(
                if( status != IB_SUCCESS )\r
                {\r
                        ib_put_mad( p_mad );\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("__get_av failed with status %s.\n", ib_get_err_str(status)) );\r
                        return status;\r
                }\r
@@ -903,12 +911,12 @@ __cm_send_mad(
        if( status != IB_SUCCESS )\r
        {\r
                ib_put_mad( p_mad );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_send_mad failed with status %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -922,7 +930,7 @@ __repeated_mad(
 {\r
        ib_api_status_t status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        CL_ASSERT( p_port_cm );\r
        CL_ASSERT( p_conn );\r
@@ -959,7 +967,7 @@ __repeated_mad(
        }\r
        cm_res_release( p_conn );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -972,7 +980,7 @@ __cm_mad_recv_cb(
        ib_mad_t                *p_hdr;\r
        cm_async_mad_t  *p_async_mad;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        UNUSED_PARAM( h_mad_svc );\r
 \r
@@ -984,7 +992,7 @@ __cm_mad_recv_cb(
        if( !p_async_mad )\r
        {\r
                ib_put_mad( p_mad );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("failed to cl_zalloc cm_async_mad_t (%d bytes)\n",\r
                        sizeof(cm_async_mad_t)) );\r
                return;\r
@@ -1042,7 +1050,7 @@ __cm_mad_recv_cb(
        default:\r
                cl_free( p_async_mad );\r
                ib_put_mad( p_mad );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Invalid CM MAD attribute ID.\n") );\r
                return;\r
        }\r
@@ -1050,7 +1058,7 @@ __cm_mad_recv_cb(
        /* Queue the MAD for asynchronous processing. */\r
        cl_async_proc_queue( gp_async_proc_mgr, &p_async_mad->item );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -1062,7 +1070,7 @@ __cm_mad_send_cb(
 {\r
        cm_async_mad_t  *p_async_mad;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        UNUSED_PARAM( h_mad_svc );\r
        CL_ASSERT( p_mad->p_next == NULL );\r
@@ -1071,7 +1079,7 @@ __cm_mad_send_cb(
        if( !p_async_mad )\r
        {\r
                ib_put_mad( p_mad );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("failed to cl_zalloc cm_async_mad_t (%d bytes)\n",\r
                        sizeof(cm_async_mad_t)) );\r
                return;\r
@@ -1084,7 +1092,7 @@ __cm_mad_send_cb(
        /* Queue the MAD for asynchronous processing. */\r
        cl_async_proc_queue( gp_async_proc_mgr, &p_async_mad->item );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -1097,7 +1105,7 @@ __process_cm_send_comp(
        al_conn_t                       *p_conn;\r
        ib_mad_element_t        *p_mad;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_async_mad = PARENT_STRUCT( p_item, cm_async_mad_t, item );\r
        p_mad = p_async_mad->p_mad;\r
@@ -1114,7 +1122,7 @@ __process_cm_send_comp(
        {\r
                __put_av( p_port_cm, p_mad );\r
                ib_put_mad( p_mad );\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return;\r
        }\r
 \r
@@ -1192,7 +1200,7 @@ __process_cm_send_comp(
        __put_av( p_port_cm, p_mad );\r
        ib_put_mad( p_mad );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -1222,7 +1230,7 @@ void
 cm_conn_migrated(\r
        IN                              al_conn_t* const                        p_conn )\r
 {\r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Update the index to the primary path. */\r
        cm_res_acquire( p_conn );\r
@@ -1232,7 +1240,7 @@ cm_conn_migrated(
        /* Only the lowest bit is valid (0 or 1). */\r
        p_conn->idx_primary&=0x1;\r
        cm_res_release( p_conn );\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 /*\r
@@ -1301,12 +1309,12 @@ __init_data_svc(
        ib_qp_create_t          qp_create;\r
        ib_mad_svc_t            mad_svc;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        cl_status = cl_spinlock_init( &p_port_cm->lock );\r
        if( cl_status != CL_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cl_spinlock_init failed\n") );\r
                return ib_convert_cl_status( cl_status );\r
        }\r
@@ -1319,7 +1327,7 @@ __init_data_svc(
                &p_port_cm->h_pd );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_alloc_pd failed with status %s\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -1343,7 +1351,7 @@ __init_data_svc(
                &p_port_cm->h_qp );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_get_spl_qp failed with status %s\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -1363,12 +1371,12 @@ __init_data_svc(
                ib_reg_mad_svc( p_port_cm->h_qp, &mad_svc, &p_port_cm->h_mad_svc );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_reg_mad_svc failed with status %s\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -1384,14 +1392,14 @@ __create_port_cm(
        ib_api_status_t         status;\r
        ib_port_attr_mod_t      port_attr_mod;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* calculate size of port_cm struct */\r
        p_port_cm = (cm_port_agent_t*)cl_zalloc( sizeof(cm_port_agent_t) +\r
                p_pnp_rec->p_ca_attr->size );\r
        if( !p_port_cm )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Failed to cl_zalloc port CM agent.\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -1405,7 +1413,7 @@ __create_port_cm(
        if( status != IB_SUCCESS )\r
        {\r
                __free_port_cm( &p_port_cm->obj );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("init_al_obj failed with status %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -1415,7 +1423,7 @@ __create_port_cm(
        if( status != IB_SUCCESS )\r
        {\r
                p_port_cm->obj.pfn_destroy( &p_port_cm->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -1434,7 +1442,7 @@ __create_port_cm(
        if( !p_port_cm->h_ca )\r
        {\r
                p_port_cm->obj.pfn_destroy( &p_port_cm->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("acquire_ca failed.\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("acquire_ca failed.\n") );\r
                return IB_INVALID_GUID;\r
        }\r
 \r
@@ -1442,7 +1450,7 @@ __create_port_cm(
        if( status != IB_SUCCESS )\r
        {\r
                p_port_cm->obj.pfn_destroy( &p_port_cm->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__init_data_svc failed with status %s.\n",\r
                        ib_get_err_str(status)) );\r
                return status;\r
@@ -1492,7 +1500,7 @@ __cm_pnp_cb(
 {\r
        ib_api_status_t         status = IB_SUCCESS;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        switch( p_pnp_rec->pnp_event )\r
        {\r
@@ -1535,7 +1543,7 @@ __cm_pnp_cb(
                break;  /* Ignore other PNP events. */\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return status;\r
 }\r
 \r
@@ -1550,7 +1558,7 @@ __process_cm_timer(
        al_conn_t                               *p_conn;\r
        cm_async_timer_t                *p_async_timer;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_async_timer = PARENT_STRUCT( p_item, cm_async_timer_t, item );\r
        p_conn = p_async_timer->p_conn;\r
@@ -1625,7 +1633,7 @@ __process_cm_timer(
        __deref_conn( p_conn );\r
        cl_free( p_async_timer );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -1638,12 +1646,12 @@ __conn_timer_cb(
 {\r
        cm_async_timer_t                *p_async_timer;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_async_timer = (cm_async_timer_t*)cl_zalloc( sizeof(cm_async_timer_t) );\r
        if( !p_async_timer )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("failed to cl_zalloc cm_async_timer_t (%d bytes). System unstable!\n",\r
                        sizeof(cm_async_timer_t)) );\r
                /* Bah - just release the connection now. */\r
@@ -1659,7 +1667,7 @@ __conn_timer_cb(
        p_async_timer->item.pfn_callback = __process_cm_timer;\r
        cl_async_proc_queue( gp_async_proc_mgr, &p_async_timer->item );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -1682,7 +1690,7 @@ __conn_ctor(
        cl_status = cm_res_init( p_conn );\r
        if( cl_status != CL_SUCCESS )\r
        {\r
-               /*CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               /*AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cm_res_init failed with status %s.\n",\r
                        CL_STATUS_MSG( cl_status )) );*/\r
                return CL_ERROR;\r
@@ -1691,7 +1699,7 @@ __conn_ctor(
        cl_status = cl_timer_init( &p_conn->timer, __conn_timer_cb, p_conn );\r
        if( cl_status != CL_SUCCESS )\r
        {\r
-               /*CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               /*AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cl_timer_init failed with status %s.\n",\r
                        CL_STATUS_MSG( cl_status )) );*/\r
                cm_res_destroy( p_conn );\r
@@ -1744,7 +1752,7 @@ create_cm(
        cl_status_t                     cl_status;\r
        ib_pnp_req_t            pnp_req;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        CL_ASSERT( gp_cm == NULL );\r
 \r
@@ -1752,7 +1760,7 @@ create_cm(
        gp_cm = (al_cm_agent_t*)cl_zalloc( sizeof(al_cm_agent_t) );\r
        if( !gp_cm )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Failed allocation of global CM agent.\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -1771,7 +1779,7 @@ create_cm(
        if( status != IB_SUCCESS )\r
        {\r
                __free_cm( &gp_cm->obj );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("init_al_obj failed with status %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -1780,7 +1788,7 @@ create_cm(
        if( status != IB_SUCCESS )\r
        {\r
                gp_cm->obj.pfn_destroy( &gp_cm->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -1791,7 +1799,7 @@ create_cm(
        if( cl_status != CL_SUCCESS )\r
        {\r
                gp_cm->obj.pfn_destroy( &gp_cm->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cl_qpool_init failed with status %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                return ib_convert_cl_status( cl_status );\r
@@ -1802,7 +1810,7 @@ create_cm(
        if( cl_status != CL_SUCCESS )\r
        {\r
                gp_cm->obj.pfn_destroy( &gp_cm->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cl_pool_init failed with status %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                return ib_convert_cl_status( cl_status );\r
@@ -1816,7 +1824,7 @@ create_cm(
        if( status != IB_SUCCESS )\r
        {\r
                gp_cm->obj.pfn_destroy( &gp_cm->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_reg_pnp failed with status %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -1827,7 +1835,7 @@ create_cm(
         * deref the object.\r
         */\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -1847,7 +1855,7 @@ __get_port_attr(
        ib_port_attr_t          *p_port_attr;\r
        uint16_t                        gid_idx;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        cl_spinlock_acquire( &gp_cm->obj.lock );\r
        for( p_item = cl_qlist_head( &gp_cm->obj.obj_list );\r
@@ -1886,7 +1894,7 @@ __get_port_attr(
                        if( pp_port_cm )\r
                                *pp_port_cm = p_port_cm;\r
 \r
-                       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+                       AL_EXIT( AL_DBG_CM );\r
                        return IB_SUCCESS;\r
                }\r
 \r
@@ -1895,7 +1903,7 @@ __get_port_attr(
        }\r
        cl_spinlock_release( &gp_cm->obj.lock );\r
 \r
-       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                ("No match found.\n") );\r
        return status;\r
 }\r
index 4303e7f9ed0b9d02c7098e839fc064b9c0f5c110..7a562c48915b03a5b3ef275da0e596001f79b660 100644 (file)
 #include "al_cm_conn.h"\r
 #include "al_cm_sidr.h"\r
 #include "al_debug.h"\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_cm_cep.tmh"\r
+#endif\r
 #include "ib_common.h"\r
 #include "al_mgr.h"\r
 #include "al_ca.h"\r
@@ -572,7 +578,7 @@ __reject_timeout(
        status = ib_get_mad( p_port_cep->pool_key, MAD_BLOCK_SIZE, &p_rej_mad );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_get_mad returned %s\n", ib_get_err_str( status )) );\r
                return;\r
        }\r
@@ -897,7 +903,7 @@ __process_rej(
                 */\r
                if( p_rej->reason == IB_REJ_INVALID_SID )\r
                {\r
-                       AL_TRACE( AL_DBG_CM,\r
+                       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                                ("Request rejected (invalid SID) - retrying.\n") );\r
                        goto err1;\r
                }\r
@@ -950,7 +956,7 @@ __process_rej(
 \r
        default:\r
                /* Ignore the REJ. */\r
-               AL_TRACE( AL_DBG_CM, ("REJ received in invalid state.\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("REJ received in invalid state.\n") );\r
 err1:\r
                ib_put_mad( p_mad );\r
                AL_EXIT( AL_DBG_CM );\r
@@ -1028,7 +1034,7 @@ __req_handler(
 \r
        p_req = (mad_cm_req_t*)p_mad->p_mad_buf;\r
 \r
-       AL_TRACE( AL_DBG_CM,\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                ("REQ: comm_id (x%x) qpn (x%x) received\n",\r
                p_req->local_comm_id, conn_req_get_lcl_qpn( p_req )) );\r
 \r
@@ -1037,7 +1043,7 @@ __req_handler(
        if( conn_req_get_qp_type( p_req ) > IB_QPT_UNRELIABLE_CONN )\r
        {\r
                /* Reserved value.  Reject. */\r
-               AL_TRACE( AL_DBG_ERROR, ("Invalid transport type received.\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Invalid transport type received.\n") );\r
                reason = IB_REJ_INVALID_XPORT;\r
                goto reject;\r
        }\r
@@ -1056,7 +1062,7 @@ __req_handler(
                case CEP_STATE_TIMEWAIT:\r
                case CEP_STATE_DESTROY:\r
                        /* Send a reject. */\r
-                       AL_TRACE( AL_DBG_CM,\r
+                       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                                ("REQ received for connection in TIME_WAIT state.\n") );\r
                        __reject_req( p_port_cep, p_mad, IB_REJ_STALE_CONN );\r
                        break;\r
@@ -1068,7 +1074,7 @@ __req_handler(
                         * dropped, then the remote CM will eventually process it, and\r
                         * we'd just be adding traffic.\r
                         */\r
-                       AL_TRACE( AL_DBG_CM, ("Duplicate REQ received.\n") );\r
+                       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("Duplicate REQ received.\n") );\r
                        ib_put_mad( p_mad );\r
                }\r
                KeReleaseInStackQueuedSpinLockFromDpcLevel( &hdl );\r
@@ -1085,7 +1091,7 @@ __req_handler(
        {\r
                /* Reject the request for insufficient resources. */\r
                reason = IB_REJ_INSUF_RESOURCES;\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("al_create_cep failed\nREJ sent for insufficient resources.\n") );\r
                goto reject;\r
        }\r
@@ -1131,7 +1137,7 @@ __req_handler(
        }\r
        else\r
        {\r
-               AL_TRACE( AL_DBG_CM, ("No listens active!\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("No listens active!\n") );\r
 \r
                /* Match against peer-to-peer requests using SID and compare data. */\r
                //p_cep = __lookup_peer();\r
@@ -1146,7 +1152,7 @@ __req_handler(
                //              p_conn = PARENT_STRUCT( p_list_item, kcep_t, map_item );\r
                //              __peer_req( p_port_cep, p_conn, p_async_mad->p_mad );\r
                //              cl_free( p_async_mad );\r
-               //              CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               //              AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                //                      ("REQ matched a peer-to-peer request.\n") );\r
                //              return;\r
                //      }\r
@@ -1157,7 +1163,7 @@ __req_handler(
                {\r
                        /* No match found.  Reject. */\r
                        reason = IB_REJ_INVALID_SID;\r
-                       AL_TRACE( AL_DBG_CM, ("REQ received but no match found.\n") );\r
+                       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("REQ received but no match found.\n") );\r
                        goto cleanup;\r
                }\r
        }\r
@@ -1258,7 +1264,7 @@ __mra_handler(
        p_cep = __lookup_cep( NULL, p_mra->remote_comm_id );\r
        if( !p_cep )\r
        {\r
-               AL_TRACE( AL_DBG_CM,\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                        ("MRA received that could not be matched.\n") );\r
                goto err;\r
        }\r
@@ -1267,7 +1273,7 @@ __mra_handler(
        {\r
                if( p_cep->remote_comm_id != p_mra->local_comm_id )\r
                {\r
-                       AL_TRACE( AL_DBG_CM,\r
+                       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                                ("MRA received that could not be matched.\n") );\r
                        goto err;\r
                }\r
@@ -1284,7 +1290,7 @@ __mra_handler(
                (p_cep->state & CEP_MSG_MASK)) )\r
        {\r
                /* Invalid state. */\r
-               AL_TRACE( AL_DBG_CM, ("MRA received in invalid state.\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("MRA received in invalid state.\n") );\r
                goto err;\r
        }\r
 \r
@@ -1298,7 +1304,7 @@ __mra_handler(
        if( p_cep->state & CEP_STATE_MRA )\r
        {\r
                /* Invalid state. */\r
-               AL_TRACE( AL_DBG_CM, ("Already received MRA.\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("Already received MRA.\n") );\r
                goto err;\r
        }\r
 \r
@@ -1398,7 +1404,7 @@ __rep_handler(
 \r
        p_rep = (mad_cm_rep_t*)p_mad->p_mad_buf;\r
 \r
-       AL_TRACE( AL_DBG_CM,\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                ("REP: comm_id (x%x) received\n", p_rep->local_comm_id ) );\r
 \r
        KeAcquireInStackQueuedSpinLockAtDpcLevel( &gp_cep_mgr->lock, &hdl );\r
@@ -1407,7 +1413,7 @@ __rep_handler(
        {\r
                KeReleaseInStackQueuedSpinLockFromDpcLevel( &hdl );\r
                ib_put_mad( p_mad );\r
-               AL_TRACE_EXIT( AL_DBG_CM,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                        ("REP received that could not be matched.\n") );\r
                return;\r
        }\r
@@ -1463,7 +1469,7 @@ __rep_handler(
 \r
        default:\r
                ib_put_mad( p_mad );\r
-               AL_TRACE( AL_DBG_CM, ("REP received in invalid state.\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("REP received in invalid state.\n") );\r
                break;\r
        }\r
 \r
@@ -1488,7 +1494,7 @@ __rtu_handler(
 \r
        p_rtu = (mad_cm_rtu_t*)p_mad->p_mad_buf;\r
 \r
-       AL_TRACE( AL_DBG_CM,\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                ("RTU: comm_id (x%x) received\n", p_rtu->local_comm_id) );\r
 \r
        /* Find the connection by local connection ID. */\r
@@ -1496,7 +1502,7 @@ __rtu_handler(
        p_cep = __lookup_cep( NULL, p_rtu->remote_comm_id );\r
        if( !p_cep || p_cep->remote_comm_id != p_rtu->local_comm_id )\r
        {\r
-               AL_TRACE( AL_DBG_CM, ("RTU received that could not be matched.\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("RTU received that could not be matched.\n") );\r
                goto done;\r
        }\r
 \r
@@ -1527,7 +1533,7 @@ __rtu_handler(
                return;\r
 \r
        default:\r
-               AL_TRACE( AL_DBG_CM, ("RTU received in invalid state.\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("RTU received in invalid state.\n") );\r
                break;\r
        }\r
 \r
@@ -1554,7 +1560,7 @@ __dreq_handler(
 \r
        p_dreq = (mad_cm_dreq_t*)p_mad->p_mad_buf;\r
 \r
-       AL_TRACE( AL_DBG_CM,\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                ("DREQ: comm_id (x%x) qpn (x%x) received\n",\r
                p_dreq->local_comm_id, conn_dreq_get_remote_qpn( p_dreq )) );\r
 \r
@@ -1565,7 +1571,7 @@ __dreq_handler(
                p_cep->remote_comm_id != p_dreq->local_comm_id ||\r
                p_cep->local_qpn != conn_dreq_get_remote_qpn( p_dreq ) )\r
        {\r
-               AL_TRACE( AL_DBG_CM, ("DREQ received that could not be matched.\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("DREQ received that could not be matched.\n") );\r
                KeReleaseInStackQueuedSpinLockFromDpcLevel( &hdl );\r
                ib_put_mad( p_mad );\r
                AL_EXIT( AL_DBG_CM );\r
@@ -1611,7 +1617,7 @@ __dreq_handler(
                break;\r
 \r
        default:\r
-               AL_TRACE( AL_DBG_CM, ("DREQ received in invalid state.\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("DREQ received in invalid state.\n") );\r
        case CEP_STATE_DREQ_RCVD:\r
                ib_put_mad( p_mad );\r
                break;\r
@@ -1642,7 +1648,7 @@ __drep_handler(
        p_cep = __lookup_cep( NULL, p_drep->remote_comm_id );\r
        if( !p_cep || p_cep->remote_comm_id != p_drep->local_comm_id )\r
        {\r
-               AL_TRACE( AL_DBG_CM, ("DREP received that could not be matched.\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("DREP received that could not be matched.\n") );\r
                KeReleaseInStackQueuedSpinLockFromDpcLevel( &hdl );\r
                ib_put_mad( p_mad );\r
                AL_EXIT( AL_DBG_CM );\r
@@ -1652,7 +1658,7 @@ __drep_handler(
        if( p_cep->state != CEP_STATE_DREQ_SENT &&\r
                p_cep->state != CEP_STATE_DREQ_DESTROY )\r
        {\r
-               AL_TRACE( AL_DBG_CM, ("DREP received in invalid state.\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("DREP received in invalid state.\n") );\r
 \r
                KeReleaseInStackQueuedSpinLockFromDpcLevel( &hdl );\r
                ib_put_mad( p_mad );\r
@@ -1784,7 +1790,7 @@ __lap_handler(
        {\r
                KeReleaseInStackQueuedSpinLockFromDpcLevel( &hdl );\r
                ib_put_mad( p_mad );\r
-               AL_TRACE_EXIT( AL_DBG_CM, ("LAP received that could not be matched.\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("LAP received that could not be matched.\n") );\r
                return;\r
        }\r
 \r
@@ -1840,7 +1846,7 @@ __lap_handler(
                break;\r
 \r
        default:\r
-               AL_TRACE( AL_DBG_CM, ("LAP received in invalid state.\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("LAP received in invalid state.\n") );\r
                ib_put_mad( p_mad );\r
                break;\r
        }\r
@@ -1869,7 +1875,7 @@ __apr_handler(
        p_cep = __lookup_cep( NULL, p_apr->remote_comm_id );\r
        if( !p_cep || p_cep->remote_comm_id != p_apr->local_comm_id )\r
        {\r
-               AL_TRACE( AL_DBG_CM, ("APR received that could not be matched.\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("APR received that could not be matched.\n") );\r
                goto done;\r
        }\r
 \r
@@ -1906,7 +1912,7 @@ __apr_handler(
                return;\r
 \r
        default:\r
-               AL_TRACE( AL_DBG_CM, ("APR received in invalid state.\n") );\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("APR received in invalid state.\n") );\r
                break;\r
        }\r
 \r
@@ -1990,7 +1996,7 @@ __cep_mad_recv_cb(
 //\r
        default:\r
                ib_put_mad( p_mad );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Invalid CM MAD attribute ID.\n") );\r
                return;\r
        }\r
@@ -2064,7 +2070,7 @@ __cep_send_mad(
        if( status != IB_SUCCESS )\r
        {\r
                ib_put_mad( p_mad );\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_send_mad failed with status %s.\n", ib_get_err_str(status)) );\r
        }\r
 \r
@@ -2122,7 +2128,7 @@ __cep_send_retry(
                cl_atomic_dec( &p_cep->ref_cnt );\r
                p_cep->p_send_mad = NULL;\r
                ib_put_mad( p_mad );\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_send_mad failed with status %s.\n", ib_get_err_str(status)) );\r
        }\r
 \r
@@ -2287,7 +2293,7 @@ __init_data_svc(
                &p_port_cep->h_pd );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_alloc_pd failed with status %s\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -2311,7 +2317,7 @@ __init_data_svc(
                &p_port_cep->h_qp );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_get_spl_qp failed with status %s\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -2331,7 +2337,7 @@ __init_data_svc(
                ib_reg_mad_svc( p_port_cep->h_qp, &mad_svc, &p_port_cep->h_mad_svc );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_reg_mad_svc failed with status %s\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -2429,7 +2435,7 @@ __create_port_cep(
        p_port_cep = (cep_agent_t*)cl_zalloc( sizeof(cep_agent_t) );\r
        if( !p_port_cep )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Failed to cl_zalloc port CM agent.\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -2441,7 +2447,7 @@ __create_port_cep(
        if( status != IB_SUCCESS )\r
        {\r
                __free_port_cep( &p_port_cep->obj );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("init_al_obj failed with status %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -2451,7 +2457,7 @@ __create_port_cep(
        if( status != IB_SUCCESS )\r
        {\r
                p_port_cep->obj.pfn_destroy( &p_port_cep->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -2470,14 +2476,14 @@ __create_port_cep(
        if( !p_port_cep->h_ca )\r
        {\r
                p_port_cep->obj.pfn_destroy( &p_port_cep->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("acquire_ca failed.\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("acquire_ca failed.\n") );\r
                return IB_INVALID_GUID; }\r
 \r
        status = __init_data_svc( p_port_cep, p_pnp_rec->p_port_attr );\r
        if( status != IB_SUCCESS )\r
        {\r
                p_port_cep->obj.pfn_destroy( &p_port_cep->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__init_data_svc failed with status %s.\n",\r
                        ib_get_err_str(status)) );\r
                return status;\r
@@ -2676,7 +2682,7 @@ pdata_cmp:
                        else\r
                                p_item = cl_rbmap_right( p_item );\r
 \r
-                       AL_TRACE( AL_DBG_CM,\r
+                       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                                ("Svc ID match but compare buffer mismatch.\n") );\r
                        continue;\r
                }\r
@@ -2719,7 +2725,7 @@ __insert_by_id(
                        p_item = cl_rbmap_right( p_item ), left = FALSE;\r
                else\r
                {\r
-                       AL_TRACE( AL_DBG_CM | AL_DBG_WARN,\r
+                       AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                                ("WARNING: Duplicate remote CID and CA GUID.\n") );\r
                        goto done;\r
                }\r
@@ -2762,8 +2768,8 @@ __insert_by_qpn(
                        p_item = cl_rbmap_right( p_item ), left = FALSE;\r
                else\r
                {\r
-                       AL_TRACE( AL_DBG_CM | AL_DBG_WARN,\r
-                               ("WARNING: Duplicate remote QPN and CA GUID.\n") );\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
+                       ("WARNING: Duplicate remote QPN and CA GUID.\n") );\r
                        goto done;\r
                }\r
        }\r
@@ -3142,7 +3148,7 @@ __destroying_cep_mgr(
                        gp_cep_mgr->h_pnp, (ib_pfn_destroy_cb_t)deref_al_obj );\r
                if( status != IB_SUCCESS )\r
                {\r
-                       CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("ib_dereg_pnp failed with status %s.\n",\r
                                ib_get_err_str(status)) );\r
                        deref_al_obj( &gp_cep_mgr->obj );\r
@@ -3238,7 +3244,7 @@ create_cep_mgr(
        gp_cep_mgr = (al_cep_mgr_t*)cl_zalloc( sizeof(al_cep_mgr_t) );\r
        if( !gp_cep_mgr )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Failed allocation of global CM agent.\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -3260,7 +3266,7 @@ create_cep_mgr(
        if( status != IB_SUCCESS )\r
        {\r
                __free_cep_mgr( &gp_cep_mgr->obj );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("init_al_obj failed with status %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -3269,7 +3275,7 @@ create_cep_mgr(
        if( status != IB_SUCCESS )\r
        {\r
                gp_cep_mgr->obj.pfn_destroy( &gp_cep_mgr->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -3279,7 +3285,7 @@ create_cep_mgr(
        if( cl_status != CL_SUCCESS )\r
        {\r
                gp_cep_mgr->obj.pfn_destroy( &gp_cep_mgr->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cl_vector_init failed with status %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                return ib_convert_cl_status( cl_status );\r
@@ -3296,7 +3302,7 @@ create_cep_mgr(
        if( status != IB_SUCCESS )\r
        {\r
                gp_cep_mgr->obj.pfn_destroy( &gp_cep_mgr->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_reg_pnp failed with status %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -3462,7 +3468,7 @@ __create_cep()
        p_cep = ExAllocateFromNPagedLookasideList( &gp_cep_mgr->cep_pool );\r
        if( !p_cep )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("Failed to allocate CEP.\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Failed to allocate CEP.\n") );\r
                return NULL;\r
        }\r
 \r
@@ -3485,7 +3491,7 @@ __create_cep()
        if( !p_cep->p_cid )\r
        {\r
                ExFreeToNPagedLookasideList( &gp_cep_mgr->cep_pool, p_cep );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("Failed to get CID.\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Failed to get CID.\n") );\r
                return NULL;\r
        }\r
 \r
@@ -3663,14 +3669,14 @@ __cep_get_mad(
        p_port_cep = __get_cep_agent( p_cep );\r
        if( !p_port_cep )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("__get_cep_agent failed.\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("__get_cep_agent failed.\n") );\r
                return IB_INSUFFICIENT_RESOURCES;\r
        }\r
 \r
        status = ib_get_mad( p_port_cep->pool_key, MAD_BLOCK_SIZE, pp_mad );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_get_mad returned %s.\n", ib_get_err_str( status )) );\r
                return status;\r
        }\r
@@ -3888,7 +3894,7 @@ __cleanup_cep(
                break;\r
 \r
        default:\r
-               AL_TRACE( AL_DBG_ERROR, ("CEP in state %d.\n", p_cep->state) );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("CEP in state %d.\n", p_cep->state) );\r
        case CEP_STATE_TIMEWAIT:\r
                /* Already in timewait - so all is good. */\r
                p_cep->state = CEP_STATE_DESTROY;\r
@@ -3950,7 +3956,7 @@ al_create_cep(
        if( !p_cep )\r
        {\r
                KeReleaseInStackQueuedSpinLock( &hdl );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("Failed to allocate CEP.\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Failed to allocate CEP.\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
        KeReleaseInStackQueuedSpinLock( &hdl );\r
@@ -4119,7 +4125,7 @@ pdata_cmp:
                        else\r
                                break;\r
 \r
-                       AL_TRACE( AL_DBG_CM,\r
+                       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                                ("Svc ID match but compare buffer mismatch.\n") );\r
                        continue;\r
                }\r
@@ -4138,7 +4144,7 @@ pdata_cmp:
                p_cep->p_cmp_buf = cl_malloc( p_listen_info->cmp_len );\r
                if( !p_cep->p_cmp_buf )\r
                {\r
-                       AL_TRACE( AL_DBG_ERROR,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("Failed to allocate compare buffer.\n") );\r
                        status = IB_INSUFFICIENT_MEMORY;\r
                        goto done;\r
@@ -4350,7 +4356,7 @@ __save_user_req(
 \r
        if( !p_cm_req->p_primary_path )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("Invalid primary path record.\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Invalid primary path record.\n") );\r
                return IB_INVALID_SETTING;\r
        }\r
 \r
@@ -4394,7 +4400,7 @@ __save_user_req(
        p_port_cep = __format_path_av( p_cm_req->p_primary_path, &p_cep->av[0] );\r
        if( !p_port_cep )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("Primary path unrealizable.\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Primary path unrealizable.\n") );\r
                return IB_INVALID_SETTING;\r
        }\r
 \r
@@ -4404,7 +4410,7 @@ __save_user_req(
        if( p_port_cep->h_ca->obj.p_ci_ca->verbs.guid !=\r
                p_cm_req->h_qp->obj.p_ci_ca->verbs.guid )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Primary path not realizable on given QP.\n") );\r
                return IB_INVALID_SETTING;\r
        }\r
@@ -4427,7 +4433,7 @@ __save_user_req(
                if( ib_path_rec_mtu( p_cm_req->p_primary_path ) !=\r
                        ib_path_rec_mtu( p_cm_req->p_alt_path ) )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("Mismatched primary and alternate path MTUs.\n") );\r
                        return IB_INVALID_SETTING;\r
                }\r
@@ -4435,7 +4441,7 @@ __save_user_req(
                /* The PKEY must match too. */\r
                if( p_cm_req->p_alt_path->pkey != p_cm_req->p_primary_path->pkey )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("Mismatched pimary and alternate PKEYs.\n") );\r
                        return IB_INVALID_SETTING;\r
                }\r
@@ -4446,7 +4452,7 @@ __save_user_req(
                        p_port_cep->h_ca->obj.p_ci_ca->verbs.guid != p_cep->local_ca_guid )\r
                {\r
                        /* Alternate path is not on same CA. */\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR, ("Alternate path unrealizable.\n") );\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Alternate path unrealizable.\n") );\r
                        return IB_INVALID_SETTING;\r
                }\r
 \r
@@ -4554,7 +4560,7 @@ al_cep_pre_req(
                status = __format_req( p_cep, p_cm_req );\r
                if( status != IB_SUCCESS )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR, ("Invalid pdata length.\n") );\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Invalid pdata length.\n") );\r
                        ib_put_mad( p_cep->p_mad );\r
                        p_cep->p_mad = NULL;\r
                        break;\r
@@ -5200,7 +5206,7 @@ __format_lap(
                p_cm_lap->p_lap_pdata, p_cm_lap->lap_length, p_lap );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("lap pdata invalid.\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("lap pdata invalid.\n") );\r
                return status;\r
        }\r
 \r
@@ -5244,7 +5250,7 @@ al_cep_lap(
                if( !p_cep->was_active )\r
                {\r
                        /* Only the side that took the active role can initialte a LAP. */\r
-                       AL_TRACE( AL_DBG_ERROR,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("Only the active side of a connection can initiate a LAP.\n") );\r
                        status = IB_INVALID_STATE;\r
                        break;\r
@@ -5257,7 +5263,7 @@ al_cep_lap(
                p_port_cep = __format_path_av( p_cm_lap->p_alt_path, &p_cep->alt_av );\r
                if( !p_port_cep )\r
                {\r
-                       AL_TRACE( AL_DBG_ERROR, ("Alternate path invalid!\n") );\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Alternate path invalid!\n") );\r
                        status = IB_INVALID_SETTING;\r
                        break;\r
                }\r
@@ -5269,7 +5275,7 @@ al_cep_lap(
 \r
                if( p_port_cep->h_ca->obj.p_ci_ca->verbs.guid != p_cep->local_ca_guid )\r
                {\r
-                       AL_TRACE( AL_DBG_ERROR,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("Alternate CA GUID different from current!\n") );\r
                        status = IB_INVALID_SETTING;\r
                        break;\r
@@ -5322,7 +5328,7 @@ __format_apr(
                p_cm_apr->info_length, p_apr );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("apr_info invalid\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("apr_info invalid\n") );\r
                return status;\r
        }\r
 \r
@@ -5330,7 +5336,7 @@ __format_apr(
                p_cm_apr->apr_length, p_apr );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("apr pdata invalid\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("apr pdata invalid\n") );\r
                return status;\r
        }\r
 \r
@@ -5522,7 +5528,7 @@ al_cep_dreq(
                status = __format_dreq( p_cep, p_pdata, pdata_len, p_mad );\r
                if( status != IB_SUCCESS )\r
                {\r
-                       AL_TRACE( AL_DBG_ERROR,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("__format_dreq returned %s.\n", ib_get_err_str( status )) );\r
                        break;\r
                }\r
@@ -5640,7 +5646,7 @@ al_cep_migrate(
                        break;\r
                }\r
 \r
-               AL_TRACE( AL_DBG_ERROR, ("No alternate path avaialble.\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("No alternate path avaialble.\n") );\r
 \r
                /* Fall through. */\r
        default:\r
index 6c0f17052060d2d5a9d856a50828493e12078898..ff6a1dcd62208082bc619f341b8557692582633e 100644 (file)
@@ -57,7 +57,7 @@ __req_match_pending(
        mad_cm_req_t            *p_req;\r
        al_conn_t                       *p_conn;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        CL_ASSERT( p_list_item );\r
        CL_ASSERT( context );\r
@@ -67,14 +67,14 @@ __req_match_pending(
 \r
        if( p_req->local_comm_id != p_conn->remote_comm_id )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("Remote comm ID mismatch.\n") );\r
                return CL_NOT_FOUND;\r
        }\r
 \r
        if( p_req->local_ca_guid != p_conn->remote_ca_guid )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("Remote CA GUID mismatch.\n") );\r
                return CL_NOT_FOUND;\r
        }\r
@@ -82,7 +82,7 @@ __req_match_pending(
        /* Reference the connection since we're working on it... */\r
        __ref_conn( p_conn );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -100,7 +100,7 @@ __match_timewait(
        al_conn_t                       *p_conn;\r
        conn_req_t                      *p_info;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        CL_ASSERT( p_list_item );\r
        CL_ASSERT( context );\r
@@ -112,11 +112,11 @@ __match_timewait(
        if( p_conn->remote_ca_guid != p_req->local_ca_guid ||\r
                conn_req_get_lcl_qpn( p_req ) != p_conn->remote_qpn )\r
        {\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_NOT_FOUND;\r
        }\r
 \r
-       CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+       AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                ("REQ received for stale connection.\n") );\r
        return CL_SUCCESS;\r
 }\r
@@ -133,7 +133,7 @@ __match_conn_listen(
        mad_cm_req_t            *p_req;\r
        al_listen_t                     *p_listen;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        CL_ASSERT( p_list_item );\r
        CL_ASSERT( context );\r
@@ -146,7 +146,7 @@ __match_conn_listen(
 \r
        if( p_req->sid != p_listen->info.svc_id )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl, ("Svc ID mismatch.\n") );\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM, ("Svc ID mismatch.\n") );\r
                return CL_NOT_FOUND;\r
        }\r
 \r
@@ -155,7 +155,7 @@ __match_conn_listen(
                if( cl_memcmp( &p_req->pdata[p_listen->info.compare_offset],\r
                        p_listen->info.p_compare_buffer, p_listen->info.compare_length ) )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                                ("Svc ID match but compare buffer mismatch.\n") );\r
                        return CL_NOT_FOUND;\r
                }\r
@@ -164,7 +164,7 @@ __match_conn_listen(
        /* Reference the listen so that it doesn't go away. */\r
        ref_al_obj( &p_listen->obj );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -180,7 +180,7 @@ __match_peer(
        mad_cm_req_t            *p_req;\r
        al_conn_t                       *p_conn;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        CL_ASSERT( p_list_item );\r
        CL_ASSERT( context );\r
@@ -191,14 +191,14 @@ __match_peer(
        /* Only match against peer-to-peer requests, not client requests. */\r
        if( !p_conn->p_req_info->pfn_cm_req_cb )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl, ("Client request.\n") );\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM, ("Client request.\n") );\r
                return CL_NOT_FOUND;\r
        }\r
 \r
        /* Validate the transport type against the connection's QP type. */\r
        if( conn_req_get_qp_type( p_req ) != p_conn->h_qp->type )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("Transport type mismatch.\n") );\r
                return CL_NOT_FOUND;\r
        }\r
@@ -206,13 +206,13 @@ __match_peer(
        /* Compare SID and compare data. */\r
        if( p_req->sid != p_conn->p_req_info->svc_id )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl, ("Svc ID mismatch.\n") );\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM, ("Svc ID mismatch.\n") );\r
                return CL_NOT_FOUND;\r
        }\r
 \r
        if( p_conn->state != CM_CONN_REQ_SENT )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("Peer connection already matched.\n") );\r
                return CL_NOT_FOUND;\r
        }\r
@@ -226,7 +226,7 @@ __match_peer(
                /* Trying to connect to the same CA as the request. */\r
                if( p_conn->local_comm_id == p_req->local_comm_id )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                                ("Same peer request.\n") );\r
                        return CL_NOT_FOUND;\r
                }\r
@@ -235,28 +235,28 @@ __match_peer(
        /* do a local lid and gid match */\r
        if( p_conn->path->slid != p_req->primary_path.remote_lid )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("slid mismatch. May be a different req in list\n") );\r
                return CL_NOT_FOUND;\r
        }\r
        if( cl_memcmp( &p_conn->path->sgid, &p_req->primary_path.remote_gid,\r
                sizeof(ib_gid_t) ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("sgid mismatch. May be a different req in list\n") );\r
                return CL_NOT_FOUND;\r
        }\r
 \r
        if( p_conn->path->dlid != p_req->primary_path.local_lid )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("dlid mismatch. May be a different req in list\n") );\r
                return CL_NOT_FOUND;\r
        }\r
        if( cl_memcmp( &p_conn->path->dgid, &p_req->primary_path.local_gid,\r
                sizeof(ib_gid_t) ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("dgid mismatch. May be a different req in list\n") );\r
                return CL_NOT_FOUND;\r
        }\r
@@ -268,7 +268,7 @@ __match_peer(
                        p_conn->p_req_info->p_compare_buffer,\r
                        p_conn->p_req_info->compare_length ) )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                                ("Svc ID match but compare buffer mismatch.\n") );\r
                        return CL_NOT_FOUND;\r
                }\r
@@ -277,7 +277,7 @@ __match_peer(
        /* Reference the connection object so it doesn't go away. */\r
        __ref_conn( p_conn );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -289,7 +289,7 @@ __match_conn_handoff(
        al_conn_t                       *p_conn;\r
        al_listen_t                     *p_listen;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        CL_ASSERT( p_list_item );\r
        CL_ASSERT( context );\r
@@ -302,7 +302,7 @@ __match_conn_handoff(
 \r
        if( p_conn->p_req_info->svc_id != p_listen->info.svc_id )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl, ("Svc ID mismatch.\n") );\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM, ("Svc ID mismatch.\n") );\r
                return CL_NOT_FOUND;\r
        }\r
 \r
@@ -310,7 +310,7 @@ __match_conn_handoff(
        {\r
                if( !p_conn->p_req_info->p_compare_buffer )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                                ("Svc ID match but compare buffer mismatch.\n") );\r
                        return CL_NOT_FOUND;\r
                }\r
@@ -319,14 +319,14 @@ __match_conn_handoff(
                        ( p_conn->p_req_info->compare_offset !=\r
                                p_listen->info.compare_offset ) )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                                ("Svc ID match but compare buffer mismatch.\n") );\r
                        return CL_NOT_FOUND;\r
                }\r
                if( cl_memcmp( p_conn->p_req_info->p_compare_buffer,\r
                        p_listen->info.p_compare_buffer, p_listen->info.compare_length ) )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                                ("Svc ID match but compare buffer mismatch.\n") );\r
                        return CL_NOT_FOUND;\r
                }\r
@@ -335,7 +335,7 @@ __match_conn_handoff(
        /* Reference the listen so that it doesn't go away. */\r
        ref_al_obj( &p_listen->obj );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -372,7 +372,7 @@ __format_req_path_rec(
        IN                              req_path_info_t                         *p_path,\r
                OUT                     ib_path_rec_t                           *p_path_rec )\r
 {\r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        CL_ASSERT( p_req );\r
        CL_ASSERT( p_path );\r
@@ -409,7 +409,7 @@ __format_req_path_rec(
                p_path_rec->tclass = p_path->traffic_class;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 ib_rej_status_t\r
@@ -420,7 +420,7 @@ __validate_req_2_listen_info(
 {\r
        ib_port_attr_t  *p_port_attr;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_port_attr = &p_port_cm->p_ca_attr->p_port_attr[p_port_cm->port_idx];\r
 \r
@@ -428,7 +428,7 @@ __validate_req_2_listen_info(
        if( ( p_listen->info.ca_guid != IB_ALL_CAS ) &&\r
                ( p_listen->info.ca_guid != p_port_cm->p_ca_attr->ca_guid ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("CaGuid mismatch on listen.\n") );\r
                return IB_REJ_INVALID_SID;\r
        }\r
@@ -437,7 +437,7 @@ __validate_req_2_listen_info(
                ( ( p_listen->info.lid != p_path_rec->slid ) ||\r
                  ( p_listen->info.lid != p_port_attr->lid ) ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("lid mismatch on listen.\n") );\r
                return IB_REJ_INVALID_LID;\r
        }\r
@@ -445,7 +445,7 @@ __validate_req_2_listen_info(
        if( ( p_listen->info.port_guid != IB_ALL_PORTS ) &&\r
                ( p_listen->info.port_guid != p_port_attr->port_guid ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("PortGuid mismatch on listen.\n") );\r
                return IB_REJ_INVALID_SID;\r
        }\r
@@ -453,12 +453,12 @@ __validate_req_2_listen_info(
        if( ( p_listen->info.pkey != IB_ALL_PKEYS ) &&\r
                ( p_listen->info.pkey != p_path_rec->pkey ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("pkey mismatch on listen.\n") );\r
                return IB_REJ_INVALID_SID;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return 0;\r
 }\r
 \r
@@ -472,7 +472,7 @@ __format_req_rec(
 {\r
        ib_rej_status_t rej_status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        CL_ASSERT( p_port_cm );\r
        CL_ASSERT( p_req );\r
@@ -484,7 +484,7 @@ __format_req_rec(
        switch( p_req->hdr.class_ver )\r
        {\r
        default:\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Invalid class version type received.\n") );\r
                return IB_REJ_UNSUPPORTED;\r
 \r
@@ -494,7 +494,7 @@ __format_req_rec(
        if( conn_req_get_qp_type( p_req ) > IB_QPT_UNRELIABLE_CONN )\r
        {\r
                /* Reserved value.  Reject. */\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Invalid transport type received.\n") );\r
                return IB_REJ_INVALID_XPORT;\r
        }\r
@@ -529,7 +529,7 @@ __format_req_rec(
        p_req_rec->h_cm_listen = ;\r
        */\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return 0;\r
 }\r
 \r
@@ -543,7 +543,7 @@ __reject_req(
        mad_cm_req_t    *p_req;\r
        mad_cm_rej_t    *p_rej;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        CL_ASSERT( p_port_cm );\r
        CL_ASSERT( p_mad );\r
@@ -568,7 +568,7 @@ __reject_req(
        /* Assumption: The retry count, send options, etc are zeroed on a recv. */\r
        __cm_send_mad( p_port_cm, p_mad );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -584,7 +584,7 @@ __validate_primary_path(
        ib_api_status_t         status;\r
        cm_port_agent_t         *p_port_cm;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        CL_ASSERT( p_conn );\r
        CL_ASSERT( pp_port_cm );\r
@@ -596,7 +596,7 @@ __validate_primary_path(
                &p_port_cm, &p_conn->p_req_info->p_ca_attr );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__get_port_attr failed for primary path.\n") );\r
                return status;\r
        }\r
@@ -604,7 +604,7 @@ __validate_primary_path(
        if( p_conn->p_req_info->p_ca_attr->ca_guid !=\r
                p_conn->h_qp->obj.p_ci_ca->verbs.guid )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Primary path is not on the same CA as QP.\n") );\r
                return IB_INVALID_SETTING;\r
        }\r
@@ -612,7 +612,7 @@ __validate_primary_path(
        p_conn->p_req_info->port_idx = p_port_cm->port_idx;\r
 \r
        *pp_port_cm = p_port_cm;\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -629,26 +629,26 @@ __validate_alt_path(
        cm_port_agent_t         *p_port_cm;\r
        ib_ca_attr_t            *p_ca_attr;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Get the alternate path port attributes. */\r
        status = __get_port_attr( &p_conn->path[1].sgid, p_conn->path[1].slid,\r
                &p_port_cm, &p_ca_attr );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__get_port_attr failed for alternate path.\n") );\r
                return status;\r
        }\r
        if( p_ca_attr->ca_guid != p_conn->p_req_info->p_ca_attr->ca_guid )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Primary and alternate paths on different CAs.\n") );\r
                return IB_INVALID_SETTING;\r
        }\r
        p_conn->p_req_info->alt_port_idx = p_port_cm->port_idx;\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -740,7 +740,7 @@ __conn_save_wire_req(
        struct _qp_rtr  *p_rtr;\r
        struct _qp_rts  *p_rts;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_conn->state = CM_CONN_REQ_RCVD;\r
        p_conn->was_active = FALSE;\r
@@ -848,7 +848,7 @@ __conn_save_wire_req(
        /* copy mad info for cm handoff */\r
        p_conn->mads.req = *p_req;\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 void\r
@@ -862,7 +862,7 @@ __listen_req(
        ib_cm_req_rec_t         req_rec;\r
        ib_rej_status_t         rej_status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        CL_ASSERT( p_port_cm );\r
        CL_ASSERT( p_listen );\r
@@ -876,7 +876,7 @@ __listen_req(
        {\r
                /* The request is malformed.  Reject it. */\r
                __reject_req( p_port_cm, p_mad, rej_status );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("REJ sent for malformed REQ.\n") );\r
                return;\r
        }\r
@@ -888,7 +888,7 @@ __listen_req(
        {\r
                /* Reject the request for insufficient resources. */\r
                __reject_req( p_port_cm, p_mad, IB_REJ_INSUF_RESOURCES );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("REJ sent for insufficient resources.\n") );\r
                return;\r
        }\r
@@ -924,7 +924,7 @@ __listen_req(
        /* Return the REQ to the mad pool */\r
        ib_put_mad( p_mad );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -939,7 +939,7 @@ __peer_req(
        ib_rej_status_t rej_status;\r
        ib_api_status_t status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        CL_ASSERT( p_port_cm );\r
        CL_ASSERT( p_conn );\r
@@ -961,7 +961,7 @@ __peer_req(
                __repeated_mad( p_port_cm, p_conn, p_mad );\r
                /* Release reference on p_conn obtained from __match_peer. */\r
                __deref_conn( p_conn );\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("Won peer compare, repeating REQ.\n") );\r
                return;\r
        }\r
@@ -972,7 +972,7 @@ __peer_req(
                __repeated_mad( p_port_cm, p_conn, p_mad );\r
                /* Release reference on p_conn obtained from __match_peer. */\r
                __deref_conn( p_conn );\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("Won peer compare, repeating REQ.\n") );\r
                return;\r
        }\r
@@ -987,7 +987,7 @@ __peer_req(
 \r
                /* The request is malformed.  Reject it. */\r
                __reject_req( p_port_cm, p_mad, rej_status );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("REJ sent for malformed REQ.\n") );\r
                return;\r
        }\r
@@ -1000,7 +1000,7 @@ __peer_req(
                cm_res_release( p_conn );\r
                /* Release reference on p_conn obtained from __match_peer. */\r
                __deref_conn( p_conn );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("REQ in invalid state.\n") );\r
                return;\r
        }\r
@@ -1021,7 +1021,7 @@ __peer_req(
        /* Return the REQ to the mad pool */\r
        ib_put_mad( p_mad );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -1036,7 +1036,7 @@ cm_conn_handoff(
        ib_rej_status_t rej_status;\r
        al_conn_t               *p_conn_handoff;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        CL_ASSERT( p_conn );\r
 \r
@@ -1059,7 +1059,7 @@ cm_conn_handoff(
                cl_spinlock_release( &gp_cm->obj.lock );\r
                __conn_reject( p_conn, IB_REJ_INVALID_SID, NULL, 0, NULL );\r
                cm_res_release( p_conn );\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("Handoff failed on svc_id!\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
@@ -1076,7 +1076,7 @@ cm_conn_handoff(
                /* The request does not conform to the handoff process service. */\r
                __conn_reject( p_conn, rej_status, NULL, 0, NULL );\r
                cm_res_release( p_conn );\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("Handoff failed on svc_id info!\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
@@ -1089,7 +1089,7 @@ cm_conn_handoff(
                /* Reject the request for insufficient resources. */\r
                __conn_reject( p_conn, IB_REJ_INSUF_RESOURCES, NULL, 0, NULL );\r
                cm_res_release( p_conn );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Handoff failed on insufficient resources.\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -1129,7 +1129,7 @@ cm_conn_handoff(
        /* deref the listen object */\r
        deref_al_obj( &p_listen->obj );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -1145,13 +1145,13 @@ __process_cm_req(
        al_conn_t               *p_conn;\r
        al_listen_t             *p_listen;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_async_mad = PARENT_STRUCT( p_item, cm_async_mad_t, item );\r
        p_req = (mad_cm_req_t*)p_async_mad->p_mad->p_mad_buf;\r
        p_port_cm = p_async_mad->p_port_cm;\r
 \r
-       CL_TRACE( AL_DBG_CM, g_al_dbg_lvl, ("REQ: comm_id (x%x) received\n",\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("REQ: comm_id (x%x) received\n",\r
                p_req->local_comm_id ) );\r
 \r
        /* Match against pending connections using remote comm ID and CA GUID. */\r
@@ -1166,7 +1166,7 @@ __process_cm_req(
                __repeated_mad( p_port_cm, p_conn, p_async_mad->p_mad );\r
                __deref_conn( p_conn );\r
                cl_free( p_async_mad );\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("Duplicate REQ received.\n") );\r
                return;\r
        }\r
@@ -1179,7 +1179,7 @@ __process_cm_req(
                cl_spinlock_release( &gp_cm->obj.lock );\r
                __reject_req( p_port_cm, p_async_mad->p_mad, IB_REJ_STALE_CONN );\r
                cl_free( p_async_mad );\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("REQ received for connection in TIME_WAIT state.\n") );\r
                return;\r
        }\r
@@ -1194,12 +1194,12 @@ __process_cm_req(
                __listen_req( p_port_cm, p_listen, p_async_mad->p_mad );\r
                deref_al_obj( &p_listen->obj );\r
                cl_free( p_async_mad );\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("REQ matched a listen.\n") );\r
                return;\r
        }\r
 \r
-       CL_TRACE( AL_DBG_CM, g_al_dbg_lvl, ("No listens active!\n") );\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("No listens active!\n") );\r
 \r
        /* Match against peer-to-peer requests using SID and compare data. */\r
        p_list_item = cl_qlist_find_from_head( &gp_cm->pending_list,\r
@@ -1210,7 +1210,7 @@ __process_cm_req(
                p_conn = PARENT_STRUCT( p_list_item, al_conn_t, map_item );\r
                __peer_req( p_port_cm, p_conn, p_async_mad->p_mad );\r
                cl_free( p_async_mad );\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("REQ matched a peer-to-peer request.\n") );\r
                return;\r
        }\r
@@ -1219,7 +1219,7 @@ __process_cm_req(
        cl_spinlock_release( &gp_cm->obj.lock );\r
        __reject_req( p_port_cm, p_async_mad->p_mad, IB_REJ_INVALID_SID );\r
        cl_free( p_async_mad );\r
-       CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+       AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                ("REQ received but no match found.\n") );\r
 }\r
 \r
@@ -1235,14 +1235,14 @@ __mra_match(
        al_conn_t               *p_conn;\r
        mad_cm_mra_t    *p_mra;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_conn = PARENT_STRUCT( p_list_item, al_conn_t, map_item );\r
        p_mra = (mad_cm_mra_t*)context;\r
 \r
        if( p_conn->local_comm_id != p_mra->remote_comm_id )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("Local conn ID mismatch.\n") );\r
                return CL_NOT_FOUND;\r
        }\r
@@ -1250,12 +1250,12 @@ __mra_match(
        if( p_conn->remote_comm_id &&\r
                p_conn->remote_comm_id == p_mra->local_comm_id )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("Remote conn ID mismatch.\n") );\r
                return CL_NOT_FOUND;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -1268,7 +1268,7 @@ __start_mra_timer(
        uint32_t                timeout;\r
        uint8_t                 pkt_life;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Cancel the send for the REQ, REP, or LAP. */\r
        ib_cancel_mad( p_conn->h_mad_svc, p_conn->p_send_mad );\r
@@ -1309,7 +1309,7 @@ __start_mra_timer(
                __deref_conn( p_conn );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -1320,7 +1320,7 @@ __do_mra_callback(
 {\r
        ib_cm_mra_rec_t mra_rec;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        CL_ASSERT( p_conn->h_qp );\r
 \r
@@ -1337,7 +1337,7 @@ __do_mra_callback(
         */\r
        p_conn->pfn_cm_mra_cb( &mra_rec );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -1353,7 +1353,7 @@ __process_cm_mra(
        boolean_t               do_callback = TRUE;\r
        uint64_t                key;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_async_mad = PARENT_STRUCT( p_item, cm_async_mad_t, item );\r
        p_port_cm = p_async_mad->p_port_cm;\r
@@ -1372,7 +1372,7 @@ __process_cm_mra(
                        ib_put_mad( p_async_mad->p_mad );\r
                        cl_free( p_async_mad );\r
 \r
-                       CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                                ("MRA received for LAP that could not be matched.\n") );\r
                        return;\r
                }\r
@@ -1384,7 +1384,7 @@ __process_cm_mra(
                if( p_map_item ==\r
                        (cl_map_item_t*)cl_qlist_end( &gp_cm->pending_list ) )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                                ("MRA received that could not be matched.\n") );\r
 \r
                        cl_spinlock_release( &gp_cm->obj.lock );\r
@@ -1445,7 +1445,7 @@ __process_cm_mra(
                break;\r
 \r
        default:\r
-               CL_TRACE( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                        ("MRA received in invalid state.\n") );\r
                do_callback = FALSE;\r
                break;\r
@@ -1459,7 +1459,7 @@ __process_cm_mra(
        ib_put_mad( p_async_mad->p_mad );\r
        cl_free( p_async_mad );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -1507,7 +1507,7 @@ __rej_match(
        const ib_net64_t UNALIGNED      *p_ca_guid;\r
        uint8_t                                         ari_len;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_conn = PARENT_STRUCT( p_list_item, al_conn_t, map_item );\r
        p_rej = (mad_cm_rej_t*)context;\r
@@ -1519,7 +1519,7 @@ __rej_match(
        if( p_rej->remote_comm_id &&\r
                p_conn->local_comm_id != p_rej->remote_comm_id )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("Local comm ID mismatch.\n") );\r
                return CL_NOT_FOUND;\r
        }\r
@@ -1528,7 +1528,7 @@ __rej_match(
        if( p_conn->remote_comm_id &&\r
                p_conn->remote_comm_id != p_rej->local_comm_id )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("Remote comm ID mismatch.\n") );\r
                return CL_NOT_FOUND;\r
        }\r
@@ -1543,7 +1543,7 @@ __rej_match(
                if( ( p_conn->p_req_info->p_ca_attr ) &&\r
                        ( p_conn->p_req_info->p_ca_attr->ca_guid != *p_ca_guid ) )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                                ("Local CA GUID mismatch.\n") );\r
                        return CL_NOT_FOUND;\r
                }\r
@@ -1552,7 +1552,7 @@ __rej_match(
        /* We reached here with a comm id match which is good enough for me */\r
 \r
        __ref_conn( p_conn );\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -1568,7 +1568,7 @@ __process_cm_rej(
        al_conn_t               *p_conn;\r
        uint64_t                key;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_async_mad = PARENT_STRUCT( p_item, cm_async_mad_t, item );\r
        p_port_cm = p_async_mad->p_port_cm;\r
@@ -1591,7 +1591,7 @@ __process_cm_rej(
                        ib_put_mad( p_async_mad->p_mad );\r
                        cl_free( p_async_mad );\r
 \r
-                       CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                                ("REJ received that could not be matched.\n") );\r
                        return;\r
                }\r
@@ -1624,7 +1624,7 @@ __process_cm_rej(
                        __deref_conn( p_conn );\r
                        ib_put_mad( p_async_mad->p_mad );\r
                        cl_free( p_async_mad );\r
-                       CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                                ("Request rejected (invalid SID) - retrying.\n") );\r
                        return;\r
                }\r
@@ -1663,7 +1663,7 @@ __process_cm_rej(
                __deref_conn( p_conn );\r
                ib_put_mad( p_async_mad->p_mad );\r
                cl_free( p_async_mad );\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("REJ received in invalid state.\n") );\r
                return;\r
        }\r
@@ -1673,7 +1673,7 @@ __process_cm_rej(
        ib_put_mad( p_async_mad->p_mad );\r
        cl_free( p_async_mad );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -1691,7 +1691,7 @@ __conn_reject(
        cm_port_agent_t         *p_port_cm;\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
        UNUSED_PARAM( p_rej_pdata );\r
 \r
        /*\r
@@ -1743,7 +1743,7 @@ __conn_reject(
                &p_port_cm, NULL );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__get_port_attr returned %s\n", ib_get_err_str(status)) );\r
                return;\r
        }\r
@@ -1758,7 +1758,7 @@ __conn_reject(
        __cm_send( p_port_cm, p_conn );\r
        __conn_abort( p_conn );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -1773,12 +1773,12 @@ __rep_match(
        al_conn_t               *p_conn;\r
        mad_cm_rep_t    *p_rep;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_conn = PARENT_STRUCT( p_list_item, al_conn_t, map_item );\r
        p_rep = (mad_cm_rep_t*)context;\r
 \r
-       CL_PRINT( AL_DBG_CM, g_al_dbg_lvl,\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                ("p_conn:: local_comm_id (x%x) remote_comm_id (x%x)\n"\r
                "p_rep:: local_comm_id (x%x) remote_comm_id (x%x)\n",\r
                p_conn->local_comm_id,\r
@@ -1788,13 +1788,13 @@ __rep_match(
 \r
        if( p_conn->local_comm_id != p_rep->remote_comm_id )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("Local comm ID mismatch.\n") );\r
                return CL_NOT_FOUND;\r
        }\r
 \r
        __ref_conn( p_conn );\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -1806,7 +1806,7 @@ __format_rep_rec(
        IN              const   al_conn_t*                      const   p_conn,\r
                OUT                     ib_cm_rep_rec_t*        const   p_rep_rec )\r
 {\r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        cl_memclr( p_rep_rec, sizeof(ib_cm_rep_rec_t) );\r
 \r
@@ -1820,7 +1820,7 @@ __format_rep_rec(
        p_rep_rec->flow_ctrl = conn_rep_get_e2e_flow_ctl( p_rep );\r
        p_rep_rec->apr_status = conn_rep_get_failover( p_rep );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 void\r
@@ -1831,7 +1831,7 @@ __conn_save_wire_rep(
        struct _qp_rtr          *p_rtr;\r
        struct _qp_rts          *p_rts;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* The send should have been cancelled during MRA processing. */\r
        p_conn->state = CM_CONN_REP_RCVD;\r
@@ -1907,7 +1907,7 @@ __conn_save_wire_rep(
        p_rts->qkey = p_rep->local_qkey;\r
        */\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 void\r
@@ -1921,12 +1921,12 @@ __process_cm_rep(
        ib_cm_rep_rec_t         rep_rec;\r
        uint64_t                        key;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_async_mad = PARENT_STRUCT( p_item, cm_async_mad_t, item );\r
        p_rep = (mad_cm_rep_t*)p_async_mad->p_mad->p_mad_buf;\r
 \r
-       CL_TRACE( AL_DBG_CM, g_al_dbg_lvl, ("REP: comm_id (x%x) received\n",\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("REP: comm_id (x%x) received\n",\r
                p_rep->local_comm_id ) );\r
 \r
        /* Check the pending list by the local connection ID. */\r
@@ -1946,7 +1946,7 @@ __process_cm_rep(
                        ib_put_mad( p_async_mad->p_mad );\r
                        cl_free( p_async_mad );\r
 \r
-                       CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                                ("REP received that could not be matched.\n") );\r
                        return;\r
                }\r
@@ -1997,7 +1997,7 @@ __process_cm_rep(
                break;\r
 \r
        default:\r
-               CL_TRACE( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                        ("REP received in invalid state.\n") );\r
                cm_res_release( p_conn );\r
                ib_put_mad( p_async_mad->p_mad );\r
@@ -2007,7 +2007,7 @@ __process_cm_rep(
        __deref_conn( p_conn );\r
        cl_free( p_async_mad );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -2022,27 +2022,27 @@ __rtu_match(
        al_conn_t               *p_conn;\r
        mad_cm_rtu_t    *p_rtu;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_conn = PARENT_STRUCT( p_list_item, al_conn_t, map_item );\r
        p_rtu = (mad_cm_rtu_t*)context;\r
 \r
        if( p_conn->local_comm_id != p_rtu->remote_comm_id )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("Local comm ID mismatch.\n") );\r
                return CL_NOT_FOUND;\r
        }\r
 \r
        if( p_conn->remote_comm_id != p_rtu->local_comm_id )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("Remote comm ID mismatch.\n") );\r
                return CL_NOT_FOUND;\r
        }\r
 \r
        __ref_conn( p_conn );\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -2052,7 +2052,7 @@ __format_rtu_rec(
        IN      const   al_conn_t*                      const   p_conn,\r
                OUT             ib_cm_rtu_rec_t*        const   p_rtu_rec )\r
 {\r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        cl_memclr( p_rtu_rec, sizeof(ib_cm_rtu_rec_t) );\r
 \r
@@ -2061,7 +2061,7 @@ __format_rtu_rec(
        p_rtu_rec->h_qp = p_conn->h_qp;\r
        p_rtu_rec->qp_context = p_conn->h_qp->obj.context;\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 void\r
@@ -2075,12 +2075,12 @@ __process_cm_rtu(
        ib_pfn_cm_rtu_cb_t              pfn_rtu;\r
        ib_cm_rtu_rec_t                 rtu_rec;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_async_mad = PARENT_STRUCT( p_item, cm_async_mad_t, item );\r
        p_rtu = (mad_cm_rtu_t*)p_async_mad->p_mad->p_mad_buf;\r
 \r
-       CL_TRACE( AL_DBG_CM, g_al_dbg_lvl, ("RTU: comm_id (x%x) received\n",\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("RTU: comm_id (x%x) received\n",\r
                p_rtu->local_comm_id ) );\r
 \r
        /* Find the connection by local connection ID. */\r
@@ -2090,7 +2090,7 @@ __process_cm_rtu(
        cl_spinlock_release( &gp_cm->obj.lock );\r
        if( p_list_item == cl_qlist_end( &gp_cm->pending_list ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("RTU received that could not be matched.\n") );\r
                ib_put_mad( p_async_mad->p_mad );\r
                cl_free( p_async_mad );\r
@@ -2135,7 +2135,7 @@ __process_cm_rtu(
                break;\r
 \r
        default:\r
-               CL_TRACE( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                        ("RTU received in invalid state.\n") );\r
                cm_res_release( p_conn );\r
                break;\r
@@ -2146,7 +2146,7 @@ __process_cm_rtu(
        ib_put_mad( p_async_mad->p_mad );\r
        cl_free( p_async_mad );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -2161,33 +2161,33 @@ __dreq_match(
        al_conn_t               *p_conn;\r
        mad_cm_dreq_t   *p_dreq;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_conn = PARENT_STRUCT( p_list_item, al_conn_t, map_item );\r
        p_dreq = (mad_cm_dreq_t*)context;\r
 \r
        if( p_conn->local_comm_id != p_dreq->remote_comm_id )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("Local comm ID mismatch.\n") );\r
                return CL_NOT_FOUND;\r
        }\r
 \r
        if( p_conn->remote_comm_id != p_dreq->local_comm_id )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("Remote comm ID mismatch.\n") );\r
                return CL_NOT_FOUND;\r
        }\r
 \r
        if( p_conn->local_qpn != conn_dreq_get_remote_qpn( p_dreq ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("local QPN mismatch.\n") );\r
                return CL_NOT_FOUND;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -2197,7 +2197,7 @@ __format_dreq_rec(
        IN      const   al_conn_t*                      const   p_conn,\r
                OUT             ib_cm_dreq_rec_t*       const   p_dreq_rec )\r
 {\r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        cl_memclr( p_dreq_rec, sizeof(ib_cm_dreq_rec_t) );\r
 \r
@@ -2207,7 +2207,7 @@ __format_dreq_rec(
        p_dreq_rec->qp_type = p_conn->qp_type;\r
        p_dreq_rec->qp_context = p_conn->h_qp->obj.context;\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -2223,7 +2223,7 @@ __process_cm_dreq(
        uint64_t                        key;\r
        ib_cm_dreq_rec_t        dreq_rec;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_async_mad = PARENT_STRUCT( p_item, cm_async_mad_t, item );\r
        p_dreq = (mad_cm_dreq_t*)p_async_mad->p_mad->p_mad_buf;\r
@@ -2242,7 +2242,7 @@ __process_cm_dreq(
                        (cl_map_item_t*)cl_qlist_end( &gp_cm->time_wait_list ) )\r
                {\r
                        cl_spinlock_release( &gp_cm->obj.lock );\r
-                       CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                                ("DREQ received that could not be matched.\n") );\r
                        ib_put_mad( p_async_mad->p_mad );\r
                        cl_free( p_async_mad );\r
@@ -2269,7 +2269,7 @@ __process_cm_dreq(
                __deref_conn( p_conn );\r
                ib_put_mad( p_async_mad->p_mad );\r
                cl_free( p_async_mad );\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return;\r
        }\r
 \r
@@ -2305,7 +2305,7 @@ __process_cm_dreq(
                break;\r
 \r
        default:\r
-               CL_TRACE( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                        ("DREQ received in invalid state.\n") );\r
                cm_res_release( p_conn );\r
                ib_put_mad( p_async_mad->p_mad );\r
@@ -2325,7 +2325,7 @@ __format_drep_rec(
        IN              const   al_conn_t*                      const   p_conn,\r
                OUT                     ib_cm_drep_rec_t*       const   p_drep_rec )\r
 {\r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        cl_memclr( p_drep_rec, sizeof(ib_cm_drep_rec_t) );\r
 \r
@@ -2336,7 +2336,7 @@ __format_drep_rec(
        p_drep_rec->h_qp = p_conn->h_qp;\r
        p_drep_rec->qp_context = p_conn->h_qp->obj.context;\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -2351,7 +2351,7 @@ __process_cm_drep(
        al_conn_t                       *p_conn;\r
        ib_cm_drep_rec_t        drep_rec;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_async_mad = PARENT_STRUCT( p_item, cm_async_mad_t, item );\r
        p_drep = (mad_cm_drep_t*)p_async_mad->p_mad->p_mad_buf;\r
@@ -2364,7 +2364,7 @@ __process_cm_drep(
        if( p_map_item == cl_qmap_end( &gp_cm->conn_map ) )\r
        {\r
                cl_spinlock_release( &gp_cm->obj.lock );\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("DREP received that could not be matched.\n") );\r
                ib_put_mad( p_async_mad->p_mad );\r
                cl_free( p_async_mad );\r
@@ -2402,7 +2402,7 @@ __process_cm_drep(
                break;\r
 \r
        default:\r
-               CL_TRACE( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                        ("DREP received in invalid state.\n") );\r
                cm_res_release( p_conn );\r
        }\r
@@ -2412,7 +2412,7 @@ __process_cm_drep(
 \r
        ib_put_mad( p_async_mad->p_mad );\r
        cl_free( p_async_mad );\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -2424,7 +2424,7 @@ __format_lap_path_rec(
 {\r
        const lap_path_info_t* const    p_path = &p_lap->alternate_path;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        CL_ASSERT( p_lap );\r
        CL_ASSERT( p_path_rec );\r
@@ -2463,7 +2463,7 @@ __format_lap_path_rec(
                p_path_rec->tclass = conn_lap_path_get_tclass( p_path );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -2479,7 +2479,7 @@ __process_cm_lap(
        al_conn_t               *p_conn;\r
        ib_cm_lap_rec_t lap_rec;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_async_mad = PARENT_STRUCT( p_item, cm_async_mad_t, item );\r
        p_port_cm = p_async_mad->p_port_cm;\r
@@ -2496,7 +2496,7 @@ __process_cm_lap(
                ib_put_mad( p_async_mad->p_mad );\r
                cl_free( p_async_mad );\r
 \r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("LAP received that could not be matched.\n") );\r
                return;\r
        }\r
@@ -2531,7 +2531,7 @@ __process_cm_lap(
                break;\r
 \r
        default:\r
-               CL_TRACE( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                        ("LAP received in invalid state.\n") );\r
                cm_res_release( p_conn );\r
                break;\r
@@ -2539,7 +2539,7 @@ __process_cm_lap(
 \r
        ib_put_mad( p_async_mad->p_mad );\r
        cl_free( p_async_mad );\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -2552,13 +2552,13 @@ __cm_lap_qp(
        ib_ca_attr_t            *p_ca_attr;\r
        ib_qp_mod_t                     qp_mod;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        status = __get_port_attr( &p_conn->new_alt_path.sgid,\r
                p_conn->new_alt_path.slid, &p_port_cm, &p_ca_attr );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__get_port_attr returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -2576,14 +2576,14 @@ __cm_lap_qp(
        status = ib_modify_qp( p_conn->h_qp, &qp_mod );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("ib_modify_qp for LAP returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
 \r
        cl_memcpy( &p_conn->path[(p_conn->idx_primary + 1) & 0x1],\r
                &p_conn->new_alt_path, sizeof(ib_path_rec_t) );\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -2600,7 +2600,7 @@ __process_cm_apr(
        uint64_t                key;\r
        ib_cm_apr_rec_t apr_rec;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_async_mad = PARENT_STRUCT( p_item, cm_async_mad_t, item );\r
        p_port_cm = p_async_mad->p_port_cm;\r
@@ -2614,7 +2614,7 @@ __process_cm_apr(
        if( p_map_item == cl_qmap_end( &gp_cm->conn_map ) )\r
        {\r
                cl_spinlock_release( &gp_cm->obj.lock );\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("APR received that could not be matched.\n") );\r
                ib_put_mad( p_async_mad->p_mad );\r
                cl_free( p_async_mad );\r
@@ -2659,7 +2659,7 @@ __process_cm_apr(
 \r
        default:\r
                cm_res_release( p_conn );\r
-               CL_TRACE( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                        ("APR received in invalid state.\n") );\r
                break;\r
        }\r
@@ -2681,7 +2681,7 @@ __proc_dconn_timeout(
        ib_cm_drep_rec_t        drep_rec;\r
        ib_cm_drep_t            cm_drep;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_conn = PARENT_STRUCT( p_item, al_conn_t, timeout_item );\r
 \r
@@ -2725,7 +2725,7 @@ __proc_dconn_timeout(
 \r
        /* Release the reference taken when sending. */\r
        __deref_conn( p_conn );\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -2738,7 +2738,7 @@ __format_mad_req_path(
        IN              const   uint8_t                                         ack_delay,\r
                OUT                     req_path_info_t* const          p_req_path )\r
 {\r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_req_path->local_lid = p_path_rec->slid;\r
        p_req_path->remote_lid = p_path_rec->dlid;\r
@@ -2765,7 +2765,7 @@ __format_mad_req_path(
 \r
        conn_req_path_clr_rsvd_fields( p_req_path );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -2777,7 +2777,7 @@ __format_mad_req(
 {\r
        ib_api_status_t status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        if( p_cm_req->p_alt_path )\r
        {\r
@@ -2785,7 +2785,7 @@ __format_mad_req(
                if( ib_path_rec_mtu( p_cm_req->p_primary_path ) !=\r
                        ib_path_rec_mtu( p_cm_req->p_alt_path ) )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("Mismatched primary and alternate path MTUs.\n") );\r
                        return IB_INVALID_SETTING;\r
                }\r
@@ -2797,7 +2797,7 @@ __format_mad_req(
 \r
                if( status != IB_SUCCESS )\r
                {\r
-                       CL_EXIT( AL_DBG_ERROR, g_al_dbg_lvl );\r
+                       AL_EXIT( AL_DBG_ERROR );\r
                        return status;\r
                }\r
        }\r
@@ -2814,7 +2814,7 @@ __format_mad_req(
 \r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_EXIT( AL_DBG_ERROR, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_ERROR );\r
                return status;\r
        }\r
 \r
@@ -2861,7 +2861,7 @@ __format_mad_rep(
        IN              const   ib_cm_rep_t* const                      p_cm_rep,\r
        IN      OUT                     al_conn_t* const                        p_conn )\r
 {\r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_conn->mads.rep.hdr.attr_id = CM_REP_ATTR_ID;\r
        p_conn->mads.rep.local_comm_id = p_conn->local_comm_id;\r
@@ -2905,7 +2905,7 @@ __format_mad_rep(
 \r
        conn_rep_clr_rsvd_fields( &p_conn->mads.rep );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -2915,7 +2915,7 @@ __format_mad_rtu(
        IN              const   ib_cm_rtu_t* const                      p_cm_rtu,\r
        IN      OUT                     al_conn_t* const                        p_conn )\r
 {\r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_conn->mads.rtu.hdr.attr_id = CM_RTU_ATTR_ID;\r
 \r
@@ -2926,7 +2926,7 @@ __format_mad_rtu(
        conn_rtu_set_pdata( p_cm_rtu->p_rtu_pdata, p_cm_rtu->rtu_length,\r
                &p_conn->mads.rtu );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -2939,7 +2939,7 @@ __conn_save_user_rep(
 {\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Cache the local QPN. */\r
        p_conn->p_req_info->local_qpn = p_conn->h_qp->num;\r
@@ -2948,7 +2948,7 @@ __conn_save_user_rep(
        status = __validate_primary_path( p_conn, pp_port_cm );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Primary path validation failed: %s.\n", ib_get_err_str(status)) );\r
 \r
                /* Reject and abort the connection. */\r
@@ -2960,7 +2960,7 @@ __conn_save_user_rep(
                status = __validate_alt_path( p_conn );\r
                if( status != IB_SUCCESS )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("Alternate path validation failed: %s.\n",\r
                                ib_get_err_str(status)) );\r
 \r
@@ -2975,7 +2975,7 @@ __conn_save_user_rep(
 \r
        if( p_cm_rep->qp_type != p_conn->p_req_info->xport_type )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,      ("qp_type mistach!\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,      ("qp_type mistach!\n") );\r
                return IB_REJ_INVALID_XPORT;\r
        }\r
 \r
@@ -2989,7 +2989,7 @@ __conn_save_user_rep(
        set_al_obj_timeout( &p_cm_rep->h_qp->obj,\r
                p_conn->retry_timeout * p_conn->max_cm_retries + 2000 );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return 0;\r
 }\r
 \r
@@ -3003,13 +3003,13 @@ __conn_save_user_rtu(
 {\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        status = __get_port_attr( &p_conn->path[0].sgid, p_conn->path[0].slid,\r
                pp_port_cm, NULL );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__get_port_attr returned %s.\n", ib_get_err_str(status)) );\r
                /*\r
                 * Don't fail the connection since the remote side will repeat\r
@@ -3023,7 +3023,7 @@ __conn_save_user_rtu(
 \r
        cm_save_rtu_qp_attr( p_cm_rtu, &p_conn->p_req_info->qp_mod_rtr );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -3038,7 +3038,7 @@ __format_mad_lap_path(
        IN              const   uint8_t                                         ack_delay,\r
                OUT                     lap_path_info_t* const          p_lap_path )\r
 {\r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_lap_path->local_lid = p_path_rec->slid;\r
        p_lap_path->remote_lid = p_path_rec->dlid;\r
@@ -3066,7 +3066,7 @@ __format_mad_lap_path(
 \r
        conn_lap_path_clr_rsvd_fields( p_lap_path );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -3086,7 +3086,7 @@ __validate_lap_path(
        cm_port_agent_t         *p_port_cm;\r
        ib_ca_attr_t            *p_ca_attr, *p_alt_ca_attr;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        CL_ASSERT( p_conn );\r
        CL_ASSERT( pp_port_cm );\r
@@ -3097,7 +3097,7 @@ __validate_lap_path(
        if( status != IB_SUCCESS )\r
        {\r
                /* Primary path invalid.  Should have received a path migration. */\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Primary connection path invalid!\n") );\r
                return IB_INVALID_SETTING;\r
        }\r
@@ -3107,7 +3107,7 @@ __validate_lap_path(
        if( status != IB_SUCCESS )\r
        {\r
                /* Alternate path invalid. */\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Alternate path invalid!\n") );\r
                return status;\r
        }\r
@@ -3119,14 +3119,14 @@ __validate_lap_path(
        if( p_ca_attr->ca_guid != p_alt_ca_attr->ca_guid )\r
        {\r
                /* Paths are not on the same CA. */\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Primary and alternate paths must be on the same CA.\n") );\r
                return IB_INVALID_SETTING;\r
        }\r
 \r
        *p_ack_delay = p_ca_attr->local_ack_delay;\r
        *pp_port_cm = p_port_cm;\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -3136,7 +3136,7 @@ __format_mad_dreq(
        IN              const   ib_cm_dreq_t* const                     p_cm_dreq,\r
                OUT                     al_conn_t*              const           p_conn )\r
 {\r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_conn->mads.dreq.hdr.attr_id = CM_DREQ_ATTR_ID;\r
        p_conn->mads.dreq.local_comm_id = p_conn->local_comm_id;\r
@@ -3146,7 +3146,7 @@ __format_mad_dreq(
                &p_conn->mads.dreq );\r
        conn_dreq_clr_rsvd_fields( &p_conn->mads.dreq );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 void\r
@@ -3154,7 +3154,7 @@ __format_mad_drep(
        IN              const   ib_cm_drep_t*   const           p_cm_drep,\r
                OUT                     al_conn_t*              const           p_conn )\r
 {\r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_conn->mads.drep.hdr.attr_id = CM_DREP_ATTR_ID;\r
        p_conn->mads.drep.local_comm_id = p_conn->local_comm_id;\r
@@ -3162,7 +3162,7 @@ __format_mad_drep(
        conn_drep_set_pdata( p_cm_drep->p_drep_pdata, p_cm_drep->drep_length,\r
                &p_conn->mads.drep );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -3174,7 +3174,7 @@ cm_conn_mra(
        ib_api_status_t         status;\r
        cm_port_agent_t         *p_port_cm;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        switch( p_conn->state )\r
        {\r
@@ -3198,7 +3198,7 @@ cm_conn_mra(
 \r
        default:\r
                /* Invalid state.  Fail the request. */\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Invalid state for sending MRA.\n") );\r
                return IB_INVALID_STATE;\r
        }\r
@@ -3218,14 +3218,14 @@ cm_conn_mra(
                p_conn->path[p_conn->idx_primary].slid, &p_port_cm, NULL );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__get_port_attr for MRA returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
 \r
        status = __cm_send( p_port_cm, p_conn );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return status;\r
 }\r
 \r
@@ -3238,7 +3238,7 @@ void
 __conn_abort(\r
        IN                              al_conn_t* const                        p_conn )\r
 {\r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        switch( p_conn->state )\r
        {\r
@@ -3286,7 +3286,7 @@ __conn_abort(
                /* Should never get here. */\r
                break;\r
        }\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -3322,7 +3322,7 @@ __conn_save_user_req(
        struct _qp_rts          *p_rts;\r
        uint8_t                         pkt_life;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Format the request info. */\r
        p_conn->p_req_info->svc_id = p_cm_req->svc_id;\r
@@ -3337,7 +3337,7 @@ __conn_save_user_req(
                        (uint8_t*)cl_malloc( p_cm_req->compare_length );\r
                if( !p_conn->p_req_info->p_compare_buffer )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("cl_malloc failed for compare buffer [%d bytes].\n",\r
                                p_cm_req->compare_length) );\r
                        return IB_INSUFFICIENT_MEMORY;\r
@@ -3408,7 +3408,7 @@ __conn_save_user_req(
        status = __validate_primary_path( p_conn, pp_port_cm );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Primary path validation failure: %s\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -3419,7 +3419,7 @@ __conn_save_user_req(
                status = __validate_alt_path( p_conn );\r
                if( status != IB_SUCCESS )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("Alternate path validation failure: %s\n",\r
                                ib_get_err_str(status)) );\r
                        return status;\r
@@ -3481,7 +3481,7 @@ __conn_save_user_req(
                        &p_rtr->alternate_av );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -3511,12 +3511,12 @@ __cm_pre_req(
 {\r
        ib_api_status_t status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Exported QPs have done this in user-mode already. */\r
        if( AL_OBJ_IS_SUBTYPE( p_conn->h_qp, AL_OBJ_SUBTYPE_UM_EXPORT ) )\r
        {\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return IB_SUCCESS;\r
        }\r
 \r
@@ -3529,12 +3529,12 @@ __cm_pre_req(
                (IB_AC_RDMA_READ | IB_AC_RDMA_WRITE | IB_AC_LOCAL_WRITE | IB_AC_MW_BIND) );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cm_init_qp returned %s\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -3547,12 +3547,12 @@ __cm_pre_rep(
 {\r
        ib_api_status_t status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Exported QPs have done this in user-mode already. */\r
        if( AL_OBJ_IS_SUBTYPE( p_conn->h_qp, AL_OBJ_SUBTYPE_UM_EXPORT ) )\r
        {\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return IB_SUCCESS;\r
        }\r
 \r
@@ -3561,7 +3561,7 @@ __cm_pre_rep(
                p_conn->path[0].pkey, p_cm_rep->access_ctrl );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cm_init_qp returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -3573,7 +3573,7 @@ __cm_pre_rep(
                        p_cm_rep->pp_recv_failure );\r
                if( status != IB_SUCCESS )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("ib_post_recv returned %s.\n", ib_get_err_str(status)) );\r
                        return status;\r
                }\r
@@ -3584,11 +3584,11 @@ __cm_pre_rep(
                &p_conn->p_req_info->qp_mod_rts );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cm_rts_qp returned %s.\n", ib_get_err_str(status)) );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return status;\r
 }\r
 \r
@@ -3600,12 +3600,12 @@ __cm_pre_rtu(
 {\r
        ib_api_status_t status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Exported QPs have done this in user-mode already. */\r
        if( AL_OBJ_IS_SUBTYPE( p_conn->h_qp, AL_OBJ_SUBTYPE_UM_EXPORT ) )\r
        {\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return IB_SUCCESS;\r
        }\r
 \r
@@ -3613,11 +3613,11 @@ __cm_pre_rtu(
                &p_conn->p_req_info->qp_mod_rts );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cm_rts_qp returned %s.\n", ib_get_err_str(status)) );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return status;\r
 }\r
 \r
@@ -3633,16 +3633,16 @@ ib_cm_listen(
 {\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_al, AL_OBJ_TYPE_H_AL ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_AL_HANDLE\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_AL_HANDLE\n") );\r
                return IB_INVALID_AL_HANDLE;\r
        }\r
        if( !p_cm_listen || !pfn_listen_err_cb || !ph_cm_listen )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -3653,7 +3653,7 @@ ib_cm_listen(
        if( status == IB_SUCCESS )\r
                deref_al_obj( &(*ph_cm_listen)->obj );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return status;\r
 }\r
 \r
@@ -3665,16 +3665,16 @@ ib_cm_rej(
        ib_api_status_t         status;\r
        al_conn_t                       *p_conn;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        if( !h_cm )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
        if( !p_cm_rej )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -3689,7 +3689,7 @@ ib_cm_rej(
        /* Release the reference taken for the callback. */\r
        __deref_conn( p_conn );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -3703,16 +3703,16 @@ ib_cm_mra(
        ib_api_status_t         status;\r
        al_conn_t                       *p_conn;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        if( !h_cm )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
        if( !p_cm_mra )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -3725,11 +3725,11 @@ ib_cm_mra(
        cm_res_release( p_conn );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__cm_send for MRA returned %s.\n", ib_get_err_str(status)) );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return status;\r
 }\r
 \r
@@ -3741,11 +3741,11 @@ ib_cm_req(
 {\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        if( !p_cm_req )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -3753,7 +3753,7 @@ ib_cm_req(
        if( ( p_cm_req->p_req_pdata ) &&\r
                ( p_cm_req->req_length > IB_REQ_PDATA_SIZE ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Invalid pdata length.\n") );\r
                return IB_INVALID_SETTING;\r
        }\r
@@ -3761,7 +3761,7 @@ ib_cm_req(
        /* Make sure there's a primary path.  Both SIDR and CM require it. */\r
        if( !p_cm_req->p_primary_path )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Invalid primary path record.\n") );\r
                return IB_INVALID_SETTING;\r
        }\r
@@ -3770,7 +3770,7 @@ ib_cm_req(
        switch( p_cm_req->qp_type )\r
        {\r
        default:\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("Invalid qp_type.\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Invalid qp_type.\n") );\r
                return IB_INVALID_SETTING;\r
 \r
        case IB_QPT_RELIABLE_CONN:\r
@@ -3778,7 +3778,7 @@ ib_cm_req(
                if( AL_OBJ_INVALID_HANDLE( p_cm_req->h_qp, AL_OBJ_TYPE_H_QP ) ||\r
                        (p_cm_req->h_qp->type != p_cm_req->qp_type) )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("IB_INVALID_QP_HANDLE\n") );\r
                        return IB_INVALID_QP_HANDLE;\r
                }\r
@@ -3789,7 +3789,7 @@ ib_cm_req(
        case IB_QPT_UNRELIABLE_DGRM:\r
                if( AL_OBJ_INVALID_HANDLE( p_cm_req->h_al, AL_OBJ_TYPE_H_AL ) )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("IB_INVALID_AL_HANDLE\n") );\r
                        return IB_INVALID_AL_HANDLE;\r
                }\r
@@ -3797,7 +3797,7 @@ ib_cm_req(
                break;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return status;\r
 }\r
 \r
@@ -3812,16 +3812,16 @@ ib_cm_rep(
        ib_al_handle_t          h_al;\r
        al_conn_t                       *p_conn;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        if( !h_cm_req )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
        if( !p_cm_rep )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -3839,11 +3839,11 @@ ib_cm_rep(
        if( ( p_cm_rep->p_rep_pdata ) &&\r
                ( p_cm_rep->rep_length > IB_REP_PDATA_SIZE ) )\r
        {\r
-               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl, ("Invalid pdata length.\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Invalid pdata length.\n") );\r
                cm_res_release( p_conn );\r
                __deref_conn( p_conn );\r
 \r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return IB_INVALID_SETTING;\r
        }\r
 \r
@@ -3851,7 +3851,7 @@ ib_cm_rep(
        if( p_conn->state != CM_CONN_REQ_RCVD &&\r
                p_conn->state != CM_CONN_REQ_MRA_SENT )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Connection in invalid state (%d).\n", p_conn->state) );\r
                /*\r
                 * The connection will get cleaned up by whatever put it in the\r
@@ -3867,7 +3867,7 @@ ib_cm_rep(
        switch( p_cm_rep->qp_type )\r
        {\r
        default:\r
-               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl, ("Invalid qp_type.\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Invalid qp_type.\n") );\r
                status = IB_INVALID_SETTING;\r
                break;\r
 \r
@@ -3876,7 +3876,7 @@ ib_cm_rep(
                if( AL_OBJ_INVALID_HANDLE( p_cm_rep->h_qp, AL_OBJ_TYPE_H_QP ) ||\r
                        (p_cm_rep->h_qp->type != p_cm_rep->qp_type) )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("IB_INVALID_QP_HANDLE\n") );\r
                        status = IB_INVALID_QP_HANDLE;\r
                }\r
@@ -3887,7 +3887,7 @@ ib_cm_rep(
                        (AL_OBJ_INVALID_HANDLE( p_cm_rep->h_qp, AL_OBJ_TYPE_H_QP ) ||\r
                        (p_cm_rep->h_qp->type != p_cm_rep->qp_type) ) )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("IB_INVALID_QP_HANDLE\n") );\r
                        status = IB_INVALID_QP_HANDLE;\r
                }\r
@@ -3899,7 +3899,7 @@ ib_cm_rep(
                cm_res_release( p_conn );\r
                __deref_conn( p_conn );\r
 \r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return status;\r
        }\r
 \r
@@ -3929,7 +3929,7 @@ ib_cm_rep(
        /* Release the reference taken for the callback. */\r
        __deref_conn( p_conn );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return status;\r
 }\r
 \r
@@ -3943,16 +3943,16 @@ ib_cm_rtu(
        al_conn_t                       *p_conn;\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        if( !h_cm_rep )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
        if( !p_cm_rtu )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -3964,7 +3964,7 @@ ib_cm_rtu(
        if( ( p_cm_rtu->p_rtu_pdata ) &&\r
                ( p_cm_rtu->rtu_length > IB_RTU_PDATA_SIZE ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Invalid pdata length.\n") );\r
 \r
                cm_res_release( p_conn );\r
@@ -3975,7 +3975,7 @@ ib_cm_rtu(
        if( p_conn->state != CM_CONN_REP_RCVD &&\r
                p_conn->state != CM_CONN_REP_MRA_SENT )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Connection in invalid state (%d) for RTU.\n", p_conn->state) );\r
 \r
                cm_res_release( p_conn );\r
@@ -3989,7 +3989,7 @@ ib_cm_rtu(
         */\r
        if( p_conn->p_sync_event )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Connection in invalid state. Sync call in progress.\n" ) );\r
 \r
                cm_res_release( p_conn );\r
@@ -4004,7 +4004,7 @@ ib_cm_rtu(
        /* Release the reference taken for the callback. */\r
        __deref_conn( p_conn );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -4017,11 +4017,11 @@ ib_cm_dreq(
        ib_api_status_t status;\r
        al_conn_t               *p_conn;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        if( !p_cm_dreq )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -4029,7 +4029,7 @@ ib_cm_dreq(
        switch( p_cm_dreq->qp_type )\r
        {\r
        default:\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("Invalid qp_type.\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Invalid qp_type.\n") );\r
                return IB_INVALID_SETTING;\r
 \r
        case IB_QPT_RELIABLE_CONN:\r
@@ -4037,7 +4037,7 @@ ib_cm_dreq(
                if( AL_OBJ_INVALID_HANDLE( p_cm_dreq->h_qp, AL_OBJ_TYPE_H_QP ) ||\r
                        (p_cm_dreq->h_qp->type != p_cm_dreq->qp_type) )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("IB_INVALID_QP_HANDLE\n") );\r
                        return IB_INVALID_QP_HANDLE;\r
                }\r
@@ -4046,7 +4046,7 @@ ib_cm_dreq(
 \r
        if( !((al_conn_qp_t*)p_cm_dreq->h_qp)->p_conn )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("No connection info!\n") );\r
 \r
                return IB_INVALID_SETTING;\r
@@ -4064,7 +4064,7 @@ ib_cm_dreq(
         */\r
        if( p_conn->state != CM_CONN_ESTABLISHED )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("Invalid state (%d) for sending DREQ.\n", p_conn->state) );\r
 \r
                cm_res_release( p_conn );\r
@@ -4074,7 +4074,7 @@ ib_cm_dreq(
        if( ( p_cm_dreq->p_dreq_pdata ) &&\r
                ( p_cm_dreq->dreq_length > IB_DREQ_PDATA_SIZE ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Invalid pdata length.\n") );\r
 \r
                cm_res_release( p_conn );\r
@@ -4100,7 +4100,7 @@ ib_cm_dreq(
        cm_res_release( p_conn );\r
        __deref_conn( p_conn );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return status;\r
 }\r
 \r
@@ -4114,16 +4114,16 @@ ib_cm_drep(
        al_conn_t               *p_conn;\r
        ib_api_status_t status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        if( !h_cm_dreq )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
        if( !p_cm_drep )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -4132,7 +4132,7 @@ ib_cm_drep(
        cm_res_acquire( p_conn );\r
        if( p_conn->state != CM_CONN_DREQ_RCVD )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("Invalid state (%d) for DREP.\n", p_conn->state) );\r
 \r
                cm_res_release( p_conn );\r
@@ -4147,7 +4147,7 @@ ib_cm_drep(
        /* Release the reference taken while processing. */\r
        __deref_conn( p_conn );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -4158,11 +4158,11 @@ ib_cm_lap(
 {\r
        ib_api_status_t status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        if( !p_cm_lap )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -4170,7 +4170,7 @@ ib_cm_lap(
        switch( p_cm_lap->qp_type )\r
        {\r
        default:\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("Invalid qp_type.\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Invalid qp_type.\n") );\r
                return IB_INVALID_SETTING;\r
 \r
        case IB_QPT_RELIABLE_CONN:\r
@@ -4178,7 +4178,7 @@ ib_cm_lap(
                if( AL_OBJ_INVALID_HANDLE( p_cm_lap->h_qp, AL_OBJ_TYPE_H_QP ) ||\r
                        (p_cm_lap->h_qp->type != p_cm_lap->qp_type) )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("IB_INVALID_QP_HANDLE\n") );\r
                        return IB_INVALID_QP_HANDLE;\r
                }\r
@@ -4188,13 +4188,13 @@ ib_cm_lap(
        /* Make sure a path was provided. */\r
        if( !p_cm_lap->p_alt_path )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("Path missing.\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Path missing.\n") );\r
                return IB_INVALID_SETTING;\r
        }\r
 \r
        status = cm_conn_lap( p_cm_lap );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return status;\r
 }\r
 \r
@@ -4206,16 +4206,16 @@ ib_cm_apr(
 {\r
        ib_api_status_t status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        if( !h_cm_lap )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
        if( !p_cm_apr )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -4223,7 +4223,7 @@ ib_cm_apr(
        switch( p_cm_apr->qp_type )\r
        {\r
        default:\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("Invalid qp_type.\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Invalid qp_type.\n") );\r
                return IB_INVALID_SETTING;\r
 \r
        case IB_QPT_RELIABLE_CONN:\r
@@ -4231,7 +4231,7 @@ ib_cm_apr(
                if( AL_OBJ_INVALID_HANDLE( p_cm_apr->h_qp, AL_OBJ_TYPE_H_QP ) ||\r
                        (p_cm_apr->h_qp->type != p_cm_apr->qp_type) )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("IB_INVALID_QP_HANDLE\n") );\r
                        return IB_INVALID_QP_HANDLE;\r
                }\r
@@ -4240,7 +4240,7 @@ ib_cm_apr(
 \r
        status = cm_conn_apr( h_cm_lap, p_cm_apr );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return status;\r
 }\r
 \r
@@ -4250,17 +4250,17 @@ ib_force_apm(
 {\r
        ib_api_status_t status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_qp, AL_OBJ_TYPE_H_QP ) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
                return IB_INVALID_QP_HANDLE;\r
        }\r
 \r
        status = cm_force_apm( h_qp );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return status;\r
 }\r
 \r
@@ -4278,16 +4278,16 @@ ib_cm_handoff(
        ib_api_status_t         status;\r
        al_conn_t                       *p_conn;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        if( !h_cm_req )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
        if( !svc_id )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("IB_INVALID_PARAMETER\n" ) );\r
                return IB_INVALID_PARAMETER;\r
        }\r
@@ -4296,7 +4296,7 @@ ib_cm_handoff(
 \r
        if( p_conn->state != CM_CONN_REQ_RCVD )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("State not valid for handoff\n" ) );\r
                return IB_INVALID_STATE;\r
        }\r
@@ -4304,14 +4304,14 @@ ib_cm_handoff(
        /* only the passive side or the server can handoff */\r
        if( p_conn->was_active == TRUE )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("State not valid for handoff\n" ) );\r
                return IB_INVALID_STATE;\r
        }\r
 \r
        if( p_conn->qp_type != IB_QPT_RELIABLE_CONN )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Invalid conn handle for handoff\n" ) );\r
                return IB_INVALID_STATE;\r
        }\r
@@ -4322,7 +4322,7 @@ ib_cm_handoff(
        /* Release the reference taken for the callback. */\r
        __deref_conn( p_conn );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return status;\r
 }\r
 \r
@@ -4365,7 +4365,7 @@ cm_conn_destroy(
        ib_api_status_t status;\r
        al_conn_t               *p_conn;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /*\r
         * We need to serialize with the destruction of the connection object.\r
@@ -4378,7 +4378,7 @@ cm_conn_destroy(
        {\r
                /* The connection object has already been unbound. */\r
                cl_spinlock_release( &gp_cm->obj.lock );\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return;\r
        }\r
 \r
@@ -4447,7 +4447,7 @@ cm_conn_destroy(
        }\r
 \r
        __deref_conn( p_conn );\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -4463,7 +4463,7 @@ __proc_conn_timeout(
        al_conn_t                       *p_conn;\r
        ib_cm_rej_rec_t         rej_rec;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_conn = PARENT_STRUCT( p_item, al_conn_t, timeout_item );\r
 \r
@@ -4493,14 +4493,14 @@ __proc_conn_timeout(
        default:\r
                /* Something changed our state, so ignore the timeout. */\r
                cm_res_release( p_conn );\r
-               CL_TRACE( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                        ("Connection in invalid state for send timeout.\n") );\r
                break;\r
        }\r
        /* Release the reference taken for the send. */\r
        __deref_conn( p_conn );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 /*\r
@@ -4512,7 +4512,7 @@ __proc_lap_timeout(
 {\r
        al_conn_t                       *p_conn;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_conn = PARENT_STRUCT( p_item, al_conn_t, timeout_item );\r
 \r
@@ -4541,14 +4541,14 @@ __proc_lap_timeout(
        default:\r
                cm_res_release( p_conn );\r
                /* Something changed our state, so ignore the timeout. */\r
-               CL_TRACE( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                        ("Connection in invalid state for send timeout.\n") );\r
                break;\r
        }\r
        /* Release the reference taken for the send. */\r
        __deref_conn( p_conn );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -4564,7 +4564,7 @@ __cm_conn_unbind(
 {\r
        ib_qp_handle_t  h_qp;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /*\r
         * See if we've already been unbound.  Note that if we haven't, then we\r
@@ -4589,7 +4589,7 @@ __cm_conn_unbind(
                deref_al_obj( &h_qp->obj );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -4604,7 +4604,7 @@ __conn_release(
        uint32_t                        timewait = 0;\r
        uint8_t                         pkt_life;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        switch( p_conn->state )\r
        {\r
@@ -4672,7 +4672,7 @@ __conn_release(
                /* Set the timer. */\r
                if( cl_timer_start( &p_conn->timer, timewait ) != CL_SUCCESS )\r
                {\r
-                       CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("Timer failed to start for comm_id( x%x )!\n",\r
                                p_conn->local_comm_id) );\r
                        /* Never mind the timer then, just release the connection now. */\r
@@ -4685,7 +4685,7 @@ __conn_release(
                break;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -4700,7 +4700,7 @@ __is_listen_valid(
        ib_port_attr_t          *p_port_attr;\r
        uint16_t                        i_pkey;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* A full wildcard listen should have been trapped elsewhere. */\r
        CL_ASSERT( !(p_info->ca_guid == IB_ALL_CAS &&\r
@@ -4714,7 +4714,7 @@ __is_listen_valid(
                p_info->ca_guid != p_ca_attr->ca_guid )\r
        {\r
                /* CA GUID is not wildcard and does not match. */\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return IB_INVALID_GUID;\r
        }\r
        /* CA GUID is either wildcard or matches. */\r
@@ -4726,7 +4726,7 @@ __is_listen_valid(
                p_info->port_guid != p_port_attr->port_guid )\r
        {\r
                /* Port GUID is not wildcard and does not match. */\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return IB_INVALID_GUID;\r
        }\r
        /* Port GUID is either wildcard or matches. */\r
@@ -4740,7 +4740,7 @@ __is_listen_valid(
                 * LID is not wildcard and does not match the LID range for\r
                 * the port.\r
                 */\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return IB_INVALID_LID;\r
        }\r
        /* LID is either wildcard or is within range. */\r
@@ -4749,7 +4749,7 @@ __is_listen_valid(
        if( p_info->pkey == IB_ALL_PKEYS )\r
        {\r
                /* PKey is wildcard. */\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return IB_SUCCESS;\r
        }\r
 \r
@@ -4759,12 +4759,12 @@ __is_listen_valid(
                if( p_info->pkey == p_port_attr->p_pkey_table[i_pkey] )\r
                {\r
                        /* PKey is valid for the port. */\r
-                       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+                       AL_EXIT( AL_DBG_CM );\r
                        return IB_SUCCESS;\r
                }\r
        }\r
        /* No PKey match. */\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_INVALID_PKEY;\r
 }\r
 \r
@@ -4780,7 +4780,7 @@ __port_cm_validate_listen(
        cm_port_agent_t         *p_port_cm;\r
        al_listen_t                     *p_listen;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_port_cm = PARENT_STRUCT(\r
                 PARENT_STRUCT( p_list_item, al_obj_t, pool_item ),\r
@@ -4789,7 +4789,7 @@ __port_cm_validate_listen(
 \r
        p_listen->err_code = __is_listen_valid( p_port_cm, &p_listen->info );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 \r
        return( p_listen->err_code == IB_SUCCESS ? CL_SUCCESS : CL_NOT_FOUND );\r
 }\r
@@ -4808,7 +4808,7 @@ __is_listen_bad(
        cl_list_item_t  *p_port_item;\r
        al_listen_t             *p_listen;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        UNUSED_PARAM( context );\r
        p_listen = PARENT_STRUCT( p_list_item, al_listen_t, list_item );\r
@@ -4819,7 +4819,7 @@ __is_listen_bad(
                p_listen->info.lid == IB_ALL_LIDS &&\r
                p_listen->info.pkey == IB_ALL_PKEYS )\r
        {\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_NOT_FOUND;\r
        }\r
 \r
@@ -4831,14 +4831,14 @@ __is_listen_bad(
                __port_cm_validate_listen, p_listen );\r
        if( p_port_item == cl_qlist_end( &gp_cm->obj.obj_list ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("Invalid listen found.\n") );\r
                /* Reference the listen and queue it for a callback. */\r
                ref_al_obj( &p_listen->obj );\r
                cl_async_proc_queue( gp_async_proc_mgr, &p_listen->async_item );\r
                return CL_SUCCESS;\r
        }\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 \r
        return CL_NOT_FOUND;\r
 }\r
@@ -4847,7 +4847,7 @@ __is_listen_bad(
 void\r
 __validate_listens( void )\r
 {\r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Move all invalid listens to a temporary list. */\r
        cl_spinlock_acquire( &gp_cm->obj.lock );\r
@@ -4855,7 +4855,7 @@ __validate_listens( void )
                &gp_cm->inactive_listen_list, __is_listen_bad, NULL );\r
        cl_spinlock_release( &gp_cm->obj.lock );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -4866,7 +4866,7 @@ __listen_err_cb(
        al_listen_t                     *p_listen;\r
        ib_listen_err_rec_t     err_rec;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_listen = PARENT_STRUCT( p_item, al_listen_t, async_item );\r
 \r
@@ -4881,7 +4881,7 @@ __listen_err_cb(
        /* Release the reference to the listen to allow destruction to complete. */\r
        deref_al_obj( &p_listen->obj );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -4946,18 +4946,18 @@ ib_cm_cancel(
        IN              const   ib_listen_handle_t                      h_cm_listen,\r
        IN              const   ib_pfn_destroy_cb_t                     pfn_destroy_cb OPTIONAL )\r
 {\r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_cm_listen, AL_OBJ_TYPE_H_LISTEN ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
 \r
        ref_al_obj( &h_cm_listen->obj );\r
        h_cm_listen->obj.pfn_destroy( &h_cm_listen->obj, pfn_destroy_cb );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -5061,7 +5061,7 @@ __validate_listen(
        cl_list_item_t          *p_port_item;\r
        al_listen_t                     listen;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /*\r
         * Check validity of CA GUID, Port GUID, LID, and PKey if any\r
@@ -5088,13 +5088,13 @@ __validate_listen(
                if( p_port_item == cl_qlist_end( &gp_cm->obj.obj_list ) )\r
                {\r
                        /* No port could accomodate the listen. */\r
-                       CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                                ("Invalid listen request.\n") );\r
                        return listen.err_code;\r
                }\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return __is_listen_unique( p_new_listen );\r
 }\r
 \r
@@ -5110,7 +5110,7 @@ cm_listen(
        al_listen_t                     *p_listen;\r
        size_t                          alloc_size;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        cl_spinlock_acquire( &gp_cm->obj.lock );\r
        /* Validate the listen paramters to make sure they are unique. */\r
@@ -5172,7 +5172,7 @@ cm_listen(
        {\r
                cl_spinlock_release( &gp_cm->obj.lock );\r
                p_listen->obj.pfn_destroy( &p_listen->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -5180,7 +5180,7 @@ cm_listen(
 \r
        *ph_cm_listen = p_listen;\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -5192,7 +5192,7 @@ cm_conn_rej(
 {\r
        ib_api_status_t ib_status = IB_SUCCESS;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        switch( p_conn->state )\r
        {\r
@@ -5208,7 +5208,7 @@ cm_conn_rej(
        default:\r
                break;\r
        }\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return ib_status;\r
 }\r
 \r
@@ -5263,13 +5263,13 @@ cm_conn_req(
        cl_event_t                      sync_event;\r
        cl_event_t                      *p_sync_event = NULL;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Get a connection object from the pool. */\r
        p_conn = __get_conn( h_al, p_cm_req->qp_type );\r
        if( !p_conn )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("__get_conn failed.\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("__get_conn failed.\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
 \r
@@ -5278,7 +5278,7 @@ cm_conn_req(
        if( ((al_conn_qp_t*)p_cm_req->h_qp)->p_conn )\r
        {\r
                cl_spinlock_release( &p_cm_req->h_qp->obj.lock );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("QP already connected.\n") );\r
                return IB_INVALID_STATE;\r
        }\r
@@ -5292,7 +5292,7 @@ cm_conn_req(
        if( status != IB_SUCCESS )\r
        {\r
                __deref_conn( p_conn );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__conn_save_user_req failed.\n") );\r
                return status;\r
        }\r
@@ -5302,7 +5302,7 @@ cm_conn_req(
        if( status != IB_SUCCESS )\r
        {\r
                __deref_conn( p_conn );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__format_mad_req failed.\n") );\r
                return status;\r
        }\r
@@ -5312,7 +5312,7 @@ cm_conn_req(
        if( status != IB_SUCCESS )\r
        {\r
                __deref_conn( p_conn );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__cm_pre_req returned %s\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -5350,7 +5350,7 @@ cm_conn_req(
                if( p_sync_event )\r
                        cl_event_destroy( p_sync_event );\r
 \r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__cm_send returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -5359,7 +5359,7 @@ cm_conn_req(
        /* wait on event if synchronous operation */\r
        if( p_sync_event )\r
        {\r
-               CL_TRACE( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                        ("event blocked on REQ...\n") );\r
                cl_event_wait_on( p_sync_event, EVENT_NO_TIMEOUT, FALSE );\r
 \r
@@ -5367,7 +5367,7 @@ cm_conn_req(
        }\r
 \r
        /* We will set the retry timer upon completion. */\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -5382,7 +5382,7 @@ cm_conn_rep(
        cm_port_agent_t         *p_port_cm;\r
        ib_rej_status_t         rej_status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        cl_spinlock_acquire( &p_cm_rep->h_qp->obj.lock );\r
        if( ((al_conn_qp_t*)p_cm_rep->h_qp)->p_conn )\r
@@ -5390,7 +5390,7 @@ cm_conn_rep(
                cl_spinlock_release( &p_cm_rep->h_qp->obj.lock );\r
                __conn_reject( p_conn, IB_REJ_INSUF_QP, NULL, 0, NULL );\r
 \r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("QP already connected.\n") );\r
                return IB_INVALID_QP_HANDLE;\r
        }\r
@@ -5406,7 +5406,7 @@ cm_conn_rep(
                /* Reject and abort the connection. */\r
                __conn_reject( p_conn, rej_status, NULL, 0, NULL );\r
 \r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__conn_save_user_rep failed.\n") );\r
                return IB_INVALID_SETTING;\r
        }\r
@@ -5418,7 +5418,7 @@ cm_conn_rep(
                /* Reject and abort the connection. */\r
                __conn_reject( p_conn, IB_REJ_INSUF_QP, NULL, 0, NULL );\r
 \r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__format_mad_rep failed.\n") );\r
                return status;\r
        }\r
@@ -5430,7 +5430,7 @@ cm_conn_rep(
                /* Reject and abort the connection. */\r
                __conn_reject( p_conn, IB_REJ_INSUF_QP, NULL, 0, NULL );\r
 \r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__cm_pre_req returned %s\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -5449,12 +5449,12 @@ cm_conn_rep(
                /* Reject and abort the connection. */\r
                __conn_reject( p_conn, IB_REJ_INSUF_QP, NULL, 0, NULL );\r
 \r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__cm_send returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -5468,13 +5468,13 @@ cm_conn_rtu(
        ib_api_status_t         status;\r
        cm_port_agent_t         *p_port_cm;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* save user info */\r
        status = __conn_save_user_rtu( p_cm_rtu, p_conn, &p_port_cm );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__conn_save_user_rtu returned %s.\n", ib_get_err_str(status)) );\r
                /*\r
                 * Don't fail the connection since the remote side will repeat\r
@@ -5493,7 +5493,7 @@ cm_conn_rtu(
                /* Reject and abort the connection. */\r
                __conn_reject( p_conn, IB_REJ_INSUF_QP, NULL, 0, NULL );\r
 \r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cm_pre_rtu to RTS returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -5506,7 +5506,7 @@ cm_conn_rtu(
        /* No need to check the send status since the RTU is unreliable. */\r
        __cm_send( p_port_cm, p_conn );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -5521,13 +5521,13 @@ cm_conn_lap(
        uint8_t                         ack_delay;\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_conn = ((al_conn_qp_t*)p_cm_lap->h_qp)->p_conn;\r
 \r
        if( !p_conn )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Invalid connection info.\n") );\r
                return IB_INVALID_STATE;\r
        }\r
@@ -5536,7 +5536,7 @@ cm_conn_lap(
        if( !p_conn->was_active )\r
        {\r
                /* Only the side that took the active role can initialte a LAP. */\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Only the active side of a connection can initiate a LAP.\n") );\r
 \r
                cm_res_release( p_conn );\r
@@ -5546,7 +5546,7 @@ cm_conn_lap(
        if( p_conn->state != CM_CONN_ESTABLISHED )\r
        {\r
                /* Only allow sending LAP if in the established state. */\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Invalid connection state (%d) for sending LAP.\n",\r
                        p_conn->state) );\r
 \r
@@ -5568,7 +5568,7 @@ cm_conn_lap(
        status = __validate_lap_path( p_conn, &p_port_cm, &ack_delay );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__validate_lap_path returned %s.\n", ib_get_err_str(status)) );\r
 \r
                cm_res_release( p_conn );\r
@@ -5580,7 +5580,7 @@ cm_conn_lap(
                &p_conn->mads.lap.alternate_path );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__format_mad_lap_path returned %s.\n", ib_get_err_str(status)) );\r
 \r
                cm_res_release( p_conn );\r
@@ -5598,7 +5598,7 @@ cm_conn_lap(
                &p_conn->mads.lap );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("lap pdata invalid.\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("lap pdata invalid.\n") );\r
 \r
                cm_res_release( p_conn );\r
                return status;\r
@@ -5622,7 +5622,7 @@ cm_conn_apr(
        uint8_t                         ack_delay;\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_conn = h_cm_lap;\r
 \r
@@ -5630,7 +5630,7 @@ cm_conn_apr(
        if( p_conn->was_active )\r
        {\r
                /* Only the side that took the active role can initiate a LAP. */\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Only the inactive side of a connection can initiate a APR.\n") );\r
 \r
                cm_res_release( p_conn );\r
@@ -5641,7 +5641,7 @@ cm_conn_apr(
        if( p_conn->state != CM_CONN_LAP_RCVD )\r
        {\r
                /* Only allow sending LAP if in the established state. */\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Invalid connection state (%d) for sending APR.\n",\r
                        p_conn->state) );\r
 \r
@@ -5652,7 +5652,7 @@ cm_conn_apr(
        status = __validate_lap_path( p_conn, &p_port_cm, &ack_delay );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__validate_lap_path returned %s.\n", ib_get_err_str(status)) );\r
 \r
                cm_res_release( p_conn );\r
@@ -5663,7 +5663,7 @@ cm_conn_apr(
        status = __cm_lap_qp( p_conn );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("lap failed on qp with %s.\n", ib_get_err_str(status)) );\r
 \r
                cm_res_release( p_conn );\r
@@ -5679,7 +5679,7 @@ cm_conn_apr(
                p_cm_apr->info_length, &p_conn->mads.apr );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("apr_info invalid\n") );\r
 \r
                cm_res_release( p_conn );\r
@@ -5689,7 +5689,7 @@ cm_conn_apr(
                p_cm_apr->apr_length, &p_conn->mads.apr );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("apr pdata invalid\n") );\r
 \r
                cm_res_release( p_conn );\r
@@ -5717,7 +5717,7 @@ cm_conn_dreq(
        ib_api_status_t status;\r
        cm_port_agent_t *p_port_cm;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_conn = ((al_conn_qp_t*)p_cm_dreq->h_qp)->p_conn;\r
 \r
@@ -5732,7 +5732,7 @@ cm_conn_dreq(
                p_conn->path[p_conn->idx_primary].slid, &p_port_cm, NULL );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__get_port_attr for DREQ returned %s.\n",\r
                        ib_get_err_str(status)) );\r
                return status;\r
@@ -5742,7 +5742,7 @@ cm_conn_dreq(
        status = __cm_send( p_port_cm, p_conn );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__cm_send for DREQ returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -5750,7 +5750,7 @@ cm_conn_dreq(
        /* Set the state. */\r
        p_conn->state = CM_CONN_DREQ_SENT;\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -5764,7 +5764,7 @@ cm_conn_drep(
        ib_api_status_t status;\r
        cm_port_agent_t *p_port_cm;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Format the DREP. */\r
        __format_mad_drep( p_cm_drep, p_conn );\r
@@ -5787,6 +5787,6 @@ cm_conn_drep(
                __cm_send( p_port_cm, p_conn );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return status;\r
 }\r
index f03560d1c12f3ff576d84c68a2139dacec7e2b0f..ee9d43bdd1f43eb297c2c06fd606fd5c4e55fb9f 100644 (file)
@@ -56,7 +56,7 @@ __validate_sidr_primary_path(
        ib_api_status_t         status;\r
        cm_port_agent_t         *p_port_cm;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        CL_ASSERT( p_conn );\r
        CL_ASSERT( p_conn->p_req_info );\r
@@ -66,7 +66,7 @@ __validate_sidr_primary_path(
                &p_port_cm, &p_conn->p_req_info->p_ca_attr );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__get_port_attr failed for primary path.\n") );\r
                return status;\r
        }\r
@@ -74,7 +74,7 @@ __validate_sidr_primary_path(
        p_conn->p_req_info->port_idx = p_port_cm->port_idx;\r
        *pp_port_cm = p_port_cm;\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -84,7 +84,7 @@ __format_sidr_mad_req(
        IN              const   ib_cm_req_t* const                      p_cm_req,\r
        IN      OUT                     al_conn_t* const                        p_conn )\r
 {\r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Format the rest of the REQ. */\r
        p_conn->mads.sidr_req.hdr.attr_id = CM_SIDR_REQ_ATTR_ID;\r
@@ -111,7 +111,7 @@ __sidr_conn_to_passive(
        IN      OUT                     al_conn_t* const                        p_conn,\r
        IN              const   mad_cm_sidr_req_t* const        p_req )\r
 {\r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Store pertinent information in the connection. */\r
        p_conn->remote_comm_id = p_req->req_id;\r
@@ -170,7 +170,7 @@ cm_sidr_req(
        al_conn_t                       *p_conn;\r
        cm_port_agent_t         *p_port_cm;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        CL_ASSERT( p_cm_req->pfn_cm_rep_cb );\r
 \r
@@ -178,7 +178,7 @@ cm_sidr_req(
        p_conn = __get_conn( h_al, p_cm_req->qp_type );\r
        if( !p_conn )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("__get_conn failed.\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("__get_conn failed.\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
 \r
@@ -205,7 +205,7 @@ cm_sidr_req(
        if( status != IB_SUCCESS )\r
        {\r
                __deref_conn( p_conn );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Primary path validation failure: %s\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -215,7 +215,7 @@ cm_sidr_req(
        if( status != IB_SUCCESS )\r
        {\r
                __deref_conn( p_conn );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__format_sidr_mad_req failed.\n") );\r
                return status;\r
        }\r
@@ -235,14 +235,14 @@ cm_sidr_req(
        {\r
                cm_res_release( p_conn );\r
                __deref_conn( p_conn );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__cm_send returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
        cm_res_release( p_conn );\r
 \r
        /* We will set the retry timer upon completion. */\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -254,7 +254,7 @@ __match_sidr_listen(
        mad_cm_sidr_req_t       *p_sidr_req;\r
        al_listen_t                     *p_listen;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        CL_ASSERT( p_list_item );\r
        CL_ASSERT( context );\r
@@ -267,14 +267,14 @@ __match_sidr_listen(
 \r
        if( p_sidr_req->hdr.class_ver != IB_MCLASS_CM_VER_2 )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("Class ver mismatch.\n") );\r
                return CL_NOT_FOUND;\r
        }\r
 \r
        if( p_sidr_req->sid != p_listen->info.svc_id )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl, ("Svc ID mismatch.\n") );\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM, ("Svc ID mismatch.\n") );\r
                return CL_NOT_FOUND;\r
        }\r
 \r
@@ -282,7 +282,7 @@ __match_sidr_listen(
                p_sidr_req->pkey &&\r
                ( p_sidr_req->pkey != p_listen->info.pkey ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl, ("pkey mismatch.\n") );\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM, ("pkey mismatch.\n") );\r
                return CL_NOT_FOUND;\r
        }\r
 \r
@@ -292,7 +292,7 @@ __match_sidr_listen(
                                p_listen->info.p_compare_buffer,\r
                                p_listen->info.compare_length ) )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                                ("Svc ID match but compare buffer mismatch.\n") );\r
                        return CL_NOT_FOUND;\r
                }\r
@@ -301,7 +301,7 @@ __match_sidr_listen(
        /* Reference the listen so that it doesn't go away. */\r
        ref_al_obj( &p_listen->obj );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -312,7 +312,7 @@ __format_sidr_req_rec(
 {\r
        mad_cm_sidr_req_t       *p_req;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        CL_ASSERT( p_mad );\r
        CL_ASSERT( p_req_rec );\r
@@ -327,7 +327,7 @@ __format_sidr_req_rec(
 \r
        p_req_rec->qp_type = IB_QPT_UNRELIABLE_DGRM;\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 void\r
@@ -339,7 +339,7 @@ __reject_sidr_req(
        mad_cm_sidr_req_t       *p_req;\r
        mad_cm_sidr_rep_t       *p_rep;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        CL_ASSERT( p_port_cm );\r
        CL_ASSERT( p_mad );\r
@@ -370,7 +370,7 @@ __reject_sidr_req(
 \r
        __cm_send_mad( p_port_cm, p_mad );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 void\r
@@ -383,7 +383,7 @@ __listen_sidr_req(
        mad_cm_sidr_req_t       *p_req;\r
        ib_cm_req_rec_t         req_rec;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        CL_ASSERT( p_port_cm );\r
        CL_ASSERT( p_listen );\r
@@ -401,7 +401,7 @@ __listen_sidr_req(
        {\r
                /* Reject the request for insufficient resources. */\r
                __reject_sidr_req( p_port_cm, p_mad, IB_SIDR_REJECT );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("REJ sent for insufficient resources.\n") );\r
                return;\r
        }\r
@@ -433,7 +433,7 @@ __listen_sidr_req(
        /* Return the REQ to the mad pool */\r
        ib_put_mad( p_mad );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 void\r
@@ -446,7 +446,7 @@ __process_cm_sidr_req(
        cl_list_item_t          *p_list_item;\r
        al_listen_t                     *p_listen;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_async_mad = PARENT_STRUCT( p_item, cm_async_mad_t, item );\r
        p_req = (mad_cm_sidr_req_t*)p_async_mad->p_mad->p_mad_buf;\r
@@ -475,12 +475,12 @@ __process_cm_sidr_req(
                cl_spinlock_release( &gp_cm->obj.lock );\r
                __reject_sidr_req( p_port_cm, p_async_mad->p_mad, IB_SIDR_UNSUPPORTED );\r
                cl_free( p_async_mad );\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("REQ received but no match found.\n") );\r
                return;\r
        }\r
 \r
-       CL_TRACE( AL_DBG_CM, g_al_dbg_lvl, ("REQ matched a listen.\n") );\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("REQ matched a listen.\n") );\r
 \r
        cl_spinlock_release( &gp_cm->obj.lock );\r
        p_listen = PARENT_STRUCT( p_list_item, al_listen_t, list_item );\r
@@ -488,7 +488,7 @@ __process_cm_sidr_req(
        deref_al_obj( &p_listen->obj );\r
        cl_free( p_async_mad );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -500,12 +500,12 @@ cm_sidr_rep(
        ib_api_status_t         status;\r
        ib_qp_attr_t            qp_attr;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Initialize the QP. */\r
        if( ( p_cm_rep->status == IB_SIDR_SUCCESS ) && !p_cm_rep->h_qp )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("Invalid h_qp\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Invalid h_qp\n") );\r
                return IB_INVALID_QP_HANDLE;\r
        }\r
 \r
@@ -514,7 +514,7 @@ cm_sidr_rep(
                &p_conn->mads.sidr_rep );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("Invalid p_data\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Invalid p_data\n") );\r
                return status;\r
        }\r
 \r
@@ -545,7 +545,7 @@ cm_sidr_rep(
                status = ib_query_qp( p_cm_rep->h_qp, &qp_attr );\r
                if( status != IB_SUCCESS )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("ib_query_qp failed with status %s\n",\r
                                ib_get_err_str(status)) );\r
                        return status;\r
@@ -572,12 +572,12 @@ cm_sidr_rep(
         */\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__cm_send returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -594,12 +594,12 @@ __sidr_rep_match(
        al_conn_t                       *p_conn;\r
        mad_cm_sidr_rep_t       *p_rep;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_conn = PARENT_STRUCT( p_list_item, al_conn_t, map_item );\r
        p_rep = (mad_cm_sidr_rep_t*)context;\r
 \r
-       CL_PRINT( AL_DBG_CM, g_al_dbg_lvl,\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                ("p_conn:: local_comm_id (x%x)\n"\r
                 "p_rep:: local_comm_id (x%x)\n",\r
                 p_conn->local_comm_id,\r
@@ -607,19 +607,19 @@ __sidr_rep_match(
 \r
        if( p_conn->local_comm_id != p_rep->req_id )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("Local comm ID mismatch.\n") );\r
                return CL_NOT_FOUND;\r
        }\r
 \r
        if( p_conn->p_req_info->svc_id != p_rep->sid )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("Service ID mismatch.\n") );\r
                return CL_NOT_FOUND;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -635,7 +635,7 @@ __process_cm_sidr_rep(
        al_conn_t                       *p_conn;\r
        ib_cm_rep_rec_t         rep_rec;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        p_async_mad = PARENT_STRUCT( p_item, cm_async_mad_t, item );\r
        p_rep = (mad_cm_sidr_rep_t*)p_async_mad->p_mad->p_mad_buf;\r
@@ -647,7 +647,7 @@ __process_cm_sidr_rep(
        cl_spinlock_release( &gp_cm->obj.lock );\r
        if( p_list_item == cl_qlist_end( &gp_cm->pending_list ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_WARNING, AL_DBG_CM,\r
                        ("REP received that could not be matched.\n") );\r
                ib_put_mad( p_async_mad->p_mad );\r
                cl_free( p_async_mad );\r
@@ -698,7 +698,7 @@ __process_cm_sidr_rep(
                break;\r
 \r
        default:\r
-               CL_TRACE( AL_DBG_CM, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM,\r
                        ("REP received in invalid state.\n") );\r
                cm_res_release( p_conn );\r
                break;\r
@@ -709,6 +709,6 @@ __process_cm_sidr_rep(
 \r
        ib_put_mad( p_async_mad->p_mad );\r
        cl_free( p_async_mad );\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
index a6a41363c1407f35f26a9e7a2e5452d72e1bb1b5..ca04be53ce150d13a361cb9d2cb2750a2c1d6f1b 100644 (file)
 #include "al_common.h"\r
 #include "al_cq.h"\r
 #include "al_debug.h"\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_dev.tmh"\r
+#endif\r
 #include "al_dev.h"\r
 #include "al_qp.h"\r
 #include "al_mgr.h"\r
@@ -140,7 +146,7 @@ al_dev_open(
        IO_STACK_LOCATION               *p_io_stack;\r
        ULONG                                   *p_ver;\r
 \r
-       CL_ENTER( AL_DBG_DEV, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_DEV );\r
 \r
        p_io_stack = IoGetCurrentIrpStackLocation( h_ioctl );\r
 \r
@@ -151,14 +157,14 @@ al_dev_open(
                !p_ver ||\r
                cl_ioctl_out_size( h_ioctl ) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("context already exists or bad parameters.\n") );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
        if( *p_ver != AL_IOCTL_VERSION )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Unsupported client version: %d\n", *p_ver) );\r
                return CL_INVALID_PARAMETER;\r
        }\r
@@ -168,7 +174,7 @@ al_dev_open(
                cl_zalloc( sizeof(al_dev_open_context_t) );\r
        if( !p_context )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cl_malloc( %d ) failed.\n", sizeof(al_dev_open_context_t)) );\r
                return CL_INSUFFICIENT_MEMORY;\r
        }\r
@@ -210,7 +216,7 @@ al_dev_open(
                cl_status = CL_INSUFFICIENT_RESOURCES;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_DEV, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_DEV );\r
        return cl_status;\r
 }\r
 \r
@@ -263,7 +269,7 @@ __proxy_cleanup_map(
        al_handle_t                             *p_h;\r
        size_t                                  i;\r
 \r
-       CL_ENTER( AL_DBG_DEV, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_DEV );\r
 \r
        cl_spinlock_acquire( &p_context->h_al->obj.lock );\r
        for( i = 0; i < cl_vector_get_size( &p_context->h_al->hdl_vector ); i++ )\r
@@ -300,7 +306,7 @@ __proxy_cleanup_map(
        }\r
        cl_spinlock_release( &p_context->h_al->obj.lock );\r
 \r
-       CL_EXIT( AL_DBG_DEV, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_DEV );\r
 }\r
 \r
 \r
@@ -311,7 +317,7 @@ al_dev_close(
        al_dev_open_context_t   *p_context;\r
        IO_STACK_LOCATION               *p_io_stack;\r
 \r
-       CL_ENTER( AL_DBG_DEV, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_DEV );\r
 \r
        p_io_stack = IoGetCurrentIrpStackLocation( h_ioctl );\r
 \r
@@ -319,7 +325,7 @@ al_dev_close(
        p_context = (al_dev_open_context_t*)p_io_stack->FileObject->FsContext;\r
        if( !p_context )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Client closed with a null open context .\n") );\r
                return CL_SUCCESS;\r
        }\r
@@ -350,7 +356,7 @@ al_dev_close(
                ASSERT( cl_status == IB_SUCCESS );\r
                if( cl_status != IB_SUCCESS )\r
                {\r
-                       AL_TRACE( AL_DBG_ERROR, ("Waiting on ref_cnt timed out!\n") );\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Waiting on ref_cnt timed out!\n") );\r
                        break;\r
                }\r
 #else\r
@@ -375,7 +381,7 @@ al_dev_close(
        __destroy_open_context( p_context );\r
        cl_free( p_context );\r
 \r
-       CL_EXIT( AL_DBG_DEV, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_DEV );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -430,12 +436,12 @@ al_dev_ioctl(
        void                            *p_open_context;\r
        IO_STACK_LOCATION       *p_io_stack;\r
 \r
-       CL_ENTER( AL_DBG_DEV, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_DEV );\r
 \r
        p_io_stack = IoGetCurrentIrpStackLocation( h_ioctl );\r
        p_open_context = p_io_stack->FileObject->FsContext;\r
 \r
-       CL_TRACE( AL_DBG_DEV, g_al_dbg_lvl,\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_DEV,\r
                ("al_dev_ioctl: buf_size (%ld) p_buf (%p).\n",\r
                cl_ioctl_in_size( h_ioctl ), cl_ioctl_in_buf( h_ioctl )) );\r
 \r
@@ -477,7 +483,7 @@ al_dev_ioctl(
                cl_ioctl_complete( h_ioctl, cl_status, ret_bytes );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_DEV, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_DEV );\r
        return cl_status;\r
 }\r
 \r
@@ -521,7 +527,7 @@ al_dev_cancel_ioctl(
                ph_ioctl = &p_context->h_misc_ioctl;\r
                break;\r
        default:\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("Invalid CB type\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Invalid CB type\n") );\r
                ph_ioctl = NULL;\r
                break;\r
        }\r
@@ -539,7 +545,7 @@ al_dev_cancel_ioctl(
        }\r
        cl_spinlock_release( &p_context->cb_lock );\r
 \r
-       CL_EXIT( AL_DBG_DEV, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_DEV );\r
 }\r
 \r
 \r
index 59b0d57fb0732bb43615eab35e1088ad42e6c765..d382cda12dddaec509223008f29289ba80d880bd 100644 (file)
 #include "al_pnp.h"\r
 #include "al_ioc_pnp.h"\r
 #include "al_debug.h"\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_ioc_pnp.tmh"\r
+#endif\r
 #include "ib_common.h"\r
 #include "al_mgr.h"\r
 #include "al_ca.h"\r
@@ -622,7 +628,7 @@ create_ioc_pnp(
        gp_ioc_pnp = (ioc_pnp_mgr_t*)cl_zalloc( sizeof(ioc_pnp_mgr_t) );\r
        if( !gp_ioc_pnp )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Failed to allocate IOC PnP manager.\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -633,7 +639,7 @@ create_ioc_pnp(
        if( status != IB_SUCCESS )\r
        {\r
                __free_ioc_pnp( &gp_ioc_pnp->obj );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__construct_ioc_pnp returned %s\n", ib_get_err_str( status )) );\r
                return status;\r
        }\r
@@ -643,7 +649,7 @@ create_ioc_pnp(
        if( status != IB_SUCCESS )\r
        {\r
                gp_ioc_pnp->obj.pfn_destroy( &gp_ioc_pnp->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -657,7 +663,7 @@ create_ioc_pnp(
        if( status != IB_SUCCESS )\r
        {\r
                gp_ioc_pnp->obj.pfn_destroy( &gp_ioc_pnp->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_reg_pnp failed with status %s.\n",\r
                        ib_get_err_str( status )) );\r
                return status;\r
@@ -709,7 +715,7 @@ __init_ioc_pnp(
        cl_status = cl_spinlock_init( &p_ioc_mgr->iou_pool_lock );\r
        if( cl_status != CL_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cl_spinlock_init returned %s\n", cl_status_text[cl_status]) );\r
                return ib_convert_cl_status( cl_status );\r
        }\r
@@ -717,7 +723,7 @@ __init_ioc_pnp(
        cl_status = cl_spinlock_init( &p_ioc_mgr->path_pool_lock );\r
        if( cl_status != CL_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cl_spinlock_init returned %s\n", cl_status_text[cl_status]) );\r
                return ib_convert_cl_status( cl_status );\r
        }\r
@@ -725,7 +731,7 @@ __init_ioc_pnp(
        cl_status = cl_spinlock_init( &p_ioc_mgr->ioc_pool_lock );\r
        if( cl_status != CL_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cl_spinlock_init returned %s\n", cl_status_text[cl_status]) );\r
                return ib_convert_cl_status( cl_status );\r
        }\r
@@ -735,7 +741,7 @@ __init_ioc_pnp(
                sizeof(iou_node_t), __init_iou, NULL, p_ioc_mgr );\r
        if( cl_status != CL_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cl_qpool_init returned %s\n", cl_status_text[cl_status]) );\r
                return ib_convert_cl_status( cl_status );\r
        }\r
@@ -744,7 +750,7 @@ __init_ioc_pnp(
                sizeof(iou_path_t), NULL, NULL, NULL );\r
        if( cl_status != CL_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cl_qpool_init returned %s\n", cl_status_text[cl_status]) );\r
                return ib_convert_cl_status( cl_status );\r
        }\r
@@ -753,7 +759,7 @@ __init_ioc_pnp(
                sizeof(iou_ioc_t), NULL, NULL, NULL );\r
        if( cl_status != CL_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cl_qpool_init returned %s\n", cl_status_text[cl_status]) );\r
                return ib_convert_cl_status( cl_status );\r
        }\r
@@ -763,7 +769,7 @@ __init_ioc_pnp(
                __ioc_pnp_timer_cb, p_ioc_mgr );\r
        if( cl_status != CL_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cl_timer_init failed with %s\n", cl_status_text[cl_status]) );\r
                return ib_convert_cl_status( cl_status );\r
        }\r
@@ -772,7 +778,7 @@ __init_ioc_pnp(
                __destroying_ioc_pnp, NULL, __free_ioc_pnp );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("init_al_obj returned %s\n", ib_get_err_str( status )) );\r
                return status;\r
        }\r
@@ -1268,7 +1274,7 @@ __init_ioc_pnp_svc(
        h_ca = acquire_ca( p_pnp_port_rec->p_ca_attr->ca_guid );\r
        if( !h_ca )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_PNP, ("acquire_ca failed.\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("acquire_ca failed.\n") );\r
                return IB_INVALID_GUID;\r
        }\r
        p_ioc_pnp_svc->obj.p_ci_ca = h_ca->obj.p_ci_ca;\r
@@ -1297,7 +1303,7 @@ __init_ioc_pnp_svc(
        /* Check for failure allocating the QP. */\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_get_spl_qp failed with status %s\n",\r
                        ib_get_err_str( status )) );\r
                return status;\r
@@ -1315,7 +1321,7 @@ __init_ioc_pnp_svc(
                &p_ioc_pnp_svc->h_mad_svc );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_reg_mad_svc failed with status %s\n",\r
                        ib_get_err_str( status )) );\r
                return status;\r
@@ -1342,7 +1348,7 @@ __create_ioc_pnp_svc(
        p_ioc_pnp_svc = (ioc_pnp_svc_t*)cl_zalloc( sizeof(ioc_pnp_svc_t) );\r
        if( !p_ioc_pnp_svc )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Failed to cl_zalloc port CM agent.\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -1354,7 +1360,7 @@ __create_ioc_pnp_svc(
        if( status != IB_SUCCESS )\r
        {\r
                __free_ioc_pnp_svc( &p_ioc_pnp_svc->obj );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("init_al_obj failed with status %s.\n",\r
                        ib_get_err_str( status )) );\r
                return status;\r
@@ -1365,7 +1371,7 @@ __create_ioc_pnp_svc(
        if( status != IB_SUCCESS )\r
        {\r
                p_ioc_pnp_svc->obj.pfn_destroy( &p_ioc_pnp_svc->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -1374,7 +1380,7 @@ __create_ioc_pnp_svc(
        if( status != IB_SUCCESS )\r
        {\r
                p_ioc_pnp_svc->obj.pfn_destroy( &p_ioc_pnp_svc->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("__init_data_svc failed with status %s.\n",\r
                        ib_get_err_str( status )) );\r
                return status;\r
@@ -1448,7 +1454,7 @@ __ioc_pnp_timer_cb(
 \r
        if( p_mgr->obj.state == CL_DESTROYING )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_PNP,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_INFORMATION, AL_DBG_PNP,\r
                        ("Destroying - not resetting timer.\n") );\r
                return;\r
        }\r
@@ -1501,7 +1507,7 @@ __ioc_query_sa(
 \r
        if( p_svc->obj.state == CL_DESTROYING )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_PNP,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_INFORMATION, AL_DBG_PNP,\r
                        ("Destroying - not resetting timer.\n") );\r
                return IB_NOT_DONE;\r
        }\r
@@ -1533,7 +1539,7 @@ __ioc_query_sa(
        {\r
                cl_atomic_dec( &p_svc->query_cnt );\r
                deref_al_obj( &p_svc->obj );\r
-               AL_TRACE_EXIT( AL_DBG_PNP | AL_DBG_WARN,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_WARNING, AL_DBG_PNP,\r
                        ("ib_query returned %s\n", ib_get_err_str( status )) );\r
                return status;\r
        }\r
@@ -1561,7 +1567,7 @@ __ioc_query_sa(
        {\r
                cl_atomic_dec( &p_svc->query_cnt );\r
                deref_al_obj( &p_svc->obj );\r
-               AL_TRACE_EXIT( AL_DBG_PNP | AL_DBG_WARN,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_WARNING, AL_DBG_PNP,\r
                        ("ib_query returned %s\n", ib_get_err_str( status )) );\r
        }\r
 \r
@@ -1962,7 +1968,7 @@ __query_ious(
                        MAD_BLOCK_SIZE, &p_mad );\r
                if( status != IB_SUCCESS )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("ib_get_mad for IOU Info query returned %s.\n",\r
                                ib_get_err_str( status )) );\r
                        break;\r
@@ -1988,7 +1994,7 @@ __query_ious(
        status = ib_send_mad( p_results->p_svc->h_mad_svc, p_mad_list, &p_mad );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_send_mad returned %s\n", ib_get_err_str( status )) );\r
 \r
                /* If some sends succeeded, change the status. */\r
@@ -2960,7 +2966,7 @@ __report_iou_add(
        p_rec = cl_zalloc( event.rec_size * 2 );\r
        if( !p_rec )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Failed to allocate user record.\n") );\r
                return;\r
        }\r
@@ -3250,7 +3256,7 @@ ioc_pnp_process_dereg(
        default:\r
                CL_ASSERT( pnp_get_class( p_reg->pnp_class ) == IB_PNP_IOU ||\r
                        pnp_get_class( p_reg->pnp_class ) == IB_PNP_IOC );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("Invalid PnP registartion type.\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Invalid PnP registartion type.\n") );\r
        }\r
 \r
        /* Release the reference we took for processing the deregistration. */\r
index 2ca546965882ff0c22532ac0fa984dad9aceb049..ca0a0b250bb06e43b4dce82b40193a2d916ad657 100644 (file)
 #include "al.h"\r
 #include "al_ci_ca.h"\r
 #include "al_debug.h"\r
+\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_mad_pool.tmh"\r
+#endif\r
+\r
 #include "al_mad_pool.h"\r
 #include "al_pd.h"\r
 #include "al_verbs.h"\r
@@ -108,16 +116,16 @@ ib_create_mad_pool(
        ib_pool_handle_t                h_pool;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_POOL );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_al, AL_OBJ_TYPE_H_AL ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_AL_HANDLE\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_AL_HANDLE\n") );\r
                return IB_INVALID_AL_HANDLE;\r
        }\r
        if( !ph_pool )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -145,7 +153,7 @@ ib_create_mad_pool(
        if( status != IB_SUCCESS )\r
        {\r
                __free_pool( &h_pool->obj );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("init_al_obj failed with status %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -155,7 +163,7 @@ ib_create_mad_pool(
        if( status != IB_SUCCESS )\r
        {\r
                h_pool->obj.pfn_destroy( &h_pool->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -173,7 +181,7 @@ ib_create_mad_pool(
        /* Release the reference taken in init_al_obj. */\r
        deref_al_obj( &h_pool->obj );\r
 \r
-       CL_EXIT( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_POOL );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -189,7 +197,7 @@ __destroying_pool(
        ib_pool_handle_t                h_pool;\r
        ib_al_handle_t                  h_al;\r
 \r
-       CL_ENTER( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_POOL );\r
 \r
        CL_ASSERT( p_obj );\r
        h_pool = PARENT_STRUCT( p_obj, al_pool_t, obj );\r
@@ -201,7 +209,7 @@ __destroying_pool(
        /* Deregister this MAD pool from all protection domains. */\r
        al_dereg_pool( h_al, h_pool );\r
 \r
-       CL_EXIT( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_POOL );\r
 }\r
 \r
 \r
@@ -238,11 +246,11 @@ ib_destroy_mad_pool(
        al_obj_t*                               p_obj;\r
        boolean_t                               busy;\r
 \r
-       CL_ENTER( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_POOL );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_pool, AL_OBJ_TYPE_H_MAD_POOL ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
 \r
@@ -261,7 +269,7 @@ ib_destroy_mad_pool(
        /* Return an error if the pool is busy. */\r
        if( busy )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("h_pool (0x%p) is busy!.\n", h_pool) );\r
                return IB_RESOURCE_BUSY;\r
        }\r
@@ -269,7 +277,7 @@ ib_destroy_mad_pool(
        ref_al_obj( &h_pool->obj );\r
        h_pool->obj.pfn_destroy( &h_pool->obj, NULL );\r
 \r
-       CL_EXIT( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_POOL );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -286,17 +294,17 @@ ib_reg_mad_pool(
 {\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_POOL );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_pool, AL_OBJ_TYPE_H_MAD_POOL ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
        /* Alias keys require an alias PD. */\r
        if( AL_OBJ_INVALID_HANDLE( h_pd, AL_OBJ_TYPE_H_PD ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PD_HANDLE\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PD_HANDLE\n") );\r
                return IB_INVALID_PD_HANDLE;\r
        }\r
 \r
@@ -305,7 +313,7 @@ ib_reg_mad_pool(
        if( status == IB_SUCCESS )\r
                deref_al_obj( &(*pp_pool_key)->obj );\r
 \r
-       CL_EXIT( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_POOL );\r
        return status;\r
 }\r
 \r
@@ -321,11 +329,11 @@ reg_mad_pool(
        ib_api_status_t                 status;\r
        al_key_type_t                   key_type;\r
 \r
-       CL_ENTER( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_POOL );\r
 \r
        if( !pp_pool_key )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -352,7 +360,7 @@ reg_mad_pool(
        {\r
                __free_pool_key( &p_pool_key->obj );\r
 \r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("init_al_obj failed with status %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -380,7 +388,7 @@ reg_mad_pool(
                if( status != IB_SUCCESS )\r
                {\r
                        p_pool_key->obj.pfn_destroy( &p_pool_key->obj, NULL );\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("ib_reg_phys returned %s\n", ib_get_err_str( status )) );\r
                        return status;\r
                }\r
@@ -400,7 +408,7 @@ reg_mad_pool(
        {\r
                p_pool_key->obj.pfn_destroy( &p_pool_key->obj, NULL );\r
 \r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -428,7 +436,7 @@ reg_mad_pool(
        /* Return the pool key. */\r
        *pp_pool_key = (ib_pool_key_t)p_pool_key;\r
 \r
-       CL_EXIT( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_POOL );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -509,7 +517,7 @@ __cleanup_pool_key(
                        status = ib_put_mad( p_mad_element_list );\r
                        if( status != IB_SUCCESS )\r
                        {\r
-                               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                        ("ib_put_mad failed with status %s, continuing.\n",\r
                                        ib_get_err_str(status)) );\r
                        }\r
@@ -563,11 +571,11 @@ ib_dereg_mad_pool(
 {\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_POOL );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( pool_key, AL_OBJ_TYPE_H_POOL_KEY ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -577,7 +585,7 @@ ib_dereg_mad_pool(
        if( status != IB_SUCCESS )\r
                deref_al_obj( &pool_key->obj );\r
 \r
-       CL_EXIT( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_POOL );\r
        return status;\r
 }\r
 \r
@@ -588,27 +596,27 @@ ib_dereg_mad_pool(
  */\r
 ib_api_status_t\r
 dereg_mad_pool(\r
-       IN              const   ib_pool_key_t                           pool_key ,\r
+       IN              const   ib_pool_key_t                           pool_key,\r
        IN              const   al_key_type_t                           expected_type )\r
 {\r
-       CL_ENTER( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_POOL );\r
 \r
        if( pool_key->type != expected_type )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
        /* Check mad_cnt to see if MADs are still outstanding. */\r
        //if( pool_key->mad_cnt )\r
        //{\r
-       //      CL_TRACE_EXIT( AL_DBG_MAD_POOL, g_al_dbg_lvl, ("IB_RESOURCE_BUSY\n") );\r
+       //      AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_MAD_POOL, ("IB_RESOURCE_BUSY\n") );\r
        //      return IB_RESOURCE_BUSY;\r
        //}\r
 \r
        pool_key->obj.pfn_destroy( &pool_key->obj, NULL );\r
 \r
-       CL_EXIT( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_POOL );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -625,7 +633,7 @@ __get_mad_element(
        mad_item_t*                             p_mad_item;\r
        net32_t                                 lkey;\r
 \r
-       CL_ENTER( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_POOL );\r
 \r
        CL_ASSERT( pool_key );\r
        CL_ASSERT( pp_mad_element );\r
@@ -673,7 +681,7 @@ __get_mad_element(
        /* Return the MAD element. */\r
        *pp_mad_element = &p_mad_item->al_mad_element;\r
 \r
-       CL_EXIT( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_POOL );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -811,23 +819,23 @@ ib_get_mad(
        al_mad_element_t*               p_mad;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD_POOL );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( pool_key, AL_OBJ_TYPE_H_POOL_KEY ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
        if( !buf_size || !pp_mad_element )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
        status = __get_mad_element( pool_key, &p_mad );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_EXIT( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MAD_POOL );\r
                return status;\r
        }\r
 \r
@@ -849,7 +857,7 @@ ib_get_mad(
                if( !p_mad->p_al_mad_buf )\r
                {\r
                        __put_mad_element( p_mad );\r
-                       CL_EXIT( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+                       AL_EXIT( AL_DBG_MAD_POOL );\r
                        return IB_INSUFFICIENT_MEMORY;\r
                }\r
                p_mad->element.p_mad_buf = p_mad->p_al_mad_buf;\r
@@ -862,7 +870,7 @@ ib_get_mad(
        /* Return the MAD element to the client. */\r
        *pp_mad_element = &p_mad->element;\r
 \r
-       CL_EXIT( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD_POOL );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -876,7 +884,7 @@ ib_put_mad(
 \r
        if( !p_mad_element_list )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
index 2c9345dcb0a7e9bca1ad5dfef077fa37f96ffb32..5203c9a0958331e47aa8f5cc3503b1b5c8f7af52 100644 (file)
 #include "al.h"\r
 #include "al_cm_cep.h"\r
 #include "al_debug.h"\r
+\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_mgr.tmh"\r
+#endif\r
+\r
 #include "al_dm.h"\r
 #include "al_mad_pool.h"\r
 #include "al_mcast.h"\r
@@ -78,14 +86,14 @@ create_al_mgr()
        cl_status_t                             cl_status;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MGR );\r
 \r
        CL_ASSERT( !gp_al_mgr );\r
 \r
        gp_al_mgr = cl_zalloc( sizeof( al_mgr_t ) );\r
        if( !gp_al_mgr )\r
        {\r
-               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl, ("cl_zalloc failed.\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("cl_zalloc failed.\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
 \r
@@ -101,7 +109,7 @@ create_al_mgr()
        if( status != IB_SUCCESS )\r
        {\r
                __free_al_mgr( &gp_al_mgr->obj );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("init_al_obj failed, status = 0x%x.\n", status) );\r
                return status;\r
        }\r
@@ -110,7 +118,7 @@ create_al_mgr()
        if( cl_status != CL_SUCCESS )\r
        {\r
                gp_al_mgr->obj.pfn_destroy( &gp_al_mgr->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cl_spinlock_init failed\n") );\r
                return ib_convert_cl_status( cl_status );\r
        }\r
@@ -120,7 +128,7 @@ create_al_mgr()
        if( status != IB_SUCCESS )\r
        {\r
                gp_al_mgr->obj.pfn_destroy( &gp_al_mgr->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_open_al failed, status = 0x%x.\n", status) );\r
                return status;\r
        }\r
@@ -133,7 +141,7 @@ create_al_mgr()
        if( status != IB_SUCCESS )\r
        {\r
                gp_al_mgr->obj.pfn_destroy( &gp_al_mgr->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("al_pnp_create failed with %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -143,7 +151,7 @@ create_al_mgr()
        if( status != IB_SUCCESS )\r
        {\r
                gp_al_mgr->obj.pfn_destroy( &gp_al_mgr->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_create_mad_pool failed with %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -153,7 +161,7 @@ create_al_mgr()
        if( status != IB_SUCCESS )\r
        {\r
                gp_al_mgr->obj.pfn_destroy( &gp_al_mgr->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("create_res_mgr failed with %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -163,7 +171,7 @@ create_al_mgr()
        if( status != IB_SUCCESS )\r
        {\r
                gp_al_mgr->obj.pfn_destroy( &gp_al_mgr->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("create_spl_qp_mgr failed with %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -173,7 +181,7 @@ create_al_mgr()
        if( status != IB_SUCCESS )\r
        {\r
                gp_al_mgr->obj.pfn_destroy( &gp_al_mgr->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("create_sa_req_mgr failed, status = 0x%x.\n", status) );\r
                return status;\r
        }\r
@@ -183,7 +191,7 @@ create_al_mgr()
        if( status != IB_SUCCESS )\r
        {\r
                gp_al_mgr->obj.pfn_destroy( &gp_al_mgr->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("create_cm_mgr failed, status = 0x%x.\n", status) );\r
                return status;\r
        }\r
@@ -193,7 +201,7 @@ create_al_mgr()
        if( status != IB_SUCCESS )\r
        {\r
                gp_al_mgr->obj.pfn_destroy( &gp_al_mgr->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("create_dm_agent failed, status = 0x%x.\n", status) );\r
                return status;\r
        }\r
@@ -202,7 +210,7 @@ create_al_mgr()
        if( status != IB_SUCCESS )\r
        {\r
                gp_al_mgr->obj.pfn_destroy( &gp_al_mgr->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("create_ioc_pnp failed, status = 0x%x.\n", status) );\r
                return status;\r
        }\r
@@ -210,7 +218,7 @@ create_al_mgr()
        /* Release the reference taken in init_al_obj. */\r
        deref_al_obj( &gp_al_mgr->obj );\r
 \r
-       CL_EXIT( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MGR );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -247,22 +255,22 @@ ib_register_ca(
 {\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MGR );\r
 \r
        if( !p_ci )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
        CL_ASSERT( !find_ci_ca( p_ci->guid ) );\r
 \r
-       CL_TRACE( AL_DBG_MGR, g_al_dbg_lvl,\r
-               ("CA guid %"PRIx64".\n", p_ci->guid) );\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MGR,\r
+               ("CA guid %I64x.\n", p_ci->guid) );\r
 \r
        /* Check the channel interface verbs version. */\r
        if( p_ci->version != VERBS_VERSION )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_MGR, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Unsupported channel interface version, "\r
                         "expected = 0x%x, actual = 0x%x.\n",\r
                         VERBS_VERSION, p_ci->version) );\r
@@ -273,12 +281,12 @@ ib_register_ca(
        status = create_ci_ca( &gp_al_mgr->obj, p_ci );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("al_mgr_ca_init failed.\n") );\r
                return status;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MGR );\r
        return status;\r
 }\r
 \r
@@ -293,10 +301,10 @@ ib_deregister_ca(
 {\r
        al_ci_ca_t                      *p_ci_ca;\r
 \r
-       CL_ENTER( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MGR );\r
 \r
-       CL_TRACE( AL_DBG_MGR, g_al_dbg_lvl,\r
-               ("Deregistering CA guid %"PRIx64".\n", ca_guid) );\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MGR,\r
+               ("Deregistering CA guid %I64x.\n", ca_guid) );\r
 \r
        /* Locate the CA. */\r
        cl_spinlock_acquire( &gp_al_mgr->obj.lock );\r
@@ -305,7 +313,7 @@ ib_deregister_ca(
 \r
        if( !p_ci_ca )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("CA not found.\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("CA not found.\n") );\r
                return IB_NOT_FOUND;\r
        }\r
 \r
@@ -317,7 +325,7 @@ ib_deregister_ca(
        ref_al_obj( &p_ci_ca->obj );\r
        p_ci_ca->obj.pfn_destroy( &p_ci_ca->obj, NULL );\r
 \r
-       CL_EXIT( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MGR );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -354,11 +362,11 @@ ib_open_al(
        ib_api_status_t                 status;\r
        cl_status_t                             cl_status;\r
 \r
-       CL_ENTER( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MGR );\r
 \r
        if( !ph_al )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -366,7 +374,7 @@ ib_open_al(
        h_al = cl_zalloc( sizeof( ib_al_t ) );\r
        if( !h_al )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("cl_zalloc failed\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("cl_zalloc failed\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
 \r
@@ -405,14 +413,14 @@ ib_open_al(
        if( status != IB_SUCCESS )\r
        {\r
                free_al( &h_al->obj );\r
-               CL_EXIT( AL_DBG_MGR, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MGR );\r
                return status;\r
        }\r
        status = attach_al_obj( &gp_al_mgr->obj, &h_al->obj );\r
        if( status != IB_SUCCESS )\r
        {\r
                h_al->obj.pfn_destroy( &h_al->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -428,7 +436,7 @@ ib_open_al(
        /* Release the reference taken in init_al_obj. */\r
        deref_al_obj( &h_al->obj );\r
 \r
-       CL_EXIT( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MGR );\r
        return IB_SUCCESS;\r
 }\r
 \r
index 611c3e1b2ffc4025939edd58aa1a77eb5dc5ddac..8b85a0262cee4e15ae1cf8ded1f049642cd21358 100644 (file)
 #include <iba/ib_al.h>\r
 \r
 #include "al_debug.h"\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_mr.tmh"\r
+#endif\r
 #include "al_mr.h"\r
 #include "al_pd.h"\r
 #include "al_res_mgr.h"\r
@@ -161,13 +167,13 @@ mlnx_create_fmr(
 \r
        if( AL_OBJ_INVALID_HANDLE( h_pd, AL_OBJ_TYPE_H_PD ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PD_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PD_HANDLE\n") );\r
                return IB_INVALID_PD_HANDLE;\r
        }\r
 \r
        if( !p_fmr_create || !ph_fmr )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -175,7 +181,7 @@ mlnx_create_fmr(
        h_fmr = alloc_mlnx_fmr();\r
        if( !h_fmr )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("unable to allocate memory handle\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -184,7 +190,7 @@ mlnx_create_fmr(
        if( status != IB_SUCCESS )\r
        {\r
                h_fmr->obj.pfn_destroy( &h_fmr->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -194,7 +200,7 @@ mlnx_create_fmr(
        if( status != IB_SUCCESS )\r
        {\r
                h_fmr->obj.pfn_destroy( &h_fmr->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("unable to register memory: %s\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -222,13 +228,13 @@ mlnx_map_phys_fmr(
 \r
        if( AL_OBJ_INVALID_HANDLE( h_fmr, AL_OBJ_TYPE_H_FMR ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_FMR_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_FMR_HANDLE\n") );\r
                return IB_INVALID_FMR_HANDLE;\r
        }\r
 \r
        if( !paddr_list || !p_vaddr  || !p_lkey || !p_rkey )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -239,7 +245,7 @@ mlnx_map_phys_fmr(
        if( status != IB_SUCCESS )\r
        {\r
                //TODO: do we need to do something more about the error ?\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("unable to map FMR: %s\n", ib_get_err_str(status)) );\r
        }\r
 \r
@@ -260,7 +266,7 @@ mlnx_unmap_fmr(
 \r
        if( AL_OBJ_INVALID_HANDLE( h_fmr, AL_OBJ_TYPE_H_FMR ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_FMR_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_FMR_HANDLE\n") );\r
                return IB_INVALID_FMR_HANDLE;\r
        }\r
 \r
@@ -283,13 +289,13 @@ mlnx_destroy_fmr(
 \r
        if( AL_OBJ_INVALID_HANDLE( h_fmr, AL_OBJ_TYPE_H_FMR ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_FMR_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_FMR_HANDLE\n") );\r
                return IB_INVALID_FMR_HANDLE;\r
        }\r
 \r
        if( !verbs_check_mlnx_fmr( h_fmr ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_FMR_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_FMR_HANDLE\n") );\r
                return IB_INVALID_FMR_HANDLE;\r
        }\r
 \r
@@ -327,16 +333,16 @@ ib_create_shmid(
        net32_t                         rkey;\r
        ib_mr_handle_t          h_mr;\r
 \r
-       CL_ENTER( AL_DBG_MR, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MR );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_pd, AL_OBJ_TYPE_H_PD ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PD_HANDLE\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PD_HANDLE\n") );\r
                return IB_INVALID_PD_HANDLE;\r
        }\r
        if( !p_mr_create || !p_lkey || !p_rkey || !ph_mr )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -344,7 +350,7 @@ ib_create_shmid(
        status = ib_reg_mem( h_pd, p_mr_create, &lkey, &rkey, &h_mr );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("unable to register memory: %s\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -353,7 +359,7 @@ ib_create_shmid(
        h_mr->p_shmid = __create_shmid( shmid );\r
        if( !h_mr->p_shmid )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("unable to allocate shmid\n") );\r
                ib_dereg_mr( h_mr );\r
                return IB_INSUFFICIENT_MEMORY;\r
@@ -375,7 +381,7 @@ ib_create_shmid(
        *p_lkey = lkey;\r
        *p_rkey = rkey;\r
        *ph_mr = h_mr;\r
-       CL_EXIT( AL_DBG_MR, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MR );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -488,16 +494,16 @@ reg_shmid(
        net32_t                         rkey;\r
        ib_mr_handle_t          h_mr, h_reg_mr;\r
 \r
-       CL_ENTER( AL_DBG_MR, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MR );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_pd, AL_OBJ_TYPE_H_PD ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PD_HANDLE\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PD_HANDLE\n") );\r
                return IB_INVALID_PD_HANDLE;\r
        }\r
        if( !p_vaddr || !p_lkey || !p_rkey || !ph_mr )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -505,7 +511,7 @@ reg_shmid(
        status = acquire_shmid( h_pd->obj.p_ci_ca, shmid, &p_shmid );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("shmid not found: %s\n", ib_get_err_str(status)) );\r
                return IB_NOT_FOUND;\r
        }\r
@@ -520,7 +526,7 @@ reg_shmid(
        if( cl_is_list_empty( &p_shmid->mr_list ) )\r
        {\r
                /* There are no registrations left to share. */\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("shmid not found\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("shmid not found\n") );\r
                cl_spinlock_release( &p_shmid->obj.lock );\r
                release_shmid( p_shmid );\r
                return IB_NOT_FOUND;\r
@@ -538,8 +544,8 @@ reg_shmid(
                &lkey, &rkey, &h_mr );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
-                       ("unable to register shared memory: 0x%0"PRIx64" %s\n",\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
+                       ("unable to register shared memory: 0x%0I64x %s\n",\r
                                vaddr, ib_get_err_str(status)) );\r
                release_shmid( p_shmid );\r
                return status;\r
@@ -551,7 +557,7 @@ reg_shmid(
        cl_status = cl_list_insert_head( &p_shmid->mr_list, h_mr );\r
        if( cl_status != CL_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("insertion into shmid list failed\n") );\r
                cl_spinlock_release( &p_shmid->obj.lock );\r
                release_shmid( p_shmid );\r
@@ -566,7 +572,7 @@ reg_shmid(
        *p_lkey = lkey;\r
        *p_rkey = rkey;\r
        *ph_mr = h_mr;\r
-       CL_EXIT( AL_DBG_MR, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MR );\r
        return IB_SUCCESS;\r
 #endif\r
 }\r
index b24745d2a6d7edbb7ceaa089473e5977f9639127..bd0910dc2cf498c1ebeef285d2eeba5cdac80ba8 100644 (file)
 \r
 #include "al.h"\r
 #include "al_debug.h"\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_pnp.tmh"\r
+#endif\r
 #include "al_mgr.h"\r
 #include "al_pnp.h"\r
 #include "ib_common.h"\r
@@ -147,14 +153,14 @@ create_pnp(
        ib_api_status_t         status;\r
        cl_status_t                     cl_status;\r
 \r
-       CL_ENTER( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        CL_ASSERT( gp_pnp == NULL );\r
 \r
        gp_pnp = (al_pnp_mgr_t*)cl_zalloc( sizeof(al_pnp_mgr_t) );\r
        if( !gp_pnp )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Failed to allocate PnP manager.\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -169,7 +175,7 @@ create_pnp(
        if( cl_status != CL_SUCCESS )\r
        {\r
                __pnp_free( &gp_pnp->obj );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cl_ptr_vector_init failed with status %s.\n",\r
                        CL_STATUS_MSG( cl_status )) );\r
                return IB_ERROR;\r
@@ -181,7 +187,7 @@ create_pnp(
        if( status != IB_SUCCESS )\r
        {\r
                __pnp_free( &gp_pnp->obj );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("init_al_obj() failed with status %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -189,7 +195,7 @@ create_pnp(
        if( status != IB_SUCCESS )\r
        {\r
                gp_pnp->obj.pfn_destroy( &gp_pnp->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -197,7 +203,7 @@ create_pnp(
        /* Release the reference taken in init_al_obj. */\r
        deref_al_obj( &gp_pnp->obj );\r
 \r
-       CL_EXIT( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PNP );\r
        return( IB_SUCCESS );\r
 }\r
 \r
@@ -206,7 +212,7 @@ static void
 __pnp_free(\r
        IN                              al_obj_t                                        *p_obj )\r
 {\r
-       CL_ENTER( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        CL_ASSERT( PARENT_STRUCT( p_obj, al_pnp_mgr_t, obj ) == gp_pnp );\r
        CL_ASSERT( cl_is_qlist_empty( &gp_pnp->ca_reg_list ) );\r
@@ -221,7 +227,7 @@ __pnp_free(
        cl_free( gp_pnp );\r
        gp_pnp = NULL;\r
 \r
-       CL_EXIT( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PNP );\r
 }\r
 \r
 \r
@@ -251,7 +257,7 @@ __al_pnp_process_dereg(
 {\r
        al_pnp_t*               p_reg;\r
 \r
-       CL_ENTER( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        p_reg = PARENT_STRUCT( p_item, al_pnp_t, dereg_item );\r
 \r
@@ -269,14 +275,14 @@ __al_pnp_process_dereg(
        default:\r
                CL_ASSERT( pnp_get_class( p_reg->pnp_class ) == IB_PNP_CA ||\r
                        pnp_get_class( p_reg->pnp_class ) == IB_PNP_PORT );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Invalid PnP registartion type.\n") );\r
        }\r
 \r
        /* Release the reference we took for processing the deregistration. */\r
        deref_al_obj( &p_reg->obj );\r
 \r
-       CL_EXIT( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PNP );\r
 }\r
 \r
 \r
@@ -288,7 +294,7 @@ __pnp_reg_cleanup(
        cl_map_item_t   *p_item;\r
        IRP                             *p_irp;\r
 \r
-       CL_ENTER( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        p_reg = PARENT_STRUCT( p_obj, al_pnp_t, obj );\r
 \r
@@ -323,7 +329,7 @@ __pnp_reg_cleanup(
        /* Dereference the PnP manager. */\r
        deref_al_obj( &gp_pnp->obj );\r
 \r
-       CL_EXIT( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PNP );\r
 }\r
 \r
 \r
@@ -334,7 +340,7 @@ __pnp_reg_free(
        al_pnp_t                *p_reg;\r
        cl_map_item_t   *p_item;\r
 \r
-       CL_ENTER( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        p_reg = PARENT_STRUCT( p_obj, al_pnp_t, obj );\r
 \r
@@ -350,7 +356,7 @@ __pnp_reg_free(
        destroy_al_obj( &p_reg->obj );\r
        cl_free( p_reg );\r
 \r
-       CL_EXIT( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PNP );\r
 }\r
 \r
 \r
@@ -440,7 +446,7 @@ __pnp_notify_user(
                ib_pnp_port_rec_t       port_rec;\r
        }       u;\r
 \r
-       CL_ENTER( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        CL_ASSERT( p_reg );\r
        CL_ASSERT( p_context );\r
@@ -496,7 +502,7 @@ __pnp_notify_user(
 \r
        default:\r
                /* Invalid event type. */\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Invalid event type (%d).\n", p_event_rec->pnp_event) );\r
                CL_ASSERT( p_event_rec->pnp_event == IB_PNP_CA_ADD ||\r
                        p_event_rec->pnp_event == IB_PNP_PORT_ADD ||\r
@@ -527,7 +533,7 @@ __pnp_notify_user(
                cl_free( p_context );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PNP );\r
        return status;\r
 }\r
 \r
@@ -544,7 +550,7 @@ pnp_create_context(
        al_pnp_context_t        *p_context;\r
        cl_map_item_t           *p_item;\r
 \r
-       CL_ENTER( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        CL_ASSERT( p_reg );\r
 \r
@@ -552,8 +558,8 @@ pnp_create_context(
        p_context = (al_pnp_context_t*)cl_pzalloc( sizeof(al_pnp_context_t) );\r
        if( !p_context )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
-                       ("Failed to cl_zalloc al_pnp_context_t (%"PRIdSIZE_T" bytes).\n",\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
+                       ("Failed to cl_zalloc al_pnp_context_t (%I64d bytes).\n",\r
                        sizeof(al_pnp_context_t)) );\r
                return NULL;\r
        }\r
@@ -565,7 +571,7 @@ pnp_create_context(
        p_item = cl_qmap_insert( &p_reg->context_map, p_context->guid,\r
                &p_context->map_item );\r
 \r
-       CL_EXIT( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PNP );\r
        return p_context;\r
 }\r
 \r
@@ -585,7 +591,7 @@ __pnp_port_notify(
        ib_port_attr_t                  *p_port_attr;\r
        al_pnp_ca_event_t               event_rec;\r
 \r
-       CL_ENTER( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        event_rec.p_ci_ca = p_ci_ca;\r
 \r
@@ -639,7 +645,7 @@ __pnp_port_notify(
                        }\r
                }\r
        }\r
-       CL_EXIT( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PNP );\r
 }\r
 \r
 \r
@@ -654,7 +660,7 @@ __pnp_reg_notify(
        size_t                                  i;\r
        al_pnp_context_t                *p_context;\r
 \r
-       CL_ENTER( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        for( i = 0; i < cl_ptr_vector_get_size( &gp_pnp->ca_vector ); i++ )\r
        {\r
@@ -689,7 +695,7 @@ __pnp_reg_notify(
        /* Notify the user that the registration is complete. */\r
        pnp_reg_complete( p_reg );\r
 \r
-       CL_EXIT( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PNP );\r
 }\r
 \r
 \r
@@ -699,7 +705,7 @@ __al_pnp_process_reg(
 {\r
        al_pnp_t*               p_reg;\r
 \r
-       CL_ENTER( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        p_reg = PARENT_STRUCT( p_item, al_pnp_t, async_item );\r
 \r
@@ -725,7 +731,7 @@ __al_pnp_process_reg(
        /* Release the reference taken in init_al_obj. */\r
        deref_al_obj( &p_reg->obj );\r
 \r
-       CL_EXIT( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PNP );\r
 }\r
 \r
 \r
@@ -738,16 +744,16 @@ ib_reg_pnp(
        ib_api_status_t         status;\r
        KEVENT                          event;\r
 \r
-       CL_ENTER( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_al, AL_OBJ_TYPE_H_AL ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_AL_HANDLE\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_AL_HANDLE\n") );\r
                return IB_INVALID_AL_HANDLE;\r
        }\r
        if( !p_pnp_req || !ph_pnp )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -783,14 +789,14 @@ al_reg_pnp(
        ib_api_status_t         status;\r
        al_pnp_t*                       p_reg;\r
 \r
-       CL_ENTER( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        /* Allocate a new registration info structure. */\r
        p_reg = (al_pnp_t*)cl_zalloc( sizeof(al_pnp_t) );\r
        if( !p_reg )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
-                       ("Failed to cl_zalloc al_pnp_t (%"PRIdSIZE_T" bytes).\n",\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
+                       ("Failed to cl_zalloc al_pnp_t (%I64d bytes).\n",\r
                        sizeof(al_pnp_t)) );\r
                return( IB_INSUFFICIENT_MEMORY );\r
        }\r
@@ -803,7 +809,7 @@ al_reg_pnp(
        if( status != IB_SUCCESS )\r
        {\r
                __pnp_reg_free( &p_reg->obj );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("init_al_obj() failed with status %s.\n", ib_get_err_str(status)) );\r
                return( status );\r
        }\r
@@ -811,7 +817,7 @@ al_reg_pnp(
        if( status != IB_SUCCESS )\r
        {\r
                p_reg->obj.pfn_destroy( &p_reg->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -845,7 +851,7 @@ al_reg_pnp(
        /* Set the user handle. */\r
        *ph_pnp = p_reg;\r
 \r
-       CL_EXIT( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PNP );\r
        return( IB_SUCCESS );\r
 }\r
 \r
@@ -855,18 +861,18 @@ ib_dereg_pnp(
        IN              const   ib_pnp_handle_t                         h_pnp,\r
        IN              const   ib_pfn_destroy_cb_t                     pfn_destroy_cb OPTIONAL )\r
 {\r
-       CL_ENTER( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_pnp, AL_OBJ_TYPE_H_PNP ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
 \r
        ref_al_obj( &h_pnp->obj );\r
        h_pnp->obj.pfn_destroy( &h_pnp->obj, pfn_destroy_cb );\r
 \r
-       CL_EXIT( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PNP );\r
        return( IB_SUCCESS );\r
 }\r
 \r
@@ -885,7 +891,7 @@ __pnp_process_add_ca(
        cl_status_t                     cl_status;\r
        size_t                          i;\r
 \r
-       CL_ENTER( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        p_event_rec = PARENT_STRUCT( p_item, al_pnp_ca_event_t, async_item );\r
 \r
@@ -940,7 +946,7 @@ __pnp_process_add_ca(
        deref_al_obj( &gp_pnp->obj );\r
        cl_free( p_event_rec );\r
 \r
-       CL_EXIT( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PNP );\r
 }\r
 \r
 \r
@@ -956,7 +962,7 @@ __pnp_process_remove_port(
        al_pnp_ca_event_t               event_rec;\r
        ib_port_attr_t                  *p_port_attr;\r
 \r
-       CL_ENTER( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        CL_ASSERT( p_event_rec->p_ci_ca->p_pnp_attr );\r
        CL_ASSERT( p_event_rec->p_ci_ca->p_pnp_attr->p_port_attr );\r
@@ -1016,7 +1022,7 @@ __pnp_process_remove_port(
                }\r
        }\r
 \r
-       CL_EXIT( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PNP );\r
 }\r
 \r
 \r
@@ -1030,7 +1036,7 @@ __pnp_process_remove_ca(
        al_pnp_context_t        *p_context = NULL;\r
        size_t                          i;\r
 \r
-       CL_ENTER( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        p_event_rec = PARENT_STRUCT( p_item, al_pnp_ca_event_t, async_item );\r
 \r
@@ -1083,7 +1089,7 @@ __pnp_process_remove_ca(
        deref_al_obj( &gp_pnp->obj );\r
        cl_free( p_event_rec );\r
 \r
-       CL_EXIT( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PNP );\r
 }\r
 \r
 \r
@@ -1097,14 +1103,14 @@ pnp_ca_event(
        al_pnp_ca_event_t       *p_event_rec;\r
        ib_ca_attr_t            *p_old_ca_attr;\r
 \r
-       CL_ENTER( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        /* Allocate an event record. */\r
        p_event_rec = (al_pnp_ca_event_t*)cl_zalloc( sizeof(al_pnp_ca_event_t) );\r
        if( !p_event_rec )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
-                       ("Failed to cl_zalloc al_pnp_ca_event_t (%"PRIdSIZE_T" bytes).\n",\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
+                       ("Failed to cl_zalloc al_pnp_ca_event_t (%I64d bytes).\n",\r
                        sizeof(al_pnp_ca_event_t)) );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -1128,7 +1134,7 @@ pnp_ca_event(
                if( cl_status != CL_SUCCESS )\r
                {\r
                        cl_free( p_event_rec );\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("cl_ptr_vector_set_size failed with status %s.\n",\r
                                CL_STATUS_MSG( cl_status )) );\r
                        return ib_convert_cl_status( cl_status );\r
@@ -1144,7 +1150,7 @@ pnp_ca_event(
                        CL_ASSERT( cl_status == CL_SUCCESS );\r
                        cl_spinlock_release( &gp_pnp->obj.lock );\r
                        cl_free( p_event_rec );\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("ci_ca_update_attr failed.\n") );\r
                        return status;\r
                }\r
@@ -1158,7 +1164,7 @@ pnp_ca_event(
                {\r
                        /* The CA was never added by the PNP manager. */\r
                        cl_free( p_event_rec );\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("Ignoring removal request for unknown CA.\n") );\r
                        return IB_NOT_FOUND;\r
                }\r
@@ -1170,7 +1176,7 @@ pnp_ca_event(
                /* Invalid event for this function. */\r
                CL_ASSERT( event == IB_PNP_CA_ADD || event == IB_PNP_CA_REMOVE );\r
                cl_free( p_event_rec );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Invalid event type.\n") );\r
                return IB_ERROR;\r
        }\r
@@ -1179,7 +1185,7 @@ pnp_ca_event(
        ref_al_obj( &gp_pnp->obj );\r
        cl_async_proc_queue( gp_async_pnp_mgr, &p_event_rec->async_item );\r
 \r
-       CL_EXIT( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PNP );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -1201,7 +1207,7 @@ __pnp_process_port_forward(
        al_pnp_context_t                *p_context;\r
        ib_port_attr_t                  *p_port_attr;\r
 \r
-       CL_ENTER( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        /* Walk the list of registrants for notification. */\r
        for( p_reg_item = cl_qlist_head( &gp_pnp->port_reg_list );\r
@@ -1223,7 +1229,7 @@ __pnp_process_port_forward(
                __pnp_notify_user( p_reg, p_context, p_event_rec );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PNP );\r
 }\r
 \r
 \r
@@ -1240,7 +1246,7 @@ __pnp_process_port_backward(
        al_pnp_context_t                *p_context;\r
        ib_port_attr_t                  *p_port_attr;\r
 \r
-       CL_ENTER( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        /* Walk the list of registrants for notification. */\r
        for( p_reg_item = cl_qlist_tail( &gp_pnp->port_reg_list );\r
@@ -1262,7 +1268,7 @@ __pnp_process_port_backward(
                __pnp_notify_user( p_reg, p_context, p_event_rec );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PNP );\r
 }\r
 \r
 \r
@@ -1279,7 +1285,7 @@ __pnp_check_ports(
        al_pnp_ca_event_t               event_rec;\r
        ib_port_attr_t                  *p_old_port_attr, *p_new_port_attr;\r
 \r
-       CL_ENTER( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        /* Store the event information. */\r
        event_rec.p_ci_ca = p_ci_ca;\r
@@ -1473,7 +1479,7 @@ __pnp_check_events(
        ib_ca_attr_t                    *p_old_ca_attr;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        UNUSED_PARAM( p_item );\r
        CL_ASSERT( gp_pnp );\r
@@ -1518,7 +1524,7 @@ __pnp_check_events(
        deref_al_obj( &gp_pnp->obj );\r
        gp_pnp->async_item_is_busy = FALSE;\r
 \r
-       CL_EXIT( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PNP );\r
 }\r
 \r
 \r
@@ -1530,7 +1536,7 @@ void
 pnp_poll(\r
        void )\r
 {\r
-       CL_ENTER( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        CL_ASSERT( gp_pnp );\r
 \r
@@ -1553,7 +1559,7 @@ pnp_poll(
        /* Queue the request to check for PnP events. */\r
        cl_async_proc_queue( gp_async_pnp_mgr, &gp_pnp->async_item );\r
 \r
-       CL_EXIT( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PNP );\r
 }\r
 \r
 \r
@@ -1566,7 +1572,7 @@ __pnp_process_ca_change(
        ib_ca_attr_t                    *p_old_ca_attr;\r
        al_ci_ca_t                              *p_ci_ca;\r
 \r
-       CL_ENTER( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        CL_ASSERT( p_item );\r
        CL_ASSERT( gp_pnp );\r
@@ -1597,7 +1603,7 @@ __pnp_process_ca_change(
        /* Dereference the PnP Manager. */\r
        deref_al_obj( &gp_pnp->obj );\r
 \r
-       CL_EXIT( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PNP );\r
 }\r
 \r
 \r
@@ -1614,7 +1620,7 @@ pnp_ca_change(
        al_pnp_ca_change_t*             p_pnp_ca_change;\r
        size_t                                  size;\r
 \r
-       CL_ENTER( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        CL_ASSERT( p_ci_ca );\r
        CL_ASSERT( p_ca_attr );\r
@@ -1628,7 +1634,7 @@ pnp_ca_change(
        p_new_ca_attr = (ib_ca_attr_t*)cl_zalloc( size );\r
        if( !p_new_ca_attr )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_PNP, g_al_dbg_lvl,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR,AL_DBG_PNP,\r
                        ("Unable to allocate buffer for changed CA attributes\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -1651,7 +1657,7 @@ pnp_ca_change(
        /* Queue the CA change event. */\r
        cl_async_proc_queue( gp_async_pnp_mgr, &p_pnp_ca_change->async_item );\r
 \r
-       CL_EXIT( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PNP );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -1662,19 +1668,19 @@ ib_reject_ioc(
        IN              const   ib_al_handle_t                          h_al,\r
        IN              const   ib_pnp_handle_t                         h_event )\r
 {\r
-       CL_ENTER( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_al, AL_OBJ_TYPE_H_AL ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_AL_HANDLE\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_AL_HANDLE\n") );\r
                return IB_INVALID_AL_HANDLE;\r
        }\r
        if( !h_event )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_PNP, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PNP );\r
        return IB_UNSUPPORTED;\r
 }\r
index a4b7905d78eb5bf64a86bc3434fb64543052eaa8..c8044e1f2cc465fe41b40f1404cea447e6d8ad6e 100644 (file)
 #include "al.h"\r
 #include "al_mr.h"\r
 #include "al_debug.h"\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_proxy.tmh"\r
+#endif\r
 #include "al_dev.h"\r
 #include "al_ci_ca.h"\r
 #include "al_mgr.h"\r
@@ -113,13 +119,13 @@ proxy_reg_shmid(
        uint64_t                                vaddr;\r
        net32_t                                 lkey, rkey;\r
 \r
-       CL_ENTER( AL_DBG_DEV, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_DEV );\r
 \r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) < sizeof(ual_reg_shmid_ioctl_t) ||\r
                cl_ioctl_out_size( h_ioctl ) < sizeof(ual_reg_shmid_ioctl_t) )\r
        {\r
-               CL_EXIT( AL_DBG_DEV, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_DEV );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -171,7 +177,7 @@ proxy_reg_shmid(
 \r
 done:\r
        *p_ret_bytes = sizeof(p_ioctl->out);\r
-       CL_EXIT( AL_DBG_DEV, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_DEV );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -195,7 +201,7 @@ proxy_queue_ioctl_buf(
        cl_ioctl_handle_t                       *ph_ioctl;\r
        uintn_t                                         ioctl_size;\r
 \r
-       CL_ENTER( AL_DBG_DEV, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_DEV );\r
 \r
        /* Set up the appropriate callback list. */\r
        switch( cb_type )\r
@@ -222,7 +228,7 @@ proxy_queue_ioctl_buf(
                break;\r
 \r
        default:\r
-               CL_EXIT( AL_DBG_DEV, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_DEV );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -243,7 +249,7 @@ proxy_queue_ioctl_buf(
                                cl_ioctl_out_buf( h_ioctl ), &p_cb_info->cb_type, ioctl_size );\r
                        cl_ioctl_complete( h_ioctl, CL_SUCCESS, ioctl_size );\r
                        cl_spinlock_release( &p_context->cb_lock );\r
-                       CL_EXIT( AL_DBG_DEV, g_al_dbg_lvl );\r
+                       AL_EXIT( AL_DBG_DEV );\r
                        return CL_COMPLETED;\r
                }\r
                if( p_cb_info->p_al_obj )\r
@@ -276,7 +282,7 @@ proxy_queue_ioctl_buf(
        proxy_context_ref( p_context );\r
        cl_spinlock_release( &p_context->cb_lock );\r
 \r
-       CL_EXIT( AL_DBG_DEV, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_DEV );\r
        return CL_PENDING;\r
 }\r
 \r
@@ -300,8 +306,8 @@ proxy_get_cm_cb(
        p_context = (al_dev_open_context_t*)p_io_stack->FileObject->FsContext;\r
        if( (uintn_t)p_io_stack->FileObject->FsContext2 != AL_OBJ_TYPE_CM )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
-                       ("Invalid file object type for request: %d\n",\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
+                       ("Invalid file object type for request: %p\n",\r
                        p_io_stack->FileObject->FsContext2) );\r
                return CL_INVALID_PARAMETER;\r
        }\r
@@ -310,7 +316,7 @@ proxy_get_cm_cb(
        if( !p_context || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(cm_cb_ioctl_info_t) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("No output buffer, or buffer too small.\n") );\r
                return CL_INVALID_PARAMETER;\r
        }\r
@@ -342,8 +348,8 @@ proxy_get_comp_cb(
        p_context = (al_dev_open_context_t*)p_io_stack->FileObject->FsContext;\r
        if( (uintn_t)p_io_stack->FileObject->FsContext2 != AL_OBJ_TYPE_H_CQ )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
-                       ("Invalid file object type for request: %d\n",\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
+                       ("Invalid file object type for request: %p\n",\r
                        p_io_stack->FileObject->FsContext2) );\r
                return CL_INVALID_PARAMETER;\r
        }\r
@@ -352,7 +358,7 @@ proxy_get_comp_cb(
        if( !p_context || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(comp_cb_ioctl_info_t) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("No output buffer, or buffer too small.\n") );\r
                return CL_INVALID_PARAMETER;\r
        }\r
@@ -384,8 +390,8 @@ proxy_get_misc_cb(
        p_context = (al_dev_open_context_t*)p_io_stack->FileObject->FsContext;\r
        if( (uintn_t)p_io_stack->FileObject->FsContext2 != AL_OBJ_TYPE_AL_MGR )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
-                       ("Invalid file object type for request: %d\n",\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
+                       ("Invalid file object type for request: %p\n",\r
                        p_io_stack->FileObject->FsContext2) );\r
                return CL_INVALID_PARAMETER;\r
        }\r
@@ -394,7 +400,7 @@ proxy_get_misc_cb(
        if( !p_context || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(misc_cb_ioctl_info_t) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("No output buffer, or buffer too small.\n") );\r
                return CL_INVALID_PARAMETER;\r
        }\r
@@ -419,7 +425,7 @@ proxy_pnp_ca_cb(
        misc_cb_ioctl_rec_t             *p_misc_rec = &misc_cb_info.ioctl_rec;\r
        al_dev_open_context_t   *p_context;\r
 \r
-       CL_ENTER( AL_DBG_PROXY_CB, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PROXY_CB );\r
 \r
        p_context = p_pnp_rec->pnp_context;\r
 \r
@@ -454,7 +460,7 @@ proxy_pnp_ca_cb(
        }\r
 \r
        proxy_context_deref( p_context );\r
-       CL_EXIT( AL_DBG_PROXY_CB, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PROXY_CB );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -474,7 +480,7 @@ proxy_pnp_port_cb(
        ib_ca_attr_t                    *p_ca_attr;\r
        uint64_t                                hdl;\r
 \r
-       CL_ENTER( AL_DBG_PROXY_CB, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PROXY_CB );\r
 \r
        p_context = p_pnp_rec->pnp_context;\r
 \r
@@ -517,7 +523,7 @@ proxy_pnp_port_cb(
                p_ca_attr = cl_zalloc( p_port_rec->p_ca_attr->size );\r
                if( !p_ca_attr )\r
                {\r
-                       CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("cl_malloc( %d ) failed.\n", p_port_rec->p_ca_attr->size) );\r
                        break;\r
                }\r
@@ -545,7 +551,7 @@ proxy_pnp_port_cb(
        }\r
 \r
        proxy_context_deref( p_context );\r
-       CL_EXIT( AL_DBG_PROXY_CB, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PROXY_CB );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -561,14 +567,14 @@ proxy_get_ca_attr(
        ual_ca_attr_info_ioctl_t                *p_ioctl;\r
        ib_ca_attr_t                                    *p_src;\r
 \r
-       CL_ENTER( AL_DBG_DEV, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_DEV );\r
 \r
        /* Check the size of the ioctl */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) < sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) < sizeof(p_ioctl->out) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("invalid buffer size\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("invalid buffer size\n") );\r
                return CL_INVALID_PARAMETER;\r
        }\r
        p_context = (al_dev_open_context_t*)p_open_context;\r
@@ -578,7 +584,7 @@ proxy_get_ca_attr(
                p_context->h_al, p_ioctl->in.h_ca_attr, AL_OBJ_TYPE_H_CA_ATTR );\r
        if( !p_src )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("invalid attr handle\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("invalid attr handle\n") );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -597,7 +603,7 @@ proxy_get_ca_attr(
 \r
        *p_ret_bytes = sizeof(p_ioctl->out);\r
 \r
-       CL_EXIT( AL_DBG_DEV, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_DEV );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -627,7 +633,7 @@ proxy_bind_file(
                !cl_ioctl_in_buf( h_ioctl ) || cl_ioctl_out_size( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(ual_bind_file_ioctl_t) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("No input buffer, or buffer too small.\n") );\r
                return CL_INVALID_PARAMETER;\r
        }\r
@@ -639,7 +645,7 @@ proxy_bind_file(
                &p_file_obj, NULL );\r
        if( !NT_SUCCESS(status) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ObReferenceObjectByHandle returned 0x%08X\n", status) );\r
                return CL_INVALID_PARAMETER;\r
        }\r
@@ -721,7 +727,7 @@ __proxy_pnp_cb(
        cl_status_t                                     cl_status;\r
        ib_api_status_t                         ret_status;\r
 \r
-       AL_ENTER( AL_DBG_DEV | AL_DBG_PNP );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        p_rec = (proxy_pnp_recs_t*)p_pnp_rec;\r
 \r
@@ -744,7 +750,7 @@ __proxy_pnp_cb(
        p_irp = InterlockedExchangePointer( &p_pnp_rec->h_pnp->p_rearm_irp, NULL );\r
        if( !p_irp )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("No rearm IRP queued for PnP event.\n") );\r
                return ret_status;\r
        }\r
@@ -860,7 +866,7 @@ __proxy_pnp_cb(
        if( hdl == AL_INVALID_HANDLE )\r
        {\r
                cl_free( p_evt );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Failed to insert PnP event in handle map.\n") );\r
                return ret_status;\r
        }\r
@@ -891,7 +897,7 @@ __proxy_pnp_cb(
        cl_event_destroy( &p_evt->event );\r
        cl_free( p_evt );\r
 \r
-       AL_EXIT( AL_DBG_DEV | AL_DBG_PNP );\r
+       AL_EXIT( AL_DBG_PNP );\r
        return ret_status;\r
 }\r
 \r
@@ -962,15 +968,15 @@ proxy_reg_pnp(
        KEVENT                                  *p_sync_event;\r
        NTSTATUS                                nt_status;\r
 \r
-       AL_ENTER( AL_DBG_DEV | AL_DBG_PNP );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        p_context = p_open_context;\r
 \r
        p_io_stack = IoGetCurrentIrpStackLocation( h_ioctl );\r
        if( (uintn_t)p_io_stack->FileObject->FsContext2 != AL_OBJ_TYPE_PNP_MGR )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
-                       ("Invalid file object type for request: %d\n",\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
+                       ("Invalid file object type for request: %p\n",\r
                        p_io_stack->FileObject->FsContext2) );\r
                return CL_INVALID_PARAMETER;\r
        }\r
@@ -978,7 +984,7 @@ proxy_reg_pnp(
        if( cl_ioctl_in_size( h_ioctl ) < sizeof(ual_reg_pnp_ioctl_in_t) ||\r
                cl_ioctl_out_size( h_ioctl ) < sizeof(ual_rearm_pnp_ioctl_out_t) )\r
        {\r
-               AL_EXIT( AL_DBG_DEV | AL_DBG_PNP );\r
+               AL_EXIT( AL_DBG_PNP );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -998,7 +1004,7 @@ proxy_reg_pnp(
                        (PVOID*)&p_sync_event, NULL );\r
                if( !NT_SUCCESS( nt_status ) )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR, ("Invalid sync event handle\n") );\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Invalid sync event handle\n") );\r
                        return CL_INVALID_PARAMETER;\r
                }\r
        }\r
@@ -1037,7 +1043,7 @@ proxy_reg_pnp(
        cl_copy_to_user( p_user_status, &status, sizeof(ib_api_status_t) );\r
        cl_mutex_release( &p_context->pnp_mutex );\r
 \r
-       AL_EXIT( AL_DBG_DEV | AL_DBG_PNP );\r
+       AL_EXIT( AL_DBG_PNP );\r
        return cl_status;\r
 }\r
 \r
@@ -1055,14 +1061,14 @@ proxy_poll_pnp(
        al_dev_open_context_t   *p_context;\r
        proxy_pnp_evt_t                 *p_evt;\r
 \r
-       AL_ENTER( AL_DBG_DEV | AL_DBG_PNP );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        p_context = p_open_context;\r
 \r
        if( cl_ioctl_in_size( h_ioctl ) < sizeof(uint64_t) ||\r
                cl_ioctl_out_size( h_ioctl ) < sizeof(ib_pnp_rec_t) )\r
        {\r
-               AL_EXIT( AL_DBG_DEV | AL_DBG_PNP );\r
+               AL_EXIT( AL_DBG_PNP );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1077,7 +1083,7 @@ proxy_poll_pnp(
                if( cl_ioctl_out_size( h_ioctl ) < p_evt->rec_size )\r
                {\r
                        cl_spinlock_release( &p_context->h_al->obj.lock );\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR, ("Buffer too small!\n") );\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Buffer too small!\n") );\r
                        return CL_INVALID_PARAMETER;\r
                }\r
 \r
@@ -1086,7 +1092,7 @@ proxy_poll_pnp(
        }\r
        cl_spinlock_release( &p_context->h_al->obj.lock );\r
 \r
-       AL_EXIT( AL_DBG_DEV | AL_DBG_PNP );\r
+       AL_EXIT( AL_DBG_PNP );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -1106,15 +1112,15 @@ proxy_rearm_pnp(
        ib_pnp_handle_t                         h_pnp;\r
        IRP                                                     *p_old_irp;\r
 \r
-       AL_ENTER( AL_DBG_DEV | AL_DBG_PNP );\r
+       AL_ENTER( AL_DBG_PNP );\r
 \r
        p_context = p_open_context;\r
 \r
        p_io_stack = IoGetCurrentIrpStackLocation( h_ioctl );\r
        if( (uintn_t)p_io_stack->FileObject->FsContext2 != AL_OBJ_TYPE_PNP_MGR )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
-                       ("Invalid file object type for request: %d\n",\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
+                       ("Invalid file object type for request: %p\n",\r
                        p_io_stack->FileObject->FsContext2) );\r
                return CL_INVALID_PARAMETER;\r
        }\r
@@ -1122,7 +1128,7 @@ proxy_rearm_pnp(
        if( cl_ioctl_in_size( h_ioctl ) != sizeof(ual_rearm_pnp_ioctl_in_t) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(ual_rearm_pnp_ioctl_out_t) )\r
        {\r
-               AL_EXIT( AL_DBG_DEV | AL_DBG_PNP );\r
+               AL_EXIT( AL_DBG_PNP );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1132,7 +1138,7 @@ proxy_rearm_pnp(
                al_hdl_ref( p_context->h_al, p_ioctl->pnp_hdl, AL_OBJ_TYPE_H_PNP );\r
        if( !h_pnp )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_WARN | AL_DBG_DEV | AL_DBG_PNP,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_WARNING, AL_DBG_PNP,\r
                        ("Invalid PNP handle.\n") );\r
                return CL_INVALID_PARAMETER;\r
        }\r
@@ -1171,7 +1177,7 @@ proxy_rearm_pnp(
 \r
        deref_al_obj( &h_pnp->obj );\r
 \r
-       AL_EXIT( AL_DBG_DEV | AL_DBG_PNP );\r
+       AL_EXIT( AL_DBG_PNP );\r
        return CL_PENDING;\r
 }\r
 \r
@@ -1189,14 +1195,14 @@ proxy_dereg_pnp(
        IO_STACK_LOCATION               *p_io_stack;\r
        ib_pnp_handle_t                 h_pnp;\r
 \r
-       AL_ENTER( AL_DBG_DEV | AL_DBG_PNP );\r
+       AL_ENTER( AL_DBG_PNP );\r
        p_context = p_open_context;\r
 \r
        p_io_stack = IoGetCurrentIrpStackLocation( h_ioctl );\r
        if( (uintn_t)p_io_stack->FileObject->FsContext2 != AL_OBJ_TYPE_PNP_MGR )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
-                       ("Invalid file object type for request: %d\n",\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
+                       ("Invalid file object type for request: %p\n",\r
                        p_io_stack->FileObject->FsContext2) );\r
                return CL_INVALID_PARAMETER;\r
        }\r
@@ -1224,7 +1230,7 @@ proxy_dereg_pnp(
 \r
        h_pnp->obj.pfn_destroy( &h_pnp->obj, NULL );\r
 \r
-       AL_EXIT( AL_DBG_DEV | AL_DBG_PNP );\r
+       AL_EXIT( AL_DBG_PNP );\r
        return CL_PENDING;\r
 }\r
 \r
index 20ae219eaf956a760586db9a452fec0efa521864..4e688f31d0f53b21ddeb6654f7f84328cc20924e 100644 (file)
 \r
 \r
 #include "al_debug.h"\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_proxy_cep.tmh"\r
+#endif\r
 #include "al_cm_cep.h"\r
 #include "al_dev.h"\r
 #include <iba/ib_al_ioctl.h>\r
@@ -824,8 +830,8 @@ proxy_cep_get_event(
        p_io_stack = IoGetCurrentIrpStackLocation( h_ioctl );\r
        if( (uintn_t)p_io_stack->FileObject->FsContext2 != AL_OBJ_TYPE_CM )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
-                       ("Invalid file object type for request: %d\n",\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
+                       ("Invalid file object type for request: %p\n",\r
                        p_io_stack->FileObject->FsContext2) );\r
                return CL_INVALID_PARAMETER;\r
        }\r
@@ -833,7 +839,7 @@ proxy_cep_get_event(
        /* Check the size of the ioctl */\r
        if( cl_ioctl_in_size( h_ioctl ) != sizeof(net32_t) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("Invalid IOCTL input buffer.\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Invalid IOCTL input buffer.\n") );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
index 075c2d935c065b148681ba7176ab60ad81052942..876d08044eb2657cab2f82a4e55625a620e0ffbe 100644 (file)
@@ -55,7 +55,7 @@ void proxy_cm_req_cb(
        uint8_t                                 *dest;\r
        uint64_t                                hdl;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        cl_memclr(&cb_info, sizeof(cb_info));\r
 \r
@@ -128,7 +128,7 @@ void proxy_cm_req_cb(
                proxy_queue_cb_buf( UAL_GET_CM_CB_INFO, p_context, &cb_info, NULL );\r
        }\r
        proxy_context_deref( p_context );\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -141,7 +141,7 @@ void proxy_cm_dreq_cb(
        al_dev_open_context_t                   *p_context;\r
        uint64_t                                                hdl;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        cl_memclr(&cb_info, sizeof(cb_info));\r
        cb_info.rec_type = CM_DREQ_REC;\r
@@ -191,7 +191,7 @@ err:
        }\r
 \r
        proxy_context_deref( p_context );\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -204,7 +204,7 @@ proxy_cm_rtu_cb(
        struct _cm_rtu_cb_ioctl_rec     *p_ioctl_rec;\r
        al_dev_open_context_t           *p_context;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        cl_memclr(&cb_info, sizeof(cb_info));\r
        cb_info.rec_type = CM_RTU_REC;\r
@@ -230,7 +230,7 @@ proxy_cm_rtu_cb(
        }\r
 \r
        proxy_context_deref( p_context );\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -245,7 +245,7 @@ void proxy_cm_rep_cb(
        uint64_t                                        hdl;\r
        al_obj_t                                        *p_al_obj;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        cl_memclr(&cb_info, sizeof(cb_info));\r
        cb_info.rec_type = CM_REP_REC;\r
@@ -327,7 +327,7 @@ void proxy_cm_rep_cb(
 \r
        proxy_queue_cb_buf( UAL_GET_CM_CB_INFO, p_context, &cb_info, p_al_obj );\r
        proxy_context_deref( p_context );\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -340,7 +340,7 @@ void proxy_cm_drep_cb(
                                        &cb_info.ioctl_rec.cm_drep_cb_ioctl_rec;\r
        al_dev_open_context_t   *p_context;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
        cl_memclr(&cb_info, sizeof(cb_info));\r
        cb_info.rec_type = CM_DREP_REC;\r
        p_ioctl_rec->drep_rec = *p_cm_drep_rec;\r
@@ -367,7 +367,7 @@ void proxy_cm_drep_cb(
        }\r
 \r
        proxy_context_deref( p_context );\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -380,7 +380,7 @@ void proxy_cm_mra_cb(
                                        &cb_info.ioctl_rec.cm_mra_cb_ioctl_rec;\r
        al_dev_open_context_t   *p_context;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        cl_memclr( &cb_info, sizeof(cb_info) );\r
        cb_info.rec_type = CM_MRA_REC;\r
@@ -405,7 +405,7 @@ void proxy_cm_mra_cb(
        }\r
 \r
        proxy_context_deref( p_context );\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -418,7 +418,7 @@ void proxy_cm_rej_cb(
                                        &cb_info.ioctl_rec.cm_rej_cb_ioctl_rec;\r
        al_dev_open_context_t   *p_context;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        cl_memclr(&cb_info, sizeof(cb_info));\r
        cb_info.rec_type = CM_REJ_REC;\r
@@ -457,7 +457,7 @@ void proxy_cm_rej_cb(
        }\r
 \r
        proxy_context_deref( p_context );\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -472,7 +472,7 @@ proxy_cm_lap_cb(
        al_dev_open_context_t   *p_context;\r
        uint64_t                                hdl;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
        cl_memclr(&cb_info, sizeof(cb_info));\r
        cb_info.rec_type = CM_LAP_REC;\r
        p_ioctl_rec->lap_rec = *p_cm_lap_rec;\r
@@ -523,7 +523,7 @@ err:
        }\r
 \r
        proxy_context_deref( p_context );\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -537,7 +537,7 @@ proxy_cm_apr_cb(
                                        &cb_info.ioctl_rec.cm_apr_cb_ioctl_rec;\r
        al_dev_open_context_t   *p_context;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
        cl_memclr( &cb_info, sizeof(cb_info) );\r
        cb_info.rec_type = CM_APR_REC;\r
        p_ioctl_rec->apr_rec = *p_cm_apr_rec;\r
@@ -568,7 +568,7 @@ proxy_cm_apr_cb(
        }\r
 \r
        proxy_context_deref( p_context );\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -580,7 +580,7 @@ proxy_listen_err_cb(
        al_dev_open_context_t   *p_context;\r
        misc_cb_ioctl_info_t    cb_info;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /*\r
         * If we're already closing the device - do not queue a callback, since\r
@@ -590,7 +590,7 @@ proxy_listen_err_cb(
        if( !proxy_context_ref( p_context ) )\r
        {\r
                proxy_context_deref( p_context );\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return;\r
        }\r
 \r
@@ -608,7 +608,7 @@ proxy_listen_err_cb(
                &p_err_rec->h_cm_listen->obj );\r
        proxy_context_deref( p_context );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
 }\r
 \r
 \r
@@ -626,14 +626,14 @@ proxy_cm_req(
        size_t                                  in_buf_sz;\r
        uint8_t                                 *p_buf;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) < sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -648,7 +648,7 @@ proxy_cm_req(
 \r
        if( cl_ioctl_in_size( h_ioctl ) != in_buf_sz )\r
        {\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -666,7 +666,7 @@ proxy_cm_req(
                if( !h_qp )\r
                {\r
                        p_ioctl->out.status = IB_INVALID_QP_HANDLE;\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
                        return CL_SUCCESS;\r
                }\r
                p_ioctl->in.cm_req.h_qp = h_qp;\r
@@ -709,7 +709,7 @@ proxy_cm_req(
        if( h_qp )\r
                deref_al_obj( &h_qp->obj );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -728,14 +728,14 @@ proxy_cm_rep(
        ib_qp_handle_t                  h_qp;\r
        size_t                                  in_buf_sz;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) < sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -745,7 +745,7 @@ proxy_cm_rep(
 \r
        if( cl_ioctl_in_size( h_ioctl ) != in_buf_sz )\r
        {\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -758,7 +758,7 @@ proxy_cm_rep(
        if( !h_qp )\r
        {\r
                p_ioctl->out.status = IB_INVALID_QP_HANDLE;\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_SUCCESS;\r
        }\r
        p_ioctl->in.cm_rep.h_qp = h_qp;\r
@@ -770,7 +770,7 @@ proxy_cm_rep(
        {\r
                deref_al_obj( &h_qp->obj );\r
                p_ioctl->out.status = IB_INVALID_HANDLE;\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_SUCCESS;\r
        }\r
 \r
@@ -789,7 +789,7 @@ proxy_cm_rep(
        __deref_conn( h_cm_req );\r
        deref_al_obj( &h_qp->obj );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -807,14 +807,14 @@ proxy_cm_dreq(
        ib_qp_handle_t                  h_qp;\r
        size_t                                  in_buf_sz;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) < sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -824,7 +824,7 @@ proxy_cm_dreq(
 \r
        if( cl_ioctl_in_size( h_ioctl ) != in_buf_sz )\r
        {\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -840,7 +840,7 @@ proxy_cm_dreq(
                if( !h_qp )\r
                {\r
                        p_ioctl->out.status = IB_INVALID_QP_HANDLE;\r
-                       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+                       AL_EXIT( AL_DBG_CM );\r
                        return CL_SUCCESS;\r
                }\r
                p_ioctl->in.cm_dreq.h_qp = h_qp;\r
@@ -860,7 +860,7 @@ proxy_cm_dreq(
        if( h_qp )\r
                deref_al_obj( &h_qp->obj );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -878,14 +878,14 @@ proxy_cm_drep(
        ib_cm_handle_t                  h_cm_dreq;\r
        size_t                                  in_buf_sz;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) < sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -895,7 +895,7 @@ proxy_cm_drep(
 \r
        if( cl_ioctl_in_size( h_ioctl ) != in_buf_sz )\r
        {\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -921,7 +921,7 @@ proxy_cm_drep(
 \r
        __deref_conn( h_cm_dreq );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -939,14 +939,14 @@ proxy_cm_listen(
                (al_dev_open_context_t *)p_open_context;\r
        size_t                                  in_buf_sz;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) < sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -956,7 +956,7 @@ proxy_cm_listen(
 \r
        if( cl_ioctl_in_size( h_ioctl ) != in_buf_sz )\r
        {\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -991,7 +991,7 @@ proxy_cm_listen(
                p_ioctl->out.h_cm_listen = AL_INVALID_HANDLE;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -1008,14 +1008,14 @@ proxy_cm_cancel(
        al_dev_open_context_t   *p_context =\r
                (al_dev_open_context_t *)p_open_context;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1034,7 +1034,7 @@ proxy_cm_cancel(
        h_cm_listen->obj.pfn_destroy( &h_cm_listen->obj, ib_sync_destroy );\r
        p_ioctl->out.status = IB_SUCCESS;\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -1052,13 +1052,13 @@ proxy_cm_rtu(
        ib_cm_handle_t                  h_cm_rep;\r
        size_t                                  in_buf_sz;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) < sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1068,7 +1068,7 @@ proxy_cm_rtu(
 \r
        if( cl_ioctl_in_size( h_ioctl ) != in_buf_sz )\r
        {\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1081,7 +1081,7 @@ proxy_cm_rtu(
        if( !h_cm_rep )\r
        {\r
                p_ioctl->out.status = IB_INVALID_HANDLE;\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_SUCCESS;\r
        }\r
 \r
@@ -1095,7 +1095,7 @@ proxy_cm_rtu(
 \r
        __deref_conn( h_cm_rep );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -1114,14 +1114,14 @@ proxy_cm_rej(
        size_t                                  in_buf_sz;\r
        uint8_t                                 *p_buf;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) < sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1133,7 +1133,7 @@ proxy_cm_rej(
 \r
        if( cl_ioctl_in_size( h_ioctl ) != in_buf_sz )\r
        {\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1146,7 +1146,7 @@ proxy_cm_rej(
        if( !h_cm )\r
        {\r
                p_ioctl->out.status = IB_INVALID_HANDLE;\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_SUCCESS;\r
        }\r
 \r
@@ -1163,7 +1163,7 @@ proxy_cm_rej(
 \r
        __deref_conn( h_cm );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -1181,14 +1181,14 @@ proxy_cm_mra(
        ib_cm_handle_t                  h_cm;\r
        size_t                                  in_buf_sz;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) < sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1198,7 +1198,7 @@ proxy_cm_mra(
 \r
        if( cl_ioctl_in_size( h_ioctl ) != in_buf_sz )\r
        {\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1211,7 +1211,7 @@ proxy_cm_mra(
        if( !h_cm )\r
        {\r
                p_ioctl->out.status = IB_INVALID_HANDLE;\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_SUCCESS;\r
        }\r
 \r
@@ -1222,7 +1222,7 @@ proxy_cm_mra(
 \r
        __deref_conn( h_cm );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -1240,14 +1240,14 @@ proxy_cm_lap(
        ib_qp_handle_t                  h_qp;\r
        size_t                                  in_buf_sz;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) < sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1257,7 +1257,7 @@ proxy_cm_lap(
 \r
        if( cl_ioctl_in_size( h_ioctl ) != in_buf_sz )\r
        {\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1270,7 +1270,7 @@ proxy_cm_lap(
        if( !h_qp )\r
        {\r
                p_ioctl->out.status = IB_INVALID_QP_HANDLE;\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_SUCCESS;\r
        }\r
        p_ioctl->in.cm_lap.h_qp = h_qp;\r
@@ -1288,7 +1288,7 @@ proxy_cm_lap(
 \r
        deref_al_obj( &h_qp->obj );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -1308,14 +1308,14 @@ proxy_cm_apr(
        size_t                                  in_buf_sz;\r
        uint8_t                                 *p_buf;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CM );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) < sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1325,7 +1325,7 @@ proxy_cm_apr(
 \r
        if( cl_ioctl_in_size( h_ioctl ) != in_buf_sz )\r
        {\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1337,7 +1337,7 @@ proxy_cm_apr(
        if( !h_cm_lap )\r
        {\r
                p_ioctl->out.status = IB_INVALID_HANDLE;\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_SUCCESS;\r
        }\r
 \r
@@ -1348,7 +1348,7 @@ proxy_cm_apr(
        {\r
                __deref_conn( h_cm_lap );\r
                p_ioctl->out.status = IB_INVALID_QP_HANDLE;\r
-               CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CM );\r
                return CL_SUCCESS;\r
        }\r
        p_ioctl->in.cm_apr.h_qp = h_qp;\r
@@ -1367,7 +1367,7 @@ proxy_cm_apr(
        __deref_conn( h_cm_lap );\r
        deref_al_obj( &h_qp->obj );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CM );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -1454,6 +1454,6 @@ cm_ioctl(
                break;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_DEV, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_DEV );\r
        return cl_status;\r
 }\r
index 09433a6efcaa8980a5626861fc3588f88f3ffbe7..fed0e0670573887a04ddbdd447342667bc681271 100644 (file)
 #include "al_ca.h"\r
 #include "al_cq.h"\r
 #include "al_debug.h"\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_proxy_subnet.tmh"\r
+#endif\r
 #include "al_dev.h"\r
 #include "al_mad_pool.h"\r
 #include "al_mr.h"\r
@@ -91,7 +97,7 @@ __proxy_sa_req_cb(
        al_dev_open_context_t   *p_context;\r
        uint64_t                                hdl;\r
 \r
-       AL_ENTER( AL_DBG_DEV | AL_DBG_QUERY );\r
+       AL_ENTER( AL_DBG_QUERY );\r
 \r
        p_irp = (IRP*)p_sa_req->user_context;\r
        CL_ASSERT( p_irp );\r
@@ -222,8 +228,8 @@ proxy_send_sa_req(
        if( p_io_stack->FileObject->FsContext2 &&\r
                (uintn_t)p_io_stack->FileObject->FsContext2 != AL_OBJ_TYPE_SA_REQ_SVC )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
-                       ("Invalid file object type for request: %d\n",\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
+                       ("Invalid file object type for request: %p\n",\r
                        p_io_stack->FileObject->FsContext2) );\r
                return CL_INVALID_PARAMETER;\r
        }\r
@@ -232,7 +238,7 @@ proxy_send_sa_req(
        if( cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("Invalid IOCTL buffers.\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Invalid IOCTL buffers.\n") );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -246,7 +252,7 @@ proxy_send_sa_req(
        if( p_ioctl->in.sa_req.attr_size > IB_SA_DATA_SIZE )\r
        {\r
                ib_status = IB_INVALID_SETTING;\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("Invalid SA data size: %d\n",\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Invalid SA data size: %d\n",\r
                        p_ioctl->in.sa_req.attr_size) );\r
                goto proxy_send_sa_req_err1;\r
        }\r
@@ -255,7 +261,7 @@ proxy_send_sa_req(
        if( !p_sa_req )\r
        {\r
                ib_status = IB_INSUFFICIENT_MEMORY;\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("Failed to allocate SA req.\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Failed to allocate SA req.\n") );\r
                goto proxy_send_sa_req_err1;\r
        }\r
 \r
@@ -267,7 +273,7 @@ proxy_send_sa_req(
        if( hdl == AL_INVALID_HANDLE )\r
        {\r
                ib_status = IB_INSUFFICIENT_MEMORY;\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("Failed to create handle.\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Failed to create handle.\n") );\r
                goto proxy_send_sa_req_err2;\r
        }\r
 \r
@@ -345,7 +351,7 @@ proxy_cancel_sa_req(
        if( cl_ioctl_in_size( h_ioctl ) != sizeof(ual_cancel_sa_req_ioctl_t) ||\r
                cl_ioctl_out_size( h_ioctl ) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("Invalid input buffer.\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Invalid input buffer.\n") );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -383,13 +389,13 @@ proxy_send_mad(
        ib_grh_t                                *p_grh, *p_usr_grh;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_MAD ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD );\r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_MAD ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MAD );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -509,7 +515,7 @@ proxy_send_mad_err1:
        p_ioctl->out.status = status;\r
        *p_ret_bytes = sizeof(p_ioctl->out);\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_MAD ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -529,14 +535,14 @@ proxy_mad_comp(
        ib_mad_element_t                *p_mad;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_MAD ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_MAD ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MAD );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -559,7 +565,7 @@ proxy_mad_comp(
                p_ioctl->in.p_user_mad, p_mad, sizeof(ib_mad_element_t) ) );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Unable to copy element to user's MAD\n") );\r
                goto proxy_mad_comp_err2;\r
        }\r
@@ -569,7 +575,7 @@ proxy_mad_comp(
                p_ioctl->in.p_mad_buf, p_mad->p_mad_buf, p_mad->size ) );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("Unable to copy buffer to user's MAD\n") );\r
                goto proxy_mad_comp_err2;\r
        }\r
@@ -581,7 +587,7 @@ proxy_mad_comp(
                        p_ioctl->in.p_grh, p_mad->p_grh, sizeof(ib_grh_t) ) );\r
                if( status != IB_SUCCESS )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("Unable to copy GRH to user's MAD\n") );\r
                        goto proxy_mad_comp_err2;\r
                }\r
@@ -602,7 +608,7 @@ proxy_mad_comp_err1:
        p_ioctl->out.status = status;\r
        *p_ret_bytes = sizeof(p_ioctl->out);\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_MAD ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -632,7 +638,7 @@ __proxy_mad_send_cb(
        al_dev_open_context_t   *p_context;\r
        al_mad_element_t                *p_al_el;\r
 \r
-       CL_ENTER( ( AL_DBG_PROXY_CB | AL_DBG_MAD ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD );\r
 \r
        CL_ASSERT( p_mad_element );\r
        CL_ASSERT( !p_mad_element->p_next );\r
@@ -663,7 +669,7 @@ __proxy_mad_send_cb(
        ib_put_mad( p_mad_element );\r
 \r
        proxy_context_deref( p_context );\r
-       CL_EXIT( ( AL_DBG_PROXY_CB | AL_DBG_MAD ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD );\r
 }\r
 \r
 \r
@@ -679,7 +685,7 @@ __proxy_mad_recv_cb(
        al_mad_element_t                *p_al_mad;\r
        uint64_t                                hdl;\r
 \r
-       CL_ENTER( ( AL_DBG_PROXY_CB | AL_DBG_MAD ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD );\r
 \r
        p_context = h_mad_svc->obj.h_al->p_context;\r
 \r
@@ -699,7 +705,7 @@ __proxy_mad_recv_cb(
        if( !proxy_context_ref( p_context ) )\r
        {\r
                proxy_put_mad( p_mad_element );\r
-               CL_EXIT( ( AL_DBG_PROXY_CB | AL_DBG_MAD ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MAD );\r
                return;\r
        }\r
 \r
@@ -723,7 +729,7 @@ proxy_mad_recv_cb_err:
 \r
        proxy_context_deref( p_context );\r
 \r
-       CL_EXIT( ( AL_DBG_PROXY_CB | AL_DBG_MAD ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD );\r
 }\r
 \r
 \r
@@ -741,14 +747,14 @@ proxy_reg_mad_svc(
        ib_qp_handle_t                  h_qp;\r
        ib_mad_svc_handle_t             h_mad_svc;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_MAD ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_MAD ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MAD );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -762,7 +768,7 @@ proxy_reg_mad_svc(
        {\r
                p_ioctl->out.status = IB_INVALID_QP_HANDLE;\r
                p_ioctl->out.h_mad_svc = AL_INVALID_HANDLE;\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
                return CL_SUCCESS;\r
        }\r
 \r
@@ -785,7 +791,7 @@ proxy_reg_mad_svc(
 \r
        deref_al_obj( &h_qp->obj );\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_MAD ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -804,13 +810,13 @@ proxy_dereg_mad_svc(
        al_dev_open_context_t           *p_context;\r
        ib_mad_svc_handle_t                     h_mad_svc;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_MAD ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD );\r
 \r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("IOCTL buffer is invalid\n") );\r
                return CL_INVALID_PARAMETER;\r
        }\r
@@ -827,7 +833,7 @@ proxy_dereg_mad_svc(
        if( !h_mad_svc )\r
        {\r
                p_ioctl->out.status = IB_INVALID_HANDLE;\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
                return CL_SUCCESS;\r
        }\r
 \r
@@ -835,7 +841,7 @@ proxy_dereg_mad_svc(
        h_mad_svc->obj.pfn_destroy( &h_mad_svc->obj, ib_sync_destroy );\r
        p_ioctl->out.status = IB_SUCCESS;\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_MAD ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -859,14 +865,14 @@ proxy_reg_mad_pool(
        ib_pd_handle_t                          h_pd;\r
        ib_pool_key_t                           pool_key;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_MAD ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_MAD ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MAD );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -880,7 +886,7 @@ proxy_reg_mad_pool(
        {\r
                p_ioctl->out.status = IB_INVALID_PD_HANDLE;\r
                p_ioctl->out.pool_key = AL_INVALID_HANDLE;\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_PD_HANDLE\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PD_HANDLE\n") );\r
                return CL_SUCCESS;\r
        }\r
 \r
@@ -901,13 +907,13 @@ proxy_reg_mad_pool(
        else\r
        {\r
                p_ioctl->out.pool_key = AL_INVALID_HANDLE;\r
-               AL_TRACE( AL_DBG_ERROR, ("reg_mad_pool returned %s.\n",\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("reg_mad_pool returned %s.\n",\r
                        ib_get_err_str(p_ioctl->out.status)) );\r
        }\r
 \r
        deref_al_obj( &h_pd->obj );\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_MAD ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -930,14 +936,14 @@ proxy_dereg_mad_pool(
                (al_dev_open_context_t *)p_open_context;\r
        ib_pool_key_t                           pool_key;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_MAD ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("IOCTL buffer is invalid\n") );\r
                return CL_INVALID_PARAMETER;\r
        }\r
@@ -951,7 +957,7 @@ proxy_dereg_mad_pool(
        if( !pool_key )\r
        {\r
                p_ioctl->out.status = IB_INVALID_HANDLE;\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("User-mode provided pool key is invalid\n") );\r
                return CL_SUCCESS;\r
        }\r
@@ -961,11 +967,11 @@ proxy_dereg_mad_pool(
        if( p_ioctl->out.status != IB_SUCCESS )\r
        {\r
                deref_al_obj( &pool_key->obj );\r
-               AL_TRACE( AL_DBG_ERROR, ("dereg_mad_pool failed: %s\n",\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("dereg_mad_pool failed: %s\n",\r
                        ib_get_err_str( p_ioctl->out.status )) );\r
        }\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_MAD ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -981,14 +987,14 @@ proxy_cancel_mad(
        al_dev_open_context_t   *p_context;\r
        ib_mad_svc_handle_t             h_mad_svc;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_MAD ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_MAD ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MAD );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1004,7 +1010,7 @@ proxy_cancel_mad(
        if( !h_mad_svc )\r
        {\r
                p_ioctl->out.status = IB_INVALID_HANDLE;\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_MAD ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MAD );\r
                return CL_SUCCESS;\r
        }\r
 \r
@@ -1015,7 +1021,7 @@ proxy_cancel_mad(
         * The clean up of resources allocated for the sent mad will\r
         * be handled in the send completion callback\r
         */\r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_MAD ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -1036,20 +1042,20 @@ proxy_local_mad(
        ib_ca_handle_t                  h_ca;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER(AL_DBG_MAD , g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MAD );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( AL_DBG_MAD , g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MAD );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
        if( ((ib_mad_t*)p_ioctl->in.mad_in)->method != IB_MAD_METHOD_GET )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("invalid method %d\n", ((ib_mad_t*)p_ioctl->in.mad_in)->method) );\r
                status = IB_UNSUPPORTED;\r
                goto proxy_local_mad_err;\r
@@ -1075,7 +1081,7 @@ proxy_local_mad(
 proxy_local_mad_err:\r
        p_ioctl->out.status = status;\r
 \r
-       CL_EXIT(AL_DBG_MAD ,g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MAD );\r
        return CL_SUCCESS;\r
 }\r
 \r
index 2652bcdab3dfcf4c3dde4faf8fad13d45fbf3195..5639c43ab09744715211d5f0529ab568c36dea68 100644 (file)
 #include <iba/ib_al_ioctl.h>\r
 #include "al.h"\r
 #include "al_debug.h"\r
+\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_proxy_verbs.tmh"\r
+#endif\r
+\r
 #include "al_dev.h"\r
 /* Get the internal definitions of apis for the proxy */\r
 #include "al_ca.h"\r
@@ -187,7 +195,7 @@ proxy_get_vendor_libcfg(
                        (ual_get_uvp_name_ioctl_t*)cl_ioctl_in_buf( h_ioctl );\r
        al_ci_ca_t                                      *p_ci_ca;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_CA ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CA );\r
 \r
        UNUSED_PARAM( p_open_context );\r
 \r
@@ -196,13 +204,13 @@ proxy_get_vendor_libcfg(
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_CA ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CA );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
        /* Find the CAguid */\r
-       CL_TRACE( ( AL_DBG_DEV | AL_DBG_CA ), g_al_dbg_lvl,\r
-                       ("CA guid %"PRIx64".\n", p_ioctl->in.ca_guid) );\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CA,\r
+                       ("CA guid %I64x.\n", p_ioctl->in.ca_guid) );\r
 \r
        cl_spinlock_acquire( &gp_al_mgr->obj.lock );\r
        p_ci_ca = find_ci_ca( p_ioctl->in.ca_guid );\r
@@ -215,8 +223,8 @@ proxy_get_vendor_libcfg(
        else\r
        {\r
                /* found the ca guid, copy the user-mode verbs provider libname */\r
-               CL_TRACE( ( AL_DBG_DEV | AL_DBG_CA ), g_al_dbg_lvl,\r
-                               ("CA guid %"PRIx64". libname (%s)\n",\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CA,\r
+                               ("CA guid %I64x. libname (%s)\n",\r
                                p_ioctl->in.ca_guid, p_ci_ca->verbs.libname) );\r
                cl_memcpy( p_ioctl->out.uvp_lib_name, p_ci_ca->verbs.libname,\r
                        sizeof(p_ci_ca->verbs.libname));\r
@@ -224,7 +232,7 @@ proxy_get_vendor_libcfg(
                p_ioctl->out.status = IB_SUCCESS;\r
        }\r
        *p_ret_bytes = sizeof(p_ioctl->out);\r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_CA ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CA );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -313,7 +321,7 @@ proxy_queue_cb_buf(
        }\r
        cl_spinlock_release( &p_context->cb_lock );\r
 \r
-       AL_EXIT(AL_DBG_DEV);\r
+       AL_EXIT( AL_DBG_DEV );\r
        return TRUE;\r
 }\r
 \r
@@ -377,14 +385,14 @@ proxy_open_ca(
        ci_umv_buf_t                    *p_umv_buf = NULL;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_CA ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CA );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_CA ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CA );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -420,7 +428,7 @@ proxy_open_ca_err:  /* getting a handle failed. */
 \r
        p_ioctl->out.status = status;\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_CA ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CA );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -445,14 +453,14 @@ proxy_query_ca(
        ib_api_status_t                 status;\r
        uint32_t                                byte_cnt = 0;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_CA ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CA );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_CA ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CA );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -502,7 +510,7 @@ proxy_query_ca(
                }\r
                __except(EXCEPTION_EXECUTE_HANDLER)\r
                {\r
-                       AL_TRACE( AL_DBG_ERROR,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("Failed to copy CA attributes to user buffer %p\n",\r
                                p_ioctl->in.p_ca_attr) );\r
                        status = IB_INVALID_PERMISSION;\r
@@ -526,7 +534,7 @@ proxy_query_ca_err:
        p_ioctl->out.status = status;\r
        p_ioctl->out.byte_cnt = byte_cnt;\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_CA ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CA );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -547,14 +555,14 @@ proxy_modify_ca(
                                                        (al_dev_open_context_t *)p_open_context;\r
        ib_ca_handle_t                  h_ca;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_CA ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CA );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_CA ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CA );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -567,7 +575,7 @@ proxy_modify_ca(
        if( !h_ca )\r
        {\r
                p_ioctl->out.status = IB_INVALID_CA_HANDLE;\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_CA ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CA );\r
                return CL_SUCCESS;\r
        }\r
 \r
@@ -576,7 +584,7 @@ proxy_modify_ca(
 \r
        deref_al_obj( &h_ca->obj );\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_CA ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CA );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -597,14 +605,14 @@ proxy_close_ca(
                                                        (al_dev_open_context_t *)p_open_context;\r
        ib_ca_handle_t                  h_ca;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_CA ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CA );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_CA ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CA );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -617,7 +625,7 @@ proxy_close_ca(
        if( !h_ca )\r
        {\r
                p_ioctl->out.status = IB_INVALID_CA_HANDLE;\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_CA ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CA );\r
                return CL_SUCCESS;\r
        }\r
 \r
@@ -629,7 +637,7 @@ proxy_close_ca(
        h_ca->obj.pfn_destroy( &h_ca->obj, ib_sync_destroy );\r
        p_ioctl->out.status = IB_SUCCESS;\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_CA ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CA );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -687,14 +695,14 @@ proxy_ci_call(
        ib_api_status_t                 status;\r
        uint32_t                                num_handles;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_PD ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CA );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) < sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_CA ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CA );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -702,7 +710,7 @@ proxy_ci_call(
        if( num_handles > 1 &&\r
                cl_ioctl_in_size( h_ioctl ) != (sizeof(uint64_t) * (num_handles - 1)) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_CA ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CA );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -717,7 +725,7 @@ proxy_ci_call(
        if( !h_ca )\r
        {\r
                p_ioctl->out.status = IB_INVALID_CA_HANDLE;\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_CA ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CA );\r
                return CL_SUCCESS;\r
        }\r
 \r
@@ -732,7 +740,7 @@ proxy_ci_call(
                {\r
                        p_ioctl->out.status = IB_INSUFFICIENT_MEMORY;\r
                        deref_al_obj( &h_ca->obj );\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR, ("Failed to allocate handle array.\n") );\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Failed to allocate handle array.\n") );\r
                        return CL_SUCCESS;\r
                }\r
 \r
@@ -748,7 +756,7 @@ proxy_ci_call(
                        cl_free( p_handle_array );\r
                        p_ioctl->out.status = status;\r
                        deref_al_obj( &h_ca->obj );\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR, ("Failed to convert handles.\n") );\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("Failed to convert handles.\n") );\r
                        return CL_SUCCESS;\r
                }\r
        }\r
@@ -822,7 +830,7 @@ proxy_ci_call_err:
 \r
        deref_al_obj( &h_ca->obj );\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_CA ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CA );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -848,14 +856,14 @@ proxy_alloc_pd(
        ci_umv_buf_t                    *p_umv_buf = NULL;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_PD ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PD );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_PD ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_PD );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -901,7 +909,7 @@ proxy_alloc_pd_err:
        p_ioctl->out.status = status;\r
        *p_ret_bytes = sizeof(p_ioctl->out);\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_PD ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PD );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -921,14 +929,14 @@ proxy_dealloc_pd(
                (al_dev_open_context_t *)p_open_context;\r
        ib_pd_handle_t                  h_pd;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_PD ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_PD );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_PD ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_PD );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -941,14 +949,14 @@ proxy_dealloc_pd(
        if( !h_pd )\r
        {\r
                p_ioctl->out.status = IB_INVALID_PD_HANDLE;\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_PD ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_PD );\r
                return CL_SUCCESS;\r
        }\r
 \r
        h_pd->obj.pfn_destroy( &h_pd->obj, ib_sync_destroy );\r
        p_ioctl->out.status = IB_SUCCESS;\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_PD ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_PD );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -965,7 +973,7 @@ proxy_qp_err_cb(
        al_dev_open_context_t   *p_context = h_qp->obj.h_al->p_context;\r
        misc_cb_ioctl_info_t    cb_info;\r
 \r
-       AL_ENTER( AL_DBG_DEV | AL_DBG_QP );\r
+       AL_ENTER( AL_DBG_QP );\r
 \r
        /*\r
         * If we're already closing the device - do not queue a callback, since\r
@@ -992,7 +1000,7 @@ proxy_qp_err_cb(
 \r
        proxy_context_deref( p_context );\r
 \r
-       AL_EXIT( AL_DBG_DEV | AL_DBG_QP );\r
+       AL_EXIT( AL_DBG_QP );\r
 }\r
 \r
 \r
@@ -1018,14 +1026,14 @@ proxy_create_qp(
        ib_api_status_t                 status;\r
        ib_pfn_event_cb_t               pfn_ev;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_QP ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_QP );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_QP ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_QP );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1109,7 +1117,7 @@ proxy_create_qp_err1:
        if( h_sq_cq )\r
                deref_al_obj( &h_sq_cq->obj );\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_QP ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_QP );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -1132,14 +1140,14 @@ proxy_query_qp(
        ci_umv_buf_t                    *p_umv_buf = NULL;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_QP ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_QP );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_QP ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_QP );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1205,7 +1213,7 @@ proxy_query_qp_err:
        p_ioctl->out.status = status;\r
        *p_ret_bytes = sizeof(p_ioctl->out);\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_QP ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_QP );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -1229,14 +1237,14 @@ proxy_modify_qp(
        ci_umv_buf_t                    *p_umv_buf = NULL;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_QP ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_QP );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_QP ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_QP );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1272,7 +1280,7 @@ proxy_modify_qp_err:
        p_ioctl->out.status = status;\r
        *p_ret_bytes = sizeof(p_ioctl->out);\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_QP ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_QP );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -1292,14 +1300,14 @@ proxy_destroy_qp(
                (al_dev_open_context_t *)p_open_context;\r
        ib_qp_handle_t                  h_qp;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_QP ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_QP );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_QP ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_QP );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1311,7 +1319,7 @@ proxy_destroy_qp(
                al_hdl_ref( p_context->h_al, p_ioctl->in.h_qp, AL_OBJ_TYPE_H_QP );\r
        if( !h_qp )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_QP_HANDLE\n") );\r
                p_ioctl->out.status = IB_INVALID_QP_HANDLE;\r
        }\r
        else\r
@@ -1320,7 +1328,7 @@ proxy_destroy_qp(
                p_ioctl->out.status = IB_SUCCESS;\r
        }\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_QP ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_QP );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -1345,14 +1353,14 @@ proxy_create_av(
        ci_umv_buf_t                    *p_umv_buf = NULL;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_AV ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_AV );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_AV ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_AV );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1398,7 +1406,7 @@ proxy_create_av_err:
        p_ioctl->out.status = status;\r
        *p_ret_bytes = sizeof(p_ioctl->out);\r
        \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_AV ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_AV );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -1423,14 +1431,14 @@ proxy_query_av(
        ci_umv_buf_t                    *p_umv_buf = NULL;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_AV ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_AV );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_AV ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_AV );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1473,7 +1481,7 @@ proxy_query_av_err:
        p_ioctl->out.status = status;\r
        *p_ret_bytes = sizeof(p_ioctl->out);\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_AV ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_AV );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -1497,14 +1505,14 @@ proxy_modify_av(
        ci_umv_buf_t                    *p_umv_buf = NULL;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_AV ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_AV );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_AV ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_AV );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1540,7 +1548,7 @@ proxy_modify_av_err:
        p_ioctl->out.status = status;\r
        *p_ret_bytes = sizeof(p_ioctl->out);\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_AV ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_AV );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -1562,14 +1570,14 @@ proxy_destroy_av(
                (al_dev_open_context_t *)p_open_context;\r
        ib_av_handle_t                  h_av;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_AV ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_AV );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_AV ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_AV );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1582,14 +1590,14 @@ proxy_destroy_av(
        if( !h_av )\r
        {\r
                p_ioctl->out.status = IB_INVALID_AV_HANDLE;\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_AV ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_AV );\r
                return CL_SUCCESS;\r
        }\r
 \r
        h_av->obj.pfn_destroy( &h_av->obj, NULL );\r
        p_ioctl->out.status = IB_SUCCESS;\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_AV ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_AV );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -1614,14 +1622,14 @@ proxy_modify_cq(
        ib_api_status_t                 status;\r
        uint32_t                                size;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CQ );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CQ );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1662,7 +1670,7 @@ proxy_modify_cq_err:
        p_ioctl->out.status = status;\r
        *p_ret_bytes = sizeof(p_ioctl->out);\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CQ );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -1762,14 +1770,14 @@ proxy_create_cq(
        ib_api_status_t                 status;\r
        ib_pfn_event_cb_t               pfn_ev;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CQ );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CQ );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1845,7 +1853,7 @@ proxy_create_cq_err1:
        p_ioctl->out.status = status;\r
        *p_ret_bytes = sizeof(p_ioctl->out);\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CQ );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -1868,14 +1876,14 @@ proxy_query_cq(
        ci_umv_buf_t                    *p_umv_buf = NULL;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CQ );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CQ );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1912,7 +1920,7 @@ proxy_query_cq_err:
        p_ioctl->out.status = status;\r
        *p_ret_bytes = sizeof(p_ioctl->out);\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CQ );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -1934,14 +1942,14 @@ proxy_destroy_cq(
        ib_cq_handle_t                  h_cq;\r
        cl_waitobj_handle_t             h_wait_obj;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CQ );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CQ );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1954,7 +1962,7 @@ proxy_destroy_cq(
        if( !h_cq )\r
        {\r
                p_ioctl->out.status = IB_INVALID_CQ_HANDLE;\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CQ );\r
                return CL_SUCCESS;\r
        }\r
 \r
@@ -1968,7 +1976,7 @@ proxy_destroy_cq(
 \r
        p_ioctl->out.status = IB_SUCCESS;\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CQ );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -1997,13 +2005,13 @@ proxy_post_send(
        ib_api_status_t                 status;\r
        size_t                                  in_buf_sz;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_QP ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_QP );\r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) < sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_QP ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_QP );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -2017,7 +2025,7 @@ proxy_post_send(
        in_buf_sz += sizeof(ib_local_ds_t) * p_ioctl->in.num_ds;\r
        if( cl_ioctl_in_size( h_ioctl ) != in_buf_sz )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_QP ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_QP );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -2112,7 +2120,7 @@ proxy_post_send_done:
        p_ioctl->out.status = status;\r
        *p_ret_bytes = sizeof(p_ioctl->out);\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_QP ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_QP );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -2141,14 +2149,14 @@ proxy_post_recv(
        ib_api_status_t                 status;\r
        size_t                                  in_buf_sz;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_QP ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_QP );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) < sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_QP ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_QP );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -2162,7 +2170,7 @@ proxy_post_recv(
        in_buf_sz += sizeof(ib_local_ds_t) * p_ioctl->in.num_ds;\r
        if( cl_ioctl_in_size( h_ioctl ) != in_buf_sz )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_QP ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_QP );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -2234,7 +2242,7 @@ proxy_post_recv_done:
        p_ioctl->out.status = status;\r
        *p_ret_bytes = sizeof(p_ioctl->out);\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_QP ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_QP );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -2255,14 +2263,14 @@ proxy_peek_cq(
                (al_dev_open_context_t *)p_open_context;\r
        ib_cq_handle_t                  h_cq;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CQ );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CQ );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -2276,7 +2284,7 @@ proxy_peek_cq(
        {\r
                p_ioctl->out.status = IB_INVALID_CQ_HANDLE;\r
                p_ioctl->out.n_cqes = 0;\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CQ );\r
                return CL_SUCCESS;\r
        }\r
 \r
@@ -2284,7 +2292,7 @@ proxy_peek_cq(
 \r
        deref_al_obj( &h_cq->obj );\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CQ );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -2308,7 +2316,7 @@ proxy_poll_cq(
        size_t                                  out_buf_sz;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CQ );\r
 \r
        p_ioctl = (ual_poll_cq_ioctl_t*)cl_ioctl_in_buf( h_ioctl );\r
        p_context = (al_dev_open_context_t*)p_open_context;\r
@@ -2318,7 +2326,7 @@ proxy_poll_cq(
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) < sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CQ );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -2331,7 +2339,7 @@ proxy_poll_cq(
        out_buf_sz += sizeof(ib_wc_t) * (p_ioctl->in.num_wc - 1);\r
        if( cl_ioctl_out_size( h_ioctl ) != out_buf_sz )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CQ );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -2385,7 +2393,7 @@ proxy_poll_cq_err:
        if( p_ioctl->out.num_wc )\r
                *p_ret_bytes += (sizeof(ib_wc_t) * (p_ioctl->out.num_wc));\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CQ );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -2406,14 +2414,14 @@ proxy_rearm_cq(
                (al_dev_open_context_t *)p_open_context;\r
        ib_cq_handle_t                  h_cq;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CQ );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CQ );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -2426,7 +2434,7 @@ proxy_rearm_cq(
        if( !h_cq )\r
        {\r
                p_ioctl->out.status = IB_INVALID_CQ_HANDLE;\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CQ );\r
                return CL_SUCCESS;\r
        }\r
 \r
@@ -2434,7 +2442,7 @@ proxy_rearm_cq(
 \r
        deref_al_obj( &h_cq->obj );\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CQ );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -2456,14 +2464,14 @@ proxy_rearm_n_cq(
                (al_dev_open_context_t *)p_open_context;\r
        ib_cq_handle_t                  h_cq;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_CQ );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CQ );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -2476,7 +2484,7 @@ proxy_rearm_n_cq(
        if( !h_cq )\r
        {\r
                p_ioctl->out.status = IB_INVALID_CQ_HANDLE;\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_CQ );\r
                return CL_SUCCESS;\r
        }\r
 \r
@@ -2484,7 +2492,7 @@ proxy_rearm_n_cq(
 \r
        deref_al_obj( &h_cq->obj );\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_CQ ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_CQ );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -2507,14 +2515,14 @@ proxy_register_mr(
        ib_mr_handle_t                  h_mr;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_MR ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MR );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_MR ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MR );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -2557,7 +2565,7 @@ proxy_register_mr_err:
        p_ioctl->out.status = status;\r
        *p_ret_bytes = sizeof(p_ioctl->out);\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_MR ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MR );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -2570,7 +2578,7 @@ static cl_status_t
 proxy_query_mr(\r
        IN              void                                    *p_open_context,\r
        IN              cl_ioctl_handle_t               h_ioctl,\r
-               OUT     size_t                                  *p_ret_bytes )\r
+       OUT             size_t                                  *p_ret_bytes )\r
 {\r
        ual_query_mr_ioctl_t    *p_ioctl =\r
                (ual_query_mr_ioctl_t *)cl_ioctl_in_buf( h_ioctl );\r
@@ -2579,14 +2587,14 @@ proxy_query_mr(
        ib_mr_handle_t                  h_mr;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_MR ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MR );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_MR ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MR );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -2619,7 +2627,7 @@ proxy_query_mr_err:
        p_ioctl->out.status = status;\r
        *p_ret_bytes = sizeof(p_ioctl->out);\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_MR ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MR );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -2643,14 +2651,14 @@ proxy_modify_mr(
        ib_mr_create_t                  *p_mr_create;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_MR ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MR );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_MR ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MR );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -2715,7 +2723,7 @@ proxy_modify_mr_err:
        p_ioctl->out.status = status;\r
        *p_ret_bytes = sizeof(p_ioctl->out);\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_MR ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MR );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -2739,14 +2747,14 @@ proxy_shared_mr(
        ib_api_status_t                 status;\r
        uint64_t                                vaddr;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_MR ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MR );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_MR ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MR );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -2800,7 +2808,7 @@ proxy_shared_mr_err:
        p_ioctl->out.status = status;\r
        *p_ret_bytes = sizeof(p_ioctl->out);\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_MR ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MR );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -2821,14 +2829,14 @@ proxy_deregister_mr(
                (al_dev_open_context_t *)p_open_context;\r
        ib_mr_handle_t                  h_mr;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_MR ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MR );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_MR ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MR );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -2841,7 +2849,7 @@ proxy_deregister_mr(
        if( !h_mr )\r
        {\r
                p_ioctl->out.status = IB_INVALID_MR_HANDLE;\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_MR ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MR );\r
                return CL_SUCCESS;\r
        }\r
 \r
@@ -2850,7 +2858,7 @@ proxy_deregister_mr(
        if( p_ioctl->out.status != IB_SUCCESS )\r
                deref_al_obj( &h_mr->obj );\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_MR ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MR );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -2874,14 +2882,14 @@ proxy_create_mw(
        ci_umv_buf_t                    *p_umv_buf = NULL;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_MW ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MW );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_MW ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MW );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -2926,7 +2934,7 @@ proxy_create_mw_err:
        p_ioctl->out.status = status;\r
        *p_ret_bytes = sizeof(p_ioctl->out);\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_MW ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MW );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -2950,14 +2958,14 @@ proxy_query_mw(
        ib_api_status_t                 status;\r
        ib_pd_handle_t                  h_pd;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_MW ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MW );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_MW ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MW );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -3002,7 +3010,7 @@ proxy_query_mw_err:
        p_ioctl->out.status = status;\r
        *p_ret_bytes = sizeof(p_ioctl->out);\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_MW ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MW );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -3026,14 +3034,14 @@ proxy_bind_mw(
        ib_mr_handle_t                  h_mr;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_MW ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MW );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_MW ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MW );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -3083,7 +3091,7 @@ proxy_bind_mw_err1:
        p_ioctl->out.status = status;\r
        *p_ret_bytes = sizeof(p_ioctl->out);\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_MW ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MW );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -3104,14 +3112,14 @@ proxy_destroy_mw(
                (al_dev_open_context_t *)p_open_context;\r
        ib_mw_handle_t                  h_mw;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_MW ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MW );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_MW ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MW );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -3124,7 +3132,7 @@ proxy_destroy_mw(
        if( !h_mw )\r
        {\r
                p_ioctl->out.status = IB_INVALID_MW_HANDLE;\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_MW ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MW );\r
                return CL_SUCCESS;\r
        }\r
        p_ioctl->out.status = destroy_mw( h_mw );\r
@@ -3132,7 +3140,7 @@ proxy_destroy_mw(
        if( p_ioctl->out.status != IB_SUCCESS )\r
                deref_al_obj( &h_mw->obj );\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_MW ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MW );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -3152,14 +3160,14 @@ proxy_get_spl_qp(
        ci_umv_buf_t                    *p_umv_buf = NULL;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_QP ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_QP );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_QP ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_QP );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -3205,7 +3213,7 @@ proxy_get_spl_qp_err:
        p_ioctl->out.status = status;\r
        *p_ret_bytes = sizeof(p_ioctl->out);\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_QP ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_QP );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -3226,14 +3234,14 @@ proxy_attach_mcast(
        ci_umv_buf_t                            *p_umv_buf = NULL;\r
        ib_api_status_t                         status;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_MCAST ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MCAST );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_MCAST ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MCAST );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -3278,7 +3286,7 @@ proxy_attach_mcast_err:
        p_ioctl->out.status = status;\r
        *p_ret_bytes = sizeof(p_ioctl->out);\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_MCAST ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MCAST );\r
        return CL_SUCCESS;\r
 }\r
 \r
@@ -3296,14 +3304,14 @@ proxy_detach_mcast(
                (al_dev_open_context_t *)p_open_context;\r
        al_attach_handle_t                      h_attach;\r
 \r
-       CL_ENTER( ( AL_DBG_DEV | AL_DBG_MCAST ), g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_MCAST );\r
 \r
        /* Validate input buffers. */\r
        if( !cl_ioctl_in_buf( h_ioctl ) || !cl_ioctl_out_buf( h_ioctl ) ||\r
                cl_ioctl_in_size( h_ioctl ) != sizeof(p_ioctl->in) ||\r
                cl_ioctl_out_size( h_ioctl ) != sizeof(p_ioctl->out) )\r
        {\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_MCAST ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MCAST );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -3316,14 +3324,14 @@ proxy_detach_mcast(
        if( !h_attach )\r
        {\r
                p_ioctl->out.status = IB_INVALID_MCAST_HANDLE;\r
-               CL_EXIT( ( AL_DBG_DEV | AL_DBG_MCAST ), g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_MCAST );\r
                return CL_SUCCESS;\r
        }\r
 \r
        h_attach->obj.pfn_destroy( &h_attach->obj, ib_sync_destroy );\r
        p_ioctl->out.status = IB_SUCCESS;\r
 \r
-       CL_EXIT( ( AL_DBG_DEV | AL_DBG_MCAST ), g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_MCAST );\r
        return CL_SUCCESS;\r
 }\r
 \r
index 6671f5ba931ade24c9bacc4e05f433a18209dec9..7ea35108a7e59f7833725570f2f198e0a8f1805a 100644 (file)
 #include "al_ca.h"\r
 #include "al_common.h"\r
 #include "al_debug.h"\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_sa_req.tmh"\r
+#endif\r
 #include "al_mgr.h"\r
 #include "al_query.h"\r
 #include "ib_common.h"\r
@@ -114,14 +120,14 @@ create_sa_req_mgr(
        ib_pnp_req_t                    pnp_req;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_SA_REQ, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SA_REQ );\r
        CL_ASSERT( p_parent_obj );\r
        CL_ASSERT( gp_sa_req_mgr == NULL );\r
 \r
        gp_sa_req_mgr = cl_zalloc( sizeof( sa_req_mgr_t ) );\r
        if( gp_sa_req_mgr == NULL )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cl_zalloc failed\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -135,7 +141,7 @@ create_sa_req_mgr(
        if( status != IB_SUCCESS )\r
        {\r
                free_sa_req_mgr( &gp_sa_req_mgr->obj );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cl_spinlock_init failed\n") );\r
                return status;\r
        }\r
@@ -143,7 +149,7 @@ create_sa_req_mgr(
        if( status != IB_SUCCESS )\r
        {\r
                gp_sa_req_mgr->obj.pfn_destroy( &gp_sa_req_mgr->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -158,7 +164,7 @@ create_sa_req_mgr(
        if (status != IB_SUCCESS)\r
        {\r
                gp_sa_req_mgr->obj.pfn_destroy( &gp_sa_req_mgr->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_reg_pnp failed: %s\n", ib_get_err_str( status ) ) );\r
                return status;\r
        }\r
@@ -169,7 +175,7 @@ create_sa_req_mgr(
         * a call to ref_al_obj and deref_al_obj.\r
         */\r
 \r
-       CL_EXIT( AL_DBG_SA_REQ, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SA_REQ );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -229,7 +235,7 @@ sa_req_mgr_pnp_cb(
        ib_pd_handle_t                          h_pd;\r
        ib_api_status_t                         status;\r
 \r
-       CL_ENTER( AL_DBG_SA_REQ, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SA_REQ );\r
        CL_ASSERT( p_pnp_rec );\r
        CL_ASSERT( p_pnp_rec->pnp_context == &gp_sa_req_mgr->obj );\r
 \r
@@ -240,7 +246,7 @@ sa_req_mgr_pnp_cb(
                status = create_sa_req_svc( (ib_pnp_port_rec_t*)p_pnp_rec );\r
                if( status != IB_SUCCESS )\r
                {\r
-                       CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("create_sa_req_svc failed: %s\n", ib_get_err_str(status)) );\r
                }\r
                break;\r
@@ -257,7 +263,7 @@ sa_req_mgr_pnp_cb(
        case IB_PNP_PORT_ACTIVE:\r
        case IB_PNP_SM_CHANGE:\r
                CL_ASSERT( p_pnp_rec->context );\r
-               CL_TRACE( AL_DBG_SA_REQ, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_SA_REQ,\r
                        ("updating SM information\n") );\r
 \r
                p_sa_req_svc = p_pnp_rec->context;\r
@@ -270,7 +276,7 @@ sa_req_mgr_pnp_cb(
                status = ib_query_av( p_sa_req_svc->h_av, &av_attr, &h_pd );\r
                if( status != IB_SUCCESS )\r
                {\r
-                       CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("AV query failed: %s\n", ib_get_err_str(status)) );\r
                        status = IB_SUCCESS;\r
                        break;\r
@@ -281,7 +287,7 @@ sa_req_mgr_pnp_cb(
                status = ib_modify_av( p_sa_req_svc->h_av, &av_attr );\r
                if( status != IB_SUCCESS )\r
                {\r
-                       CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("modify AV failed: %s\n", ib_get_err_str(status) ) );\r
                        status = IB_SUCCESS;\r
                        break;\r
@@ -300,7 +306,7 @@ sa_req_mgr_pnp_cb(
                status = IB_SUCCESS;\r
                break;\r
        }\r
-       CL_EXIT( AL_DBG_SA_REQ, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SA_REQ );\r
        return status;\r
 }\r
 \r
@@ -316,7 +322,7 @@ create_sa_req_svc(
        sa_req_svc_t*                   p_sa_req_svc;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_SA_REQ, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SA_REQ );\r
        CL_ASSERT( p_pnp_rec );\r
        CL_ASSERT( p_pnp_rec->p_ca_attr );\r
        CL_ASSERT( p_pnp_rec->p_port_attr );\r
@@ -342,7 +348,7 @@ create_sa_req_svc(
        if( status != IB_SUCCESS )\r
        {\r
                p_sa_req_svc->obj.pfn_destroy( &p_sa_req_svc->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -352,7 +358,7 @@ create_sa_req_svc(
        if( status != IB_SUCCESS )\r
        {\r
                p_sa_req_svc->obj.pfn_destroy( &p_sa_req_svc->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("init_sa_req_svc failed: %s\n", ib_get_err_str(status) ) );\r
                return status;\r
        }\r
@@ -363,7 +369,7 @@ create_sa_req_svc(
        /* Release the reference taken in init_al_obj. */\r
        deref_al_obj( &p_sa_req_svc->obj );\r
 \r
-       CL_EXIT( AL_DBG_SA_REQ, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SA_REQ );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -429,14 +435,14 @@ init_sa_req_svc(
        ib_ca_handle_t                  h_ca;\r
        ib_av_attr_t                    av_attr;\r
 \r
-       CL_ENTER( AL_DBG_SA_REQ, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SA_REQ );\r
        CL_ASSERT( p_sa_req_svc && p_pnp_rec );\r
 \r
        /* Acquire the correct CI CA for this port. */\r
        h_ca = acquire_ca( p_pnp_rec->p_ca_attr->ca_guid );\r
        if( !h_ca )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_SA_REQ, ("Failed to acquire CA\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_INFORMATION, AL_DBG_SA_REQ, ("Failed to acquire CA\n") );\r
                return IB_INVALID_GUID;\r
        }\r
        p_sa_req_svc->obj.p_ci_ca = h_ca->obj.p_ci_ca;\r
@@ -446,7 +452,7 @@ init_sa_req_svc(
        p_sa_req_svc->port_num = p_pnp_rec->p_port_attr->port_num;\r
        p_sa_req_svc->sm_lid = p_pnp_rec->p_port_attr->sm_lid;\r
        p_sa_req_svc->sm_sl = p_pnp_rec->p_port_attr->sm_sl;\r
-       CL_TRACE( AL_DBG_SA_REQ, g_al_dbg_lvl,\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_SA_REQ,\r
                ("using port: 0x%x\tsm lid: 0x%x\tsm sl: 0x%x\n",\r
                p_sa_req_svc->port_num, p_sa_req_svc->sm_lid, p_sa_req_svc->sm_sl) );\r
 \r
@@ -474,7 +480,7 @@ init_sa_req_svc(
        /* Check for failure allocating the QP. */\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("failed to create QP1 alias: %s\n", ib_get_err_str(status) ) );\r
                return status;\r
        }\r
@@ -492,7 +498,7 @@ init_sa_req_svc(
                &p_sa_req_svc->h_mad_svc );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("failed to register MAD service: %s\n", ib_get_err_str(status) ) );\r
                return status;\r
        }\r
@@ -509,12 +515,12 @@ init_sa_req_svc(
                &av_attr, &p_sa_req_svc->h_av );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("failed to create AV: %s\n", ib_get_err_str(status) ) );\r
                return status;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_SA_REQ, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SA_REQ );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -598,13 +604,13 @@ al_send_sa_req(
        ib_sa_mad_t                             *p_sa_mad;\r
        KEVENT                                  event;\r
 \r
-       CL_ENTER( AL_DBG_SA_REQ, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SA_REQ );\r
 \r
        if( flags & IB_FLAGS_SYNC )\r
        {\r
                if( !cl_is_blockable() )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("Thread context not blockable\n") );\r
                        return IB_INVALID_SETTING;\r
                }\r
@@ -621,7 +627,7 @@ al_send_sa_req(
        p_sa_req->p_sa_req_svc = acquire_sa_req_svc( port_guid );\r
        if( !p_sa_req->p_sa_req_svc )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_QUERY | AL_DBG_WARN, ("invalid port GUID\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_INFORMATION, AL_DBG_QUERY, ("invalid port GUID\n") );\r
                return IB_INVALID_GUID;\r
        }\r
 \r
@@ -687,7 +693,7 @@ al_send_sa_req(
                KeWaitForSingleObject( &event, Executive, KernelMode, FALSE, NULL );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_SA_REQ, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SA_REQ );\r
        return status;\r
 }\r
 \r
@@ -706,7 +712,7 @@ sa_req_send_comp_cb(
        sa_req_svc_t            *p_sa_req_svc;\r
        KEVENT                          *p_sync_event;\r
 \r
-       CL_ENTER( AL_DBG_SA_REQ, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SA_REQ );\r
 \r
        UNUSED_PARAM( h_mad_svc );\r
        UNUSED_PARAM( mad_svc_context );\r
@@ -718,7 +724,7 @@ sa_req_send_comp_cb(
        if( p_request_mad->status != IB_WCS_SUCCESS )\r
        {\r
                /* Notify the requestor of the result. */\r
-               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("request failed - notifying user\n") );\r
 \r
                p_sa_req = p_request_mad->send_context1;\r
@@ -735,7 +741,7 @@ sa_req_send_comp_cb(
        /* Return the MAD. */\r
        ib_put_mad( p_request_mad );\r
 \r
-       CL_EXIT( AL_DBG_SA_REQ, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SA_REQ );\r
 }\r
 \r
 \r
@@ -754,7 +760,7 @@ sa_req_recv_comp_cb(
        ib_sa_mad_t                     *p_sa_mad;\r
        KEVENT                          *p_sync_event;\r
 \r
-       CL_ENTER( AL_DBG_SA_REQ, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SA_REQ );\r
 \r
        UNUSED_PARAM( h_mad_svc );\r
        UNUSED_PARAM( mad_svc_context );\r
@@ -773,13 +779,13 @@ sa_req_recv_comp_cb(
                p_sa_req->status = IB_REMOTE_ERROR;\r
 \r
        /* Notify the requestor of the result. */\r
-       CL_TRACE( AL_DBG_SA_REQ, g_al_dbg_lvl, ("notifying user\n") );\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_SA_REQ, ("notifying user\n") );\r
        p_sa_req->pfn_sa_req_cb( p_sa_req, p_mad_response );\r
        if( p_sync_event )\r
                KeSetEvent( p_sync_event, 0, FALSE );\r
        deref_al_obj( &p_sa_req_svc->obj );\r
 \r
-       CL_EXIT( AL_DBG_SA_REQ, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SA_REQ );\r
 }\r
 \r
 \r
index 3aefe95d40cba63316d8c18116f18879452ad2cc..ff0fbf52870036a8cee3015a376153fc2c531572 100644 (file)
 #include "ib_common.h"\r
 #include "al_common.h"\r
 #include "al_debug.h"\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_smi.tmh"\r
+#endif\r
 #include "al_verbs.h"\r
 #include "al_mgr.h"\r
 #include "al_pnp.h"\r
@@ -246,7 +252,7 @@ create_spl_qp_mgr(
        ib_api_status_t                 status;\r
        cl_status_t                             cl_status;\r
 \r
-       CL_ENTER( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( p_parent_obj );\r
        CL_ASSERT( !gp_spl_qp_mgr );\r
@@ -254,7 +260,7 @@ create_spl_qp_mgr(
        gp_spl_qp_mgr = cl_zalloc( sizeof( spl_qp_mgr_t ) );\r
        if( !gp_spl_qp_mgr )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("IB_INSUFFICIENT_MEMORY\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -273,7 +279,7 @@ create_spl_qp_mgr(
        if( status != IB_SUCCESS )\r
        {\r
                free_spl_qp_mgr( &gp_spl_qp_mgr->obj );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("init_al_obj failed, %s\n", ib_get_err_str( status ) ) );\r
                return status;\r
        }\r
@@ -283,7 +289,7 @@ create_spl_qp_mgr(
        if( status != IB_SUCCESS )\r
        {\r
                gp_spl_qp_mgr->obj.pfn_destroy( &gp_spl_qp_mgr->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -294,7 +300,7 @@ create_spl_qp_mgr(
        if( cl_status != CL_SUCCESS )\r
        {\r
                gp_spl_qp_mgr->obj.pfn_destroy( &gp_spl_qp_mgr->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("cl_timer_init failed, status 0x%x\n", cl_status ) );\r
                return ib_convert_cl_status( cl_status );\r
        }\r
@@ -322,7 +328,7 @@ create_spl_qp_mgr(
        if( status != IB_SUCCESS )\r
        {\r
                gp_spl_qp_mgr->obj.pfn_destroy( &gp_spl_qp_mgr->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_reg_pnp QP0 failed, %s\n", ib_get_err_str( status ) ) );\r
                return status;\r
        }\r
@@ -341,7 +347,7 @@ create_spl_qp_mgr(
        if( status != IB_SUCCESS )\r
        {\r
                gp_spl_qp_mgr->obj.pfn_destroy( &gp_spl_qp_mgr->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_reg_pnp QP1 failed, %s\n", ib_get_err_str( status ) ) );\r
                return status;\r
        }\r
@@ -351,7 +357,7 @@ create_spl_qp_mgr(
         * because we need one on behalf of the ib_reg_pnp call.\r
         */\r
 \r
-       CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -418,11 +424,11 @@ spl_qp0_agent_pnp_cb(
        IN                              ib_pnp_rec_t*                           p_pnp_rec )\r
 {\r
        ib_api_status_t status;\r
-       CL_ENTER( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI_CB );\r
 \r
        status = spl_qp_agent_pnp( p_pnp_rec, IB_QPT_QP0 );\r
 \r
-       CL_EXIT( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI_CB );\r
        return status;\r
 }\r
 \r
@@ -436,11 +442,11 @@ spl_qp1_agent_pnp_cb(
        IN                              ib_pnp_rec_t*                           p_pnp_rec )\r
 {\r
        ib_api_status_t status;\r
-       CL_ENTER( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI_CB );\r
 \r
        status = spl_qp_agent_pnp( p_pnp_rec, IB_QPT_QP1 );\r
 \r
-       CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI );\r
        return status;\r
 }\r
 \r
@@ -457,7 +463,7 @@ spl_qp_agent_pnp(
        ib_api_status_t                 status;\r
        al_obj_t*                               p_obj;\r
 \r
-       CL_ENTER( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI_CB );\r
 \r
        CL_ASSERT( p_pnp_rec );\r
        p_obj = p_pnp_rec->context;\r
@@ -489,7 +495,7 @@ spl_qp_agent_pnp(
                break;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI );\r
        return status;\r
 }\r
 \r
@@ -512,13 +518,13 @@ create_spl_qp_svc(
        ib_mad_svc_t                    mad_svc;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( p_pnp_rec );\r
 \r
        if( ( qp_type != IB_QPT_QP0 ) && ( qp_type != IB_QPT_QP1 ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -529,7 +535,7 @@ create_spl_qp_svc(
        p_spl_qp_svc = cl_zalloc( sizeof( spl_qp_svc_t ) );\r
        if( !p_spl_qp_svc )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("IB_INSUFFICIENT_MEMORY\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -575,7 +581,7 @@ create_spl_qp_svc(
        if( status != IB_SUCCESS )\r
        {\r
                p_spl_qp_svc->obj.pfn_destroy( &p_spl_qp_svc->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -585,7 +591,7 @@ create_spl_qp_svc(
        if( !h_ca )\r
        {\r
                p_spl_qp_svc->obj.pfn_destroy( &p_spl_qp_svc->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("acquire_ca failed.\n") );\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("acquire_ca failed.\n") );\r
                return IB_INVALID_GUID;\r
        }\r
 \r
@@ -617,7 +623,7 @@ create_spl_qp_svc(
        if( status != IB_SUCCESS )\r
        {\r
                p_spl_qp_svc->obj.pfn_destroy( &p_spl_qp_svc->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_create_cq send CQ failed, %s\n", ib_get_err_str( status ) ) );\r
                return status;\r
        }\r
@@ -629,7 +635,7 @@ create_spl_qp_svc(
        if( cq_create.size < p_spl_qp_svc->max_qp_depth )\r
        {\r
                p_spl_qp_svc->obj.pfn_destroy( &p_spl_qp_svc->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_create_cq allocated insufficient send CQ size\n") );\r
                return IB_INSUFFICIENT_RESOURCES;\r
        }\r
@@ -645,7 +651,7 @@ create_spl_qp_svc(
        if( status != IB_SUCCESS )\r
        {\r
                p_spl_qp_svc->obj.pfn_destroy( &p_spl_qp_svc->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_create_cq recv CQ failed, %s\n", ib_get_err_str( status ) ) );\r
                return status;\r
        }\r
@@ -657,7 +663,7 @@ create_spl_qp_svc(
        if( cq_create.size < p_spl_qp_svc->max_qp_depth )\r
        {\r
                p_spl_qp_svc->obj.pfn_destroy( &p_spl_qp_svc->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_create_cq allocated insufficient recv CQ size\n") );\r
                return IB_INSUFFICIENT_RESOURCES;\r
        }\r
@@ -680,7 +686,7 @@ create_spl_qp_svc(
        if( status != IB_SUCCESS )\r
        {\r
                p_spl_qp_svc->obj.pfn_destroy( &p_spl_qp_svc->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_get_spl_qp failed, %s\n", ib_get_err_str( status ) ) );\r
                return status;\r
        }\r
@@ -693,7 +699,7 @@ create_spl_qp_svc(
        if( status != IB_SUCCESS )\r
        {\r
                p_spl_qp_svc->obj.pfn_destroy( &p_spl_qp_svc->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_query_qp failed, %s\n", ib_get_err_str( status ) ) );\r
                return status;\r
        }\r
@@ -703,7 +709,7 @@ create_spl_qp_svc(
                ( qp_attr.sq_sge < 3 ) || ( qp_attr.rq_sge < 1 ) )\r
        {\r
                p_spl_qp_svc->obj.pfn_destroy( &p_spl_qp_svc->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_get_spl_qp allocated attributes are insufficient\n") );\r
                return IB_INSUFFICIENT_RESOURCES;\r
        }\r
@@ -713,7 +719,7 @@ create_spl_qp_svc(
        if( status != IB_SUCCESS )\r
        {\r
                p_spl_qp_svc->obj.pfn_destroy( &p_spl_qp_svc->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("ib_init_dgrm_svc failed, %s\n", ib_get_err_str( status ) ) );\r
                return status;\r
        }\r
@@ -723,7 +729,7 @@ create_spl_qp_svc(
        if( status != IB_SUCCESS )\r
        {\r
                p_spl_qp_svc->obj.pfn_destroy( &p_spl_qp_svc->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("spl_qp_svc_post_recvs failed, %s\n",\r
                        ib_get_err_str( status ) ) );\r
                return status;\r
@@ -735,7 +741,7 @@ create_spl_qp_svc(
        if( status != IB_SUCCESS )\r
        {\r
                p_spl_qp_svc->obj.pfn_destroy( &p_spl_qp_svc->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("create_mad_disp failed, %s\n", ib_get_err_str( status ) ) );\r
                return status;\r
        }\r
@@ -779,7 +785,7 @@ create_spl_qp_svc(
                if (status != IB_SUCCESS)\r
                {\r
                        p_spl_qp_svc->obj.pfn_destroy( &p_spl_qp_svc->obj, NULL );\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("ib_get_spl_qp alias failed, %s\n",\r
                                ib_get_err_str( status ) ) );\r
                        return status;\r
@@ -800,7 +806,7 @@ create_spl_qp_svc(
                if( status != IB_SUCCESS )\r
                {\r
                        p_spl_qp_svc->obj.pfn_destroy( &p_spl_qp_svc->obj, NULL );\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("ib_reg_mad_svc failed, %s\n", ib_get_err_str( status ) ) );\r
                        return status;\r
                }\r
@@ -825,7 +831,7 @@ create_spl_qp_svc(
                if( cl_status != CL_SUCCESS )\r
                {\r
                        p_spl_qp_svc->obj.pfn_destroy( &p_spl_qp_svc->obj, NULL );\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("cl_timer_start failed, status 0x%x\n", cl_status ) );\r
                        return ib_convert_cl_status( cl_status );\r
                }\r
@@ -834,7 +840,7 @@ create_spl_qp_svc(
        /* Release the reference taken in init_al_obj. */\r
        deref_al_obj( &p_spl_qp_svc->obj );\r
 \r
-       CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI );\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -879,7 +885,7 @@ destroying_spl_qp_svc(
 \r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( p_obj );\r
        p_spl_qp_svc = PARENT_STRUCT( p_obj, spl_qp_svc_t, obj );\r
@@ -950,7 +956,7 @@ destroying_spl_qp_svc(
                CL_ASSERT( status == IB_SUCCESS );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI );\r
 }\r
 \r
 \r
@@ -967,7 +973,7 @@ free_spl_qp_svc(
        al_mad_element_t*               p_al_mad;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( p_obj );\r
        p_spl_qp_svc = PARENT_STRUCT( p_obj, spl_qp_svc_t, obj );\r
@@ -992,7 +998,7 @@ free_spl_qp_svc(
        destroy_al_obj( &p_spl_qp_svc->obj );\r
        cl_free( p_spl_qp_svc );\r
 \r
-       CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI );\r
 }\r
 \r
 \r
@@ -1007,7 +1013,7 @@ spl_qp_svc_lid_change(
 {\r
        spl_qp_svc_t*                   p_spl_qp_svc;\r
 \r
-       CL_ENTER( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( p_obj );\r
        CL_ASSERT( p_pnp_rec );\r
@@ -1018,7 +1024,7 @@ spl_qp_svc_lid_change(
        p_spl_qp_svc->base_lid = p_pnp_rec->p_port_attr->lid;\r
        p_spl_qp_svc->lmc = p_pnp_rec->p_port_attr->lmc;\r
 \r
-       CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI );\r
 }\r
 \r
 \r
@@ -1039,7 +1045,7 @@ route_mad_send(
        mad_route_t                             route;\r
        boolean_t                               local, loopback, discard;\r
 \r
-       CL_ENTER( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( p_spl_qp_svc );\r
        CL_ASSERT( p_send_wr );\r
@@ -1074,19 +1080,19 @@ route_mad_send(
                                 */\r
                                if( ( p_smp->hop_count == 0 ) || ( p_smp->hop_ptr == 0 ) )\r
                                {\r
-                                       CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                                ("hop cnt or hop ptr set to 0...discarding\n") );\r
                                        discard = TRUE;\r
                                }\r
                                else if( p_smp->hop_count != ( p_smp->hop_ptr - 1 ) )\r
                                {\r
-                                       CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                                ("hop cnt != (hop ptr - 1)...discarding\n") );\r
                                        discard = TRUE;\r
                                }\r
                                else if( p_smp->hop_count >= IB_SUBNET_PATH_HOPS_MAX )\r
                                {\r
-                                       CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                                ("hop cnt > max hops...discarding\n") );\r
                                        discard = TRUE;\r
                                }\r
@@ -1094,7 +1100,7 @@ route_mad_send(
                                                 ( p_smp->return_path[ p_smp->hop_ptr - 1 ] !=\r
                                                        p_spl_qp_svc->port_num ) )\r
                                {\r
-                                       CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                                ("return path[hop ptr - 1] != port num...discarding\n") );\r
                                        discard = TRUE;\r
                                }\r
@@ -1172,7 +1178,7 @@ route_mad_send(
        if( loopback && local ) route = ROUTE_LOOPBACK;\r
        if( discard ) route = ROUTE_DISCARD;\r
 \r
-       CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI );\r
        return route;\r
 }\r
 \r
@@ -1191,7 +1197,7 @@ spl_qp_svc_send(
        mad_route_t                             route;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( h_qp );\r
        CL_ASSERT( p_send_wr );\r
@@ -1223,7 +1229,7 @@ spl_qp_svc_send(
                 */\r
                cl_spinlock_release( &p_spl_qp_svc->obj.lock );\r
 \r
-               CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_SMI );\r
                return IB_RESOURCE_BUSY;\r
        }\r
 \r
@@ -1249,7 +1255,7 @@ spl_qp_svc_send(
                cl_spinlock_release( &p_spl_qp_svc->obj.lock );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI );\r
        return status;\r
 }\r
 \r
@@ -1266,7 +1272,7 @@ remote_mad_send(
        ib_smp_t*                               p_smp;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( p_spl_qp_svc );\r
        CL_ASSERT( p_mad_wr );\r
@@ -1329,7 +1335,7 @@ remote_mad_send(
                }\r
        }\r
 \r
-       CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI );\r
        return status;\r
 }\r
 \r
@@ -1576,7 +1582,7 @@ process_node_info(
                status = complete_local_mad( p_spl_qp_svc, p_mad_wr, p_mad_resp );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI );\r
        return status;\r
 }\r
 \r
@@ -1623,7 +1629,7 @@ process_node_desc(
                status = complete_local_mad( p_spl_qp_svc, p_mad_wr, p_mad_resp );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI );\r
        return status;\r
 }\r
 \r
@@ -1685,7 +1691,7 @@ fwd_local_mad(
        ib_api_status_t                 status = IB_SUCCESS;\r
        boolean_t                               smp_is_set;\r
 \r
-       CL_ENTER( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( p_spl_qp_svc );\r
        CL_ASSERT( p_mad_wr );\r
@@ -1708,7 +1714,7 @@ fwd_local_mad(
                status = get_resp_mad( p_spl_qp_svc, p_mad_wr, &p_mad_response );\r
                if( status != IB_SUCCESS )\r
                {\r
-                       CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+                       AL_EXIT( AL_DBG_SMI );\r
                        return status;\r
                }\r
                p_mad_response_buf = p_mad_response->p_mad_buf;\r
@@ -1767,7 +1773,7 @@ fwd_local_mad(
 \r
                __complete_send_mad( p_spl_qp_svc->h_mad_disp, p_mad_wr,\r
                        IB_WCS_LOCAL_OP_ERR );\r
-               CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_SMI );\r
                return status;\r
        }\r
 \r
@@ -1814,7 +1820,7 @@ fwd_local_mad(
                                p_spl_qp_svc->lmc = ib_port_info_get_lmc( p_port_info );\r
                                if (p_port_info->subnet_timeout & 0x80)\r
                                {\r
-                                       AL_TRACE(AL_DBG_PNP,\r
+                                       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_PNP,\r
                                                ("Client reregister event, setting sm_lid to 0.\n"));\r
                                        ci_ca_lock_attr(p_spl_qp_svc->obj.p_ci_ca);\r
                                        p_spl_qp_svc->obj.p_ci_ca->p_pnp_attr->\r
@@ -1831,7 +1837,7 @@ fwd_local_mad(
        if( status == IB_SUCCESS && !smp_is_set )\r
                status = IB_NOT_DONE;\r
 \r
-       CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI );\r
        return status;\r
 }\r
 \r
@@ -1847,7 +1853,7 @@ send_local_mad_cb(
        spl_qp_svc_t*                   p_spl_qp_svc;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI_CB );\r
 \r
        CL_ASSERT( p_item );\r
        p_spl_qp_svc = PARENT_STRUCT( p_item, spl_qp_svc_t, send_async );\r
@@ -1878,7 +1884,7 @@ send_local_mad_cb(
        /* No longer in use by the asynchronous processing thread. */\r
        cl_atomic_dec( &p_spl_qp_svc->in_use_cnt );\r
 \r
-       CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI );\r
 }\r
 \r
 \r
@@ -1893,7 +1899,7 @@ spl_qp_send_comp_cb(
 {\r
        spl_qp_svc_t*                   p_spl_qp_svc;\r
 \r
-       CL_ENTER( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI_CB );\r
 \r
        CL_ASSERT( cq_context );\r
        p_spl_qp_svc = cq_context;\r
@@ -1921,7 +1927,7 @@ spl_qp_send_comp_cb(
 \r
 #endif\r
 \r
-       CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI );\r
 }\r
 \r
 \r
@@ -1934,7 +1940,7 @@ spl_qp_send_async_cb(
        spl_qp_svc_t*                   p_spl_qp_svc;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI_CB );\r
 \r
        CL_ASSERT( p_item );\r
        p_spl_qp_svc = PARENT_STRUCT( p_item, spl_qp_svc_t, send_async_cb );\r
@@ -1952,7 +1958,7 @@ spl_qp_send_async_cb(
 \r
        deref_al_obj( &p_spl_qp_svc->obj );\r
 \r
-       CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI );\r
 }\r
 #endif\r
 \r
@@ -1968,7 +1974,7 @@ spl_qp_recv_comp_cb(
 {\r
        spl_qp_svc_t*                   p_spl_qp_svc;\r
 \r
-       CL_ENTER( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( cq_context );\r
        p_spl_qp_svc = cq_context;\r
@@ -1992,7 +1998,7 @@ spl_qp_recv_comp_cb(
 \r
 #endif\r
 \r
-       CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI );\r
 }\r
 \r
 \r
@@ -2004,7 +2010,7 @@ spl_qp_recv_async_cb(
 {\r
        spl_qp_svc_t*                   p_spl_qp_svc;\r
 \r
-       CL_ENTER( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( p_item );\r
        p_spl_qp_svc = PARENT_STRUCT( p_item, spl_qp_svc_t, recv_async_cb );\r
@@ -2018,7 +2024,7 @@ spl_qp_recv_async_cb(
 \r
        deref_al_obj( &p_spl_qp_svc->obj );\r
 \r
-       CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI );\r
 }\r
 #endif\r
 \r
@@ -2042,7 +2048,7 @@ spl_qp_comp(
        ib_smp_t*                               p_smp;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI_CB );\r
 \r
        CL_ASSERT( p_spl_qp_svc );\r
        CL_ASSERT( h_cq );\r
@@ -2139,8 +2145,8 @@ spl_qp_comp(
 \r
                if( wc.status != IB_WCS_SUCCESS )\r
                {\r
-                       CL_TRACE( CL_DBG_ERROR, g_al_dbg_lvl,\r
-                               ("special QP completion error: %s! internal syndrome 0x%x\n",\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
+                               ("special QP completion error: %s! internal syndrome 0x%I64x\n",\r
                                ib_get_wc_status_str( wc.status ), wc.vendor_specific) );\r
 \r
                        /* Reset the special QP service and return. */\r
@@ -2154,7 +2160,7 @@ spl_qp_comp(
        CL_ASSERT( status == IB_SUCCESS );\r
 \r
        cl_atomic_dec( &p_spl_qp_svc->in_use_cnt );\r
-       CL_EXIT( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI_CB );\r
 }\r
 \r
 \r
@@ -2171,7 +2177,7 @@ process_mad_recv(
        mad_route_t                             route;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( p_spl_qp_svc );\r
        CL_ASSERT( p_mad_element );\r
@@ -2287,7 +2293,7 @@ process_mad_recv(
        else\r
                status = recv_local_mad( p_spl_qp_svc, p_mad_element );\r
 \r
-       CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI );\r
        return status;\r
 }\r
 \r
@@ -2302,7 +2308,7 @@ route_recv_smp(
 {\r
        mad_route_t                             route;\r
 \r
-       CL_ENTER( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( p_mad_element );\r
 \r
@@ -2344,7 +2350,7 @@ route_recv_smp(
                break;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI );\r
        return route;\r
 }\r
 \r
@@ -2359,7 +2365,7 @@ route_recv_smp_attr(
 {\r
        mad_route_t                             route;\r
 \r
-       CL_ENTER( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( p_mad_element );\r
 \r
@@ -2383,7 +2389,7 @@ route_recv_smp_attr(
                break;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI );\r
        return route;\r
 }\r
 \r
@@ -2397,7 +2403,7 @@ route_recv_gmp(
 {\r
        mad_route_t                             route;\r
 \r
-       CL_ENTER( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( p_mad_element );\r
 \r
@@ -2423,7 +2429,7 @@ route_recv_gmp(
                break;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI );\r
        return route;\r
 }\r
 \r
@@ -2438,7 +2444,7 @@ route_recv_gmp_attr(
 {\r
        mad_route_t                             route;\r
 \r
-       CL_ENTER( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( p_mad_element );\r
 \r
@@ -2448,7 +2454,7 @@ route_recv_gmp_attr(
        else\r
                route = ROUTE_DISPATCHER;\r
 \r
-       CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI );\r
        return route;\r
 }\r
 \r
@@ -2465,7 +2471,7 @@ forward_sm_trap(
        ib_av_attr_t                    av_attr;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI_CB );\r
 \r
        CL_ASSERT( p_spl_qp_svc );\r
        CL_ASSERT( p_mad_element );\r
@@ -2478,7 +2484,7 @@ forward_sm_trap(
                 * "C14-5: Only a SM shall originate a directed route SMP."\r
                 * Therefore all traps should be LID routed; drop this one.\r
                 */\r
-               CL_EXIT( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_SMI_CB );\r
                return IB_ERROR;\r
        }\r
 \r
@@ -2500,7 +2506,7 @@ forward_sm_trap(
 \r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_EXIT( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_SMI_CB );\r
                return status;\r
        }\r
 \r
@@ -2523,7 +2529,7 @@ forward_sm_trap(
        if( status != IB_SUCCESS )\r
                ib_destroy_av( p_mad_element->h_av );\r
 \r
-       CL_EXIT( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI_CB );\r
        return status;\r
 }\r
 \r
@@ -2539,7 +2545,7 @@ recv_local_mad(
        ib_mad_t*                               p_mad_hdr;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI_CB );\r
 \r
        CL_ASSERT( p_spl_qp_svc );\r
        CL_ASSERT( p_mad_request );\r
@@ -2572,7 +2578,7 @@ recv_local_mad(
        /* Send the locally addressed MAD request to the CA for processing. */\r
        status = ib_send_mad( p_spl_qp_svc->h_mad_svc, p_mad_request, NULL );\r
 \r
-       CL_EXIT( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI_CB );\r
        return status;\r
 }\r
 \r
@@ -2589,7 +2595,7 @@ spl_qp_alias_send_cb(
 {\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI_CB );\r
 \r
        UNUSED_PARAM( h_mad_svc );\r
        UNUSED_PARAM( mad_svc_context );\r
@@ -2604,7 +2610,7 @@ spl_qp_alias_send_cb(
        status = ib_put_mad( p_mad_element );\r
        CL_ASSERT( status == IB_SUCCESS );\r
 \r
-       CL_EXIT( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI_CB );\r
 }\r
 \r
 \r
@@ -2624,7 +2630,7 @@ spl_qp_alias_recv_cb(
        ib_av_attr_t                    av_attr;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI_CB );\r
 \r
        CL_ASSERT( mad_svc_context );\r
        CL_ASSERT( p_mad_response );\r
@@ -2672,7 +2678,7 @@ spl_qp_alias_recv_cb(
        {\r
                ib_put_mad( p_mad_response );\r
 \r
-               CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_SMI );\r
                return;\r
        }\r
 \r
@@ -2685,7 +2691,7 @@ spl_qp_alias_recv_cb(
                ib_put_mad( p_mad_response );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI_CB );\r
 }\r
 \r
 \r
@@ -2730,7 +2736,7 @@ spl_qp_svc_post_recvs(
 \r
                if( status != IB_SUCCESS )\r
                {\r
-                       AL_TRACE( AL_DBG_ERROR,\r
+                       AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                                ("Failed to post receive %p\n", p_al_element) );\r
                        cl_qlist_remove_item( &p_spl_qp_svc->recv_queue,\r
                                &p_al_element->list_item );\r
@@ -2754,14 +2760,14 @@ spl_qp_svc_event_cb(
 {\r
        spl_qp_svc_t*                   p_spl_qp_svc;\r
 \r
-       CL_ENTER( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI_CB );\r
 \r
        CL_ASSERT( p_event_rec );\r
        CL_ASSERT( p_event_rec->context );\r
 \r
        if( p_event_rec->code == IB_AE_SQ_DRAINED )\r
        {\r
-               CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+               AL_EXIT( AL_DBG_SMI );\r
                return;\r
        }\r
 \r
@@ -2769,7 +2775,7 @@ spl_qp_svc_event_cb(
 \r
        spl_qp_svc_reset( p_spl_qp_svc );\r
 \r
-       CL_EXIT( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI_CB );\r
 }\r
 \r
 \r
@@ -2820,7 +2826,7 @@ spl_qp_svc_reset_cb(
        ib_qp_mod_t                             qp_mod;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI_CB );\r
 \r
        CL_ASSERT( p_item );\r
        p_spl_qp_svc = PARENT_STRUCT( p_item, spl_qp_svc_t, reset_async );\r
@@ -2901,7 +2907,7 @@ spl_qp_svc_reset_cb(
        /* No longer in use by the asynchronous processing thread. */\r
        cl_atomic_dec( &p_spl_qp_svc->in_use_cnt );\r
 \r
-       CL_EXIT( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI_CB );\r
 }\r
 \r
 \r
@@ -2995,7 +3001,7 @@ void
 force_smi_poll(\r
        void )\r
 {\r
-       CL_ENTER( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI_CB );\r
 \r
        /*\r
         * Stop the poll timer.  Just invoke the timer callback directly to\r
@@ -3003,7 +3009,7 @@ force_smi_poll(
         */\r
        smi_poll_timer_cb( gp_spl_qp_mgr );\r
 \r
-       CL_EXIT( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI_CB );\r
 }\r
 \r
 \r
@@ -3017,7 +3023,7 @@ smi_poll_timer_cb(
 {\r
        cl_status_t                     cl_status;\r
 \r
-       CL_ENTER( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI_CB );\r
 \r
        CL_ASSERT( context );\r
        CL_ASSERT( gp_spl_qp_mgr == context );\r
@@ -3052,7 +3058,7 @@ smi_poll_timer_cb(
        }\r
        cl_spinlock_release( &gp_spl_qp_mgr->obj.lock );\r
 \r
-       CL_EXIT( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI_CB );\r
 }\r
 \r
 \r
@@ -3068,7 +3074,7 @@ smi_post_recvs(
        al_obj_t*                               p_obj;\r
        spl_qp_svc_t*                   p_spl_qp_svc;\r
 \r
-       CL_ENTER( AL_DBG_SMI_CB, g_al_dbg_lvl );\r
+       AL_ENTER( AL_DBG_SMI_CB );\r
 \r
        CL_ASSERT( p_list_item );\r
        UNUSED_PARAM( context );\r
@@ -3086,5 +3092,5 @@ smi_post_recvs(
        spl_qp_svc_post_recvs( p_spl_qp_svc );\r
        cl_spinlock_release( &p_spl_qp_svc->obj.lock );\r
 \r
-       CL_EXIT( AL_DBG_SMI, g_al_dbg_lvl );\r
+       AL_EXIT( AL_DBG_SMI );\r
 }\r
index ab6f49dd3eee433a5e31c8edf8952b17bdc5abe7..4dbe0db3810078e1e56d8422fda46f77e0c6c0e2 100644 (file)
@@ -3,9 +3,21 @@ TARGETNAME=ibal
 !else\r
 TARGETNAME=ibald\r
 !endif\r
+\r
 TARGETPATH=..\..\..\bin\user\obj$(BUILD_ALT_DIR)\r
 TARGETTYPE=DYNLINK\r
 DLLENTRY=DllMain\r
+\r
+\r
+\r
+!if $(FREEBUILD)\r
+ENABLE_EVENT_TRACING=1\r
+#!else\r
+#ENABLE_EVENT_TRACING=1\r
+!endif\r
+\r
+\r
+\r
 DLLDEF=$O\al_exports.def\r
 USE_NTDLL=1\r
 \r
@@ -57,14 +69,27 @@ SOURCES=\
 \r
 INCLUDES=..;..\..\..\inc;..\..\..\inc\user;\r
 \r
-USER_C_FLAGS=$(USER_C_FLAGS) -DEXPORT_AL_SYMBOLS -DCL_NO_TRACK_MEM\r
+USER_C_FLAGS=$(USER_C_FLAGS) -DEXPORT_AL_SYMBOLS -DCL_NO_TRACK_MEM -DWPP_OLDCC\r
 \r
 TARGETLIBS= \\r
                        $(SDK_LIB_PATH)\kernel32.lib \\r
+                       $(SDK_LIB_PATH)\Advapi32.lib \\r
 !if $(FREEBUILD)\r
                        $(TARGETPATH)\*\complib.lib\r
 !else\r
                        $(TARGETPATH)\*\complibd.lib\r
 !endif\r
 \r
+!IFDEF ENABLE_EVENT_TRACING\r
+\r
+C_DEFINES = $(C_DEFINES) -DEVENT_TRACING\r
+\r
+RUN_WPP = $(SOURCES) -ext: .c .h .C .H \\r
+       -scan:..\al_debug.h \\r
+       -func:AL_PRINT(LEVEL,FLAGS,(MSG,...)) \\r
+       -func:AL_PRINT_EXIT(LEVEL,FLAGS,(MSG,...)) \\r
+       -dll\r
+!ENDIF\r
+\r
+\r
 MSC_WARNING_LEVEL= /W4\r
index 734c52e5d1427969c6d594c52c983ff1f0819f0b..1e63691a77e0ab9653db80d06ca7d357bb0d2cea 100644 (file)
 #include "ib_common.h"\r
 #include "al_init.h"\r
 \r
+#include "al_debug.h"\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_dll.tmh"\r
+#endif\r
+\r
+\r
 \r
 HANDLE         g_al_device = INVALID_HANDLE_VALUE;\r
 cl_mutex_t     g_open_close_mutex;\r
@@ -52,14 +61,30 @@ _DllMain(
        IN                              DWORD                                           ul_reason_for_call, \r
        IN                              LPVOID                                          lp_reserved )\r
 {\r
-       TCHAR   dbg_lvl_str[16];\r
+\r
+#if !defined(EVENT_TRACING)\r
+#if DBG \r
+\r
+#define ENV_BUFSIZE 16\r
+\r
+       TCHAR  dbg_lvl_str[ENV_BUFSIZE];\r
        DWORD   i;\r
+#endif\r
+#endif\r
 \r
        UNUSED_PARAM( lp_reserved );\r
 \r
        switch( ul_reason_for_call )\r
        {\r
        case DLL_PROCESS_ATTACH:\r
+\r
+#if defined(EVENT_TRACING)\r
+#if DBG\r
+               WPP_INIT_TRACING(L"ibald.dll");\r
+#else\r
+               WPP_INIT_TRACING(L"ibal.dll");\r
+#endif\r
+#endif         \r
                cl_perf_init( &g_perf, AlMaxPerf );\r
                DisableThreadLibraryCalls( h_module );\r
 \r
@@ -67,14 +92,29 @@ _DllMain(
                if( cl_mutex_init( &g_open_close_mutex ) != CL_SUCCESS )\r
                        return FALSE;\r
 \r
-               i = GetEnvironmentVariable( "IBAL_UAL_DBG", dbg_lvl_str, 16 );\r
-               if( i && i <= 16 )\r
-               {\r
-                       g_al_dbg_lvl = _tcstoul( dbg_lvl_str, NULL, 16 );\r
-                       AL_TRACE( AL_DBG_DEV,\r
-                                       ("Given IBAL_UAL_DBG debug level:0x%X\n",\r
-                                       g_al_dbg_lvl) );\r
-               }\r
+#if !defined(EVENT_TRACING)\r
+#if DBG \r
+\r
+       i = GetEnvironmentVariable( "IBAL_UAL_DBG_LEVEL", dbg_lvl_str, ENV_BUFSIZE );\r
+       if( i && i <= 16 )\r
+       {\r
+               g_al_dbg_level = _tcstoul( dbg_lvl_str, NULL, ENV_BUFSIZE );\r
+       }\r
+\r
+       i = GetEnvironmentVariable( "IBAL_UAL_DBG_FLAGS", dbg_lvl_str, ENV_BUFSIZE );\r
+       if( i && i <= 16 )\r
+       {\r
+               g_al_dbg_flags = _tcstoul( dbg_lvl_str, NULL, ENV_BUFSIZE );\r
+       }\r
+\r
+\r
+       AL_PRINT(TRACE_LEVEL_INFORMATION ,AL_DBG_DEV ,\r
+               ("Given IBAL_UAL_DBG debug level:%d  debug flags 0x%x\n",\r
+               g_al_dbg_level ,g_al_dbg_flags) );\r
+\r
+#endif\r
+#endif\r
+\r
                break;\r
 \r
        case DLL_PROCESS_DETACH:\r
@@ -82,6 +122,9 @@ _DllMain(
                cl_mutex_destroy( &g_open_close_mutex );\r
                cl_perf_destroy( &g_perf, TRUE );\r
 \r
+#if defined(EVENT_TRACING)\r
+               WPP_CLEANUP();\r
+#endif\r
                break;\r
        }\r
        return TRUE;\r
@@ -149,7 +192,7 @@ do_al_dev_ioctl(
        if( cl_status != CL_SUCCESS )\r
        {\r
                CL_ASSERT( cl_status != CL_PENDING );\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("Error performing IOCTL 0x%08x to AL driver (%s)\n",\r
                         command, CL_STATUS_MSG(cl_status)) );\r
                return CL_ERROR;\r
index 0ec4e156f1d584a0a1b85ad37dccdd700d443475..57029d86d1845388a1f2142a2cd91a4852111132 100644 (file)
 #include "al.h"\r
 #include "al_ci_ca.h"\r
 #include "al_debug.h"\r
+\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "al_mad_pool.tmh"\r
+#endif\r
+\r
 #include "al_mad_pool.h"\r
 #include "al_pd.h"\r
 #include "al_verbs.h"\r
@@ -147,16 +155,16 @@ ib_create_mad_pool(
        ib_api_status_t                 status;\r
        cl_status_t                             cl_status;\r
 \r
-       CL_ENTER( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_MAD_POOL);\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_al, AL_OBJ_TYPE_H_AL ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_AL_HANDLE\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("IB_INVALID_AL_HANDLE\n") );\r
                return IB_INVALID_AL_HANDLE;\r
        }\r
        if( !ph_pool )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -181,7 +189,7 @@ ib_create_mad_pool(
        if( status != IB_SUCCESS )\r
        {\r
                __free_pool( &h_pool->obj );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("init_al_obj failed with status %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -200,7 +208,7 @@ ib_create_mad_pool(
                if( status != IB_SUCCESS )\r
                {\r
                        h_pool->obj.pfn_destroy( &h_pool->obj, NULL );\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                                ("grow_mad_pool failed with status %s.\n",\r
                                ib_get_err_str(status)) );\r
                        return status;\r
@@ -220,7 +228,7 @@ ib_create_mad_pool(
                status = ib_convert_cl_status( cl_status );\r
                h_pool->obj.pfn_destroy( &h_pool->obj, NULL );\r
 \r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("cl_qpool_init failed with status %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -235,7 +243,7 @@ ib_create_mad_pool(
                status = ib_convert_cl_status( cl_status );\r
                h_pool->obj.pfn_destroy( &h_pool->obj, NULL );\r
 \r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("cl_qpool_init failed with status %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -246,7 +254,7 @@ ib_create_mad_pool(
        /* Release the reference taken in init_al_obj. */\r
        deref_al_obj( &h_pool->obj );\r
 \r
-       CL_EXIT( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_MAD_POOL);\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -262,7 +270,7 @@ __destroying_pool(
        ib_pool_handle_t                h_pool;\r
        ib_al_handle_t                  h_al;\r
 \r
-       CL_ENTER( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_MAD_POOL);\r
 \r
        CL_ASSERT( p_obj );\r
        h_pool = PARENT_STRUCT( p_obj, al_pool_t, obj );\r
@@ -274,7 +282,7 @@ __destroying_pool(
        /* Deregister this MAD pool from all protection domains. */\r
        al_dereg_pool( h_al, h_pool );\r
 \r
-       CL_EXIT( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_MAD_POOL);\r
 }\r
 \r
 \r
@@ -310,11 +318,11 @@ ib_destroy_mad_pool(
        al_obj_t*                               p_obj;\r
        boolean_t                               busy;\r
 \r
-       CL_ENTER( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_MAD_POOL);\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_pool, AL_OBJ_TYPE_H_MAD_POOL ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("IB_INVALID_HANDLE\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
 \r
@@ -333,7 +341,7 @@ ib_destroy_mad_pool(
        /* Return an error if the pool is busy. */\r
        if( busy )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("h_pool (0x%p) is busy!.\n", h_pool) );\r
                return IB_RESOURCE_BUSY;\r
        }\r
@@ -341,7 +349,7 @@ ib_destroy_mad_pool(
        ref_al_obj( &h_pool->obj );\r
        h_pool->obj.pfn_destroy( &h_pool->obj, NULL );\r
 \r
-       CL_EXIT( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_MAD_POOL);\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -364,22 +372,22 @@ ib_reg_mad_pool(
        ib_api_status_t                 status;\r
        al_key_type_t                   key_type;\r
 \r
-       CL_ENTER( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_MAD_POOL);\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_pool, AL_OBJ_TYPE_H_MAD_POOL ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("IB_INVALID_HANDLE\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
        /* Alias keys require an alias PD. */\r
        if( AL_OBJ_INVALID_HANDLE( h_pd, AL_OBJ_TYPE_H_PD ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PD_HANDLE\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("IB_INVALID_PD_HANDLE\n") );\r
                return IB_INVALID_PD_HANDLE;\r
        }\r
        if( !pp_pool_key )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -407,7 +415,7 @@ ib_reg_mad_pool(
        {\r
                __free_pool_key( &p_pool_key->obj );\r
 \r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("init_al_obj failed with status %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -416,7 +424,7 @@ ib_reg_mad_pool(
        if( status != IB_SUCCESS )\r
        {\r
                p_pool_key->obj.pfn_destroy( &p_pool_key->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -464,7 +472,7 @@ ib_reg_mad_pool(
                                cl_spinlock_release( &h_pool->obj.lock );\r
                                p_pool_key->obj.pfn_destroy( &p_pool_key->obj, NULL );\r
 \r
-                               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                                        ("reg_mad_array failed with status %s.\n",\r
                                        ib_get_err_str(status)) );\r
                                return status;\r
@@ -493,7 +501,7 @@ ib_reg_mad_pool(
        /* Release the reference taken in init_al_obj. */\r
        deref_al_obj( &p_pool_key->obj );\r
 \r
-       CL_EXIT( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_MAD_POOL);\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -547,7 +555,7 @@ __cleanup_pool_key(
                        status = ib_put_mad( p_mad_element_list );\r
                        if( status != IB_SUCCESS )\r
                        {\r
-                               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                               AL_PRINT(TRACE_LEVEL_ERROR , AL_DBG_ERROR ,\r
                                        ("ib_put_mad failed with status %s, continuing.\n",\r
                                        ib_get_err_str(status)) );\r
                        }\r
@@ -714,11 +722,11 @@ ib_dereg_mad_pool(
 {\r
        ib_api_status_t         status;\r
 \r
-       CL_ENTER( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_MAD_POOL);\r
 \r
        if( AL_OBJ_INVALID_HANDLE( pool_key, AL_OBJ_TYPE_H_POOL_KEY ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -728,7 +736,7 @@ ib_dereg_mad_pool(
        if( status != IB_SUCCESS )\r
                deref_al_obj( &pool_key->obj );\r
 \r
-       CL_EXIT( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_MAD_POOL);\r
        return status;\r
 }\r
 \r
@@ -742,24 +750,24 @@ dereg_mad_pool(
        IN              const   ib_pool_key_t                           pool_key ,\r
        IN              const   al_key_type_t                           expected_type )\r
 {\r
-       CL_ENTER( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_MAD_POOL);\r
 \r
        if( pool_key->type != expected_type )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
        ///* Check mad_cnt to see if MADs are still outstanding. */\r
        //if( pool_key->mad_cnt )\r
        //{\r
-       //      CL_TRACE_EXIT( AL_DBG_MAD_POOL, g_al_dbg_lvl, ("IB_RESOURCE_BUSY\n") );\r
+       //      AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_MAD_POOL, ("IB_RESOURCE_BUSY\n") );\r
        //      return IB_RESOURCE_BUSY;\r
        //}\r
 \r
        pool_key->obj.pfn_destroy( &pool_key->obj, NULL );\r
 \r
-       CL_EXIT( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_MAD_POOL);\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -779,7 +787,7 @@ __get_mad_element(
        mad_item_t*                             p_mad_item;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_MAD_POOL);\r
 \r
        CL_ASSERT( pool_key );\r
        CL_ASSERT( pp_mad_element );\r
@@ -798,7 +806,7 @@ __get_mad_element(
                status = __grow_mad_pool( h_pool, &p_mad_item );\r
                if( status != IB_SUCCESS )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                                ("grow_mad_pool failed with status %s.\n",\r
                                ib_get_err_str(status)) );\r
                        return status;\r
@@ -818,7 +826,7 @@ __get_mad_element(
                        &p_mad_item->al_mad_element.list_item );\r
                cl_spinlock_release( &h_pool->obj.lock );\r
 \r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("init_mad_element failed with status %s.\n",\r
                        ib_get_err_str(status)) );\r
                return status;\r
@@ -831,7 +839,7 @@ __get_mad_element(
        /* Return the MAD element. */\r
        *pp_mad_element = &p_mad_item->al_mad_element;\r
 \r
-       CL_EXIT( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_MAD_POOL);\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -997,7 +1005,7 @@ __grow_mad_pool(
        al_pool_key_t*                  p_pool_key;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_MAD_POOL);\r
 \r
        CL_ASSERT( h_pool );\r
 \r
@@ -1016,7 +1024,7 @@ __grow_mad_pool(
                {\r
                        cl_spinlock_release( &h_pool->obj.lock );\r
 \r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                                ("h_pool's (0x%p) maximum has been reached.\n", h_pool) );\r
                        return IB_INSUFFICIENT_RESOURCES;\r
                }\r
@@ -1026,7 +1034,7 @@ __grow_mad_pool(
                {\r
                        cl_spinlock_release( &h_pool->obj.lock );\r
 \r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                                ("h_pool's (0x%p) will exceed maximum on grow.\n", h_pool) );\r
                        return IB_INSUFFICIENT_RESOURCES;\r
                }\r
@@ -1068,7 +1076,7 @@ __grow_mad_pool(
                cl_spinlock_release( &h_pool->obj.lock );\r
                __free_mad_array( &p_mad_array->obj );\r
 \r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("init_al_obj failed with status %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -1133,7 +1141,7 @@ __grow_mad_pool(
        /* Release the reference taken in init_al_obj. */\r
        deref_al_obj( &p_mad_array->obj );\r
 \r
-       CL_EXIT( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_MAD_POOL);\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -1154,7 +1162,7 @@ __free_mad_array(
        cl_list_item_t*                 p_next_item;\r
        mad_reg_t*                              p_reg;\r
 \r
-       CL_ENTER( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_MAD_POOL);\r
 \r
        CL_ASSERT( p_obj );\r
        p_mad_array = PARENT_STRUCT( p_obj, mad_array_t, obj );\r
@@ -1194,7 +1202,7 @@ __free_mad_array(
        destroy_al_obj( &p_mad_array->obj );\r
        cl_free( p_mad_array->p_data );\r
 \r
-       CL_EXIT( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_MAD_POOL);\r
 }\r
 \r
 \r
@@ -1344,16 +1352,16 @@ ib_get_mad(
        al_mad_element_t*               p_mad;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_MAD_POOL);\r
 \r
        if( AL_OBJ_INVALID_HANDLE( pool_key, AL_OBJ_TYPE_H_POOL_KEY ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
        if( !buf_size || !pp_mad_element )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1362,7 +1370,7 @@ ib_get_mad(
        status = __get_mad_element( pool_key, &p_mad );\r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_EXIT( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+               AL_EXIT(AL_DBG_MAD_POOL);\r
                return status;\r
        }\r
 \r
@@ -1384,7 +1392,7 @@ ib_get_mad(
                if( !p_mad->p_al_mad_buf )\r
                {\r
                        __put_mad_element( p_mad );\r
-                       CL_EXIT( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+                       AL_EXIT(AL_DBG_MAD_POOL);\r
                        return IB_INSUFFICIENT_MEMORY;\r
                }\r
                p_mad->element.p_mad_buf = p_mad->p_al_mad_buf;\r
@@ -1400,7 +1408,7 @@ ib_get_mad(
        /* Return the MAD element to the client. */\r
        *pp_mad_element = &p_mad->element;\r
 \r
-       CL_EXIT( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_MAD_POOL);\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -1414,7 +1422,7 @@ ib_put_mad(
 \r
        if( !p_mad_element_list )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1443,7 +1451,7 @@ ib_put_mad(
                }\r
                else\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                                ("MAD has already been returned to MAD pool.\n") );\r
                }\r
        }\r
index 45dd345c274e0d68597b4e4484b300a22df3960f..1923b31b9f42b79a9386937b79d7be7c6b713037 100644 (file)
 #include "al_pd.h"\r
 #include "al_av.h"\r
 \r
+#include "al_debug.h"\r
+\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "ual_av.tmh"\r
+#endif\r
+\r
 \r
 \r
 ib_api_status_t\r
@@ -130,7 +139,7 @@ ual_pd_alias_create_av(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(ioctl_buf.out) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_CREATE_AV IOCTL returned %s\n", CL_STATUS_MSG(cl_status)) );\r
                return IB_ERROR;\r
        }\r
@@ -195,14 +204,14 @@ ual_destroy_av(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(ioctl_buf.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_DESTROY_AV IOCTL returned %s\n", CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
        }\r
        else if( ioctl_buf.out.status != IB_SUCCESS )\r
        {\r
                CL_ASSERT( status == IB_SUCCESS );\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_DESTROY_AV IOCTL status %s\n",\r
                        ib_get_err_str(ioctl_buf.out.status)) );\r
                status = ioctl_buf.out.status;\r
@@ -273,7 +282,7 @@ ual_modify_av(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(ioctl_buf.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_MODIFY_AV IOCTL returned %s\n", CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
        }\r
@@ -343,7 +352,7 @@ ual_query_av(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(ioctl_buf.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_QUERY_AV IOCTL returned %s\n", CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
        }\r
index e1648dd0f08ec5019b9044e20d326cdbe7820a3b..a2691a03ab8c2719811e5fbfb104068b4c9c1d17 100644 (file)
 #include "al.h"\r
 #include "al_ca.h"\r
 #include "al_debug.h"\r
+\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "ual_ca.tmh"\r
+#endif\r
+\r
 #include "ual_ca.h"\r
 #include "ual_ci_ca.h"\r
 \r
@@ -77,7 +85,7 @@ open_vendor_lib(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(al_ioctl.out) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("IOCTL returned %s\n", CL_STATUS_MSG(cl_status)) );\r
                return IB_ERROR;\r
        }\r
@@ -85,8 +93,8 @@ open_vendor_lib(
        if( !strlen( al_ioctl.out.uvp_lib_name ) )\r
        {\r
                /* Vendor does not implement user-mode library */\r
-               AL_TRACE_EXIT( AL_DBG_WARN | AL_DBG_CA,\r
-                       ("No vendor lib for CA guid %"PRIx64".\n", ca_guid) );\r
+               AL_PRINT_EXIT(TRACE_LEVEL_WARNING ,AL_DBG_CA ,\r
+                       ("No vendor lib for CA guid %I64x.\n", ca_guid) );\r
                return IB_UNSUPPORTED;\r
        }\r
 \r
@@ -94,13 +102,13 @@ open_vendor_lib(
         * The vendor supports a user-mode library\r
         * open the library and get the interfaces supported\r
         */\r
-       AL_TRACE( AL_DBG_CA,\r
+       AL_PRINT(TRACE_LEVEL_INFORMATION ,AL_DBG_CA ,\r
                ("Loading vendor lib (%s)\n", al_ioctl.out.uvp_lib_name) );\r
        h_lib = al_load_uvp( al_ioctl.out.uvp_lib_name );\r
        if (h_lib == NULL)\r
        {\r
 #if defined( _DEBUG_ )\r
-               al_uvp_lib_err( AL_DBG_WARN,\r
+               al_uvp_lib_err( TRACE_LEVEL_WARNING,\r
                        "!vendor lib (%s) not found for CA guid %"PRIx64".",\r
                        al_ioctl.out.uvp_lib_name, ca_guid );\r
 #endif\r
@@ -112,7 +120,7 @@ open_vendor_lib(
        if( !pfn_uvp_ifc )\r
        {\r
 #if defined( _DEBUG_ )\r
-               al_uvp_lib_err( AL_DBG_ERROR,\r
+               al_uvp_lib_err( TRACE_LEVEL_ERROR,\r
                        "failed to get vendor lib interface (%s) "\r
                        "for CA guid %"PRIx64" returned ",\r
                        al_ioctl.out.uvp_lib_name, ca_guid );\r
@@ -154,7 +162,7 @@ ual_open_ca(
                if( status != IB_SUCCESS )\r
                {\r
                        CL_ASSERT( status != IB_VERBS_PROCESSING_DONE );\r
-                       CL_EXIT( AL_DBG_CA, g_al_dbg_lvl );\r
+                       AL_EXIT(AL_DBG_CA);\r
                        return status;\r
                }\r
        }\r
@@ -168,7 +176,7 @@ ual_open_ca(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(ca_ioctl.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR, ("UAL_OPEN_CA IOCTL returned %s\n",\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("UAL_OPEN_CA IOCTL returned %s\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
        }\r
@@ -227,7 +235,7 @@ ual_close_ca(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(ca_ioctl.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_CLOSE_CA IOCTL returned %s\n", CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
        }\r
@@ -287,7 +295,7 @@ ual_query_ca(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(ca_ioctl.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_QUERY_CA IOCTL returned %s\n", CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
        }\r
@@ -352,7 +360,7 @@ ual_modify_ca(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(ca_ioctl.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_MODIFY_CA IOCTL returned %s\n", CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
        }\r
@@ -419,12 +427,12 @@ ib_ci_call(
 \r
        if( AL_OBJ_INVALID_HANDLE( h_ca, AL_OBJ_TYPE_H_CA ) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_CA_HANDLE\n") );\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR, ("IB_INVALID_CA_HANDLE\n") );\r
                return IB_INVALID_CA_HANDLE;\r
        }\r
        if( !p_ci_op )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -498,7 +506,7 @@ ib_ci_call(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(p_ca_ioctl->out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_CI_CALL IOCTL returned %s\n", CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
        }\r
index 64368a3e84eeaccd2f44cea878ee571b842e3919..cf0de4b2bc84c7d7b8525511d7d6c969da337bc2 100644 (file)
 #include "al_pd.h"\r
 #include "ib_common.h"\r
 \r
+\r
+#include "al_debug.h"\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "ual_ci_ca.tmh"\r
+#endif\r
+\r
+\r
 extern ib_pool_handle_t                gh_mad_pool;\r
 extern ib_al_handle_t          gh_al;\r
 extern cl_async_proc_t         *gp_async_proc_mgr;\r
@@ -77,13 +87,13 @@ create_ci_ca(
        cl_status_t                     cl_status;\r
        al_ci_ca_t                      *p_ci_ca;\r
 \r
-       CL_ENTER( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_CA);\r
 \r
        /* Allocate a new CA structure. */\r
        p_ci_ca = (al_ci_ca_t *)cl_zalloc( sizeof( al_ci_ca_t ) );\r
        if( p_ci_ca == NULL )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("Failed to cl_malloc al_ci_ca_t\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -98,7 +108,7 @@ create_ci_ca(
        if( cl_status != CL_SUCCESS )\r
        {\r
                free_ci_ca( &p_ci_ca->obj );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("cl_spinlock_init failed, status = 0x%x.\n",\r
                        ib_convert_cl_status(cl_status) ) );\r
                return ib_convert_cl_status( cl_status );\r
@@ -111,7 +121,7 @@ create_ci_ca(
        if( cl_status != CL_SUCCESS )\r
        {\r
                free_ci_ca( &p_ci_ca->obj );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("cl_qpool_init failed, status = 0x%x.\n",\r
                        ib_convert_cl_status(cl_status) ) );\r
                return ib_convert_cl_status( cl_status );\r
@@ -128,7 +138,7 @@ create_ci_ca(
        if( status != IB_SUCCESS )\r
        {\r
                free_ci_ca( &p_ci_ca->obj );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("init_al_obj failed, status = 0x%x.\n", status) );\r
                return status;\r
        }\r
@@ -158,7 +168,7 @@ create_ci_ca(
        if( status != IB_SUCCESS )\r
        {\r
                p_ci_ca->obj.pfn_destroy( &p_ci_ca->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("ib_open_ca failed, status = 0x%x.\n", status) );\r
                return status;\r
        }\r
@@ -174,7 +184,7 @@ create_ci_ca(
                 * and the associated destroy/cleanup in the AL's\r
                 * object model\r
                 */\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("ual_open_ca failed, status = 0x%x.\n", status) );\r
                return IB_ERROR;\r
        }\r
@@ -191,7 +201,7 @@ create_ci_ca(
        if( status != IB_SUCCESS )\r
        {\r
                p_ci_ca->obj.pfn_destroy( &p_ci_ca->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("ib_alloc_pd failed, status = 0x%x.\n", status) );\r
                return status;\r
        }\r
@@ -201,7 +211,7 @@ create_ci_ca(
        if( status != IB_SUCCESS )\r
        {\r
                p_ci_ca->obj.pfn_destroy( &p_ci_ca->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("ual_allocate_pd returned %s\n", ib_get_err_str( status )) );\r
                return status;\r
        }\r
@@ -212,7 +222,7 @@ create_ci_ca(
        if( status != IB_SUCCESS )\r
        {\r
                p_ci_ca->obj.pfn_destroy( &p_ci_ca->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("ib_alloc_pd failed, status = 0x%x.\n", status) );\r
                return status;\r
        }\r
@@ -221,7 +231,7 @@ create_ci_ca(
        if( status != IB_SUCCESS )\r
        {\r
                p_ci_ca->obj.pfn_destroy( &p_ci_ca->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("get_port_info failed, status = 0x%x.\n", status) );\r
                return status;\r
        }\r
@@ -231,7 +241,7 @@ create_ci_ca(
        if( status != IB_SUCCESS )\r
        {\r
                p_ci_ca->obj.pfn_destroy( &p_ci_ca->obj, NULL );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("ib_reg_mad_pool failed, status = 0x%x.\n", status) );\r
                return status;\r
        }\r
@@ -242,7 +252,7 @@ create_ci_ca(
        /* Release the reference taken in init_al_obj. */\r
        deref_al_obj( &p_ci_ca->obj );\r
 \r
-       CL_EXIT( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_CA);\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -272,7 +282,7 @@ destroying_ci_ca(
 {\r
        al_ci_ca_t                      *p_ci_ca;\r
 \r
-       CL_ENTER( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_CA);\r
        CL_ASSERT( p_obj );\r
        p_ci_ca = PARENT_STRUCT( p_obj, al_ci_ca_t, obj );\r
 \r
@@ -285,7 +295,7 @@ destroying_ci_ca(
        if( p_ci_ca->h_ca )\r
                cl_async_proc_queue( gp_async_pnp_mgr, &p_ci_ca->dereg_async_item );\r
 \r
-       CL_EXIT( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_CA);\r
 }\r
 \r
 \r
@@ -303,7 +313,7 @@ cleanup_ci_ca(
        ib_api_status_t         status;\r
        al_ci_ca_t                      *p_ci_ca;\r
 \r
-       CL_ENTER( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_CA);\r
 \r
        CL_ASSERT( p_obj );\r
        p_ci_ca = PARENT_STRUCT( p_obj, al_ci_ca_t, obj );\r
@@ -324,5 +334,5 @@ cleanup_ci_ca(
 \r
        close_vendor_lib( &p_ci_ca->verbs );\r
 \r
-       CL_EXIT( AL_DBG_CA, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_CA);\r
 }\r
index 288b653844f4e46f38edb826dc5f4ccaa4ab744a..9292ecdc0895ece321c35f432fa49cfa861a4b50 100644 (file)
 #include "al.h"\r
 #include "al_cm_shared.h"\r
 #include "al_debug.h"\r
+\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "ual_cm.tmh"\r
+#endif\r
+\r
 #include "al_dev.h"\r
 #include "al_qp.h"\r
 #include "ib_common.h"\r
@@ -266,12 +274,12 @@ ib_cm_listen(
        /* Validate input parameters. */\r
        if( AL_OBJ_INVALID_HANDLE( h_al, AL_OBJ_TYPE_H_AL ) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("Invalid AL handle.\n") );\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR, ("Invalid AL handle.\n") );\r
                return IB_INVALID_AL_HANDLE;\r
        }\r
        if( !p_cm_listen || !ph_cm_listen )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("NULL parameter.\n") );\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR, ("NULL parameter.\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -279,7 +287,7 @@ ib_cm_listen(
        h_listen = __get_listen( h_al );\r
        if( !h_listen )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("Failed to allocate listen structure.\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -300,7 +308,7 @@ ib_cm_listen(
        if( !p_cm_ioctl )\r
        {\r
                h_listen->obj.pfn_destroy( &h_listen->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("Failed to allocate IOCTL buffer.\n") );\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR, ("Failed to allocate IOCTL buffer.\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
 \r
@@ -321,7 +329,7 @@ ib_cm_listen(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(p_cm_ioctl->out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_CM_LISTEN IOCTL returned %s\n", CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
        }\r
@@ -332,7 +340,7 @@ ib_cm_listen(
 \r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("Failed to listen: %s.\n", ib_get_err_str(status) ) );\r
                h_listen->obj.pfn_destroy( &h_listen->obj, NULL );\r
        }\r
@@ -366,7 +374,7 @@ ib_cm_cancel(
 \r
        if( AL_OBJ_INVALID_HANDLE( h_cm_listen, AL_OBJ_TYPE_H_LISTEN ) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR, ("Invalid listen handle.\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("Invalid listen handle.\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
 \r
@@ -383,7 +391,7 @@ ib_cm_cancel(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(cm_ioctl.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_CM_CANCEL IOCTL returned %s\n", CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
        }\r
@@ -393,7 +401,7 @@ ib_cm_cancel(
        }\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("Failed to cancel: %s.\n", ib_get_err_str(status) ) );\r
                deref_al_obj( &h_cm_listen->obj );\r
        }\r
@@ -428,7 +436,7 @@ ib_cm_req(
        /* Validate input parameters. */\r
        if( !p_cm_req || !p_cm_req->p_primary_path )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("NULL p_cm_req or primary path\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
@@ -444,7 +452,7 @@ ib_cm_req(
        p_cm_ioctl = (ual_cm_req_ioctl_t*)cl_zalloc( ioctl_buf_sz );\r
        if( !p_cm_ioctl )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("Failed to allocate IOCTL buf.\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -461,7 +469,7 @@ ib_cm_req(
                if( AL_OBJ_INVALID_HANDLE( p_cm_req->h_qp, AL_OBJ_TYPE_H_QP ) ||\r
                        (p_cm_req->h_qp->type != p_cm_req->qp_type) )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                                ("IB_INVALID_QP_HANDLE\n") );\r
                        status = IB_INVALID_QP_HANDLE;\r
                        goto cleanup;\r
@@ -476,7 +484,7 @@ ib_cm_req(
                        p_cm_req->h_qp->obj.p_parent_obj->p_parent_obj->p_parent_obj );\r
                if( !h_conn )\r
                {\r
-                       CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT(TRACE_LEVEL_ERROR , AL_DBG_ERROR ,\r
                                ("Failed to allocate connection structure.\n") );\r
                        status = IB_INSUFFICIENT_MEMORY;\r
                        goto cleanup;\r
@@ -498,7 +506,7 @@ ib_cm_req(
                if( status != IB_SUCCESS )\r
                {\r
                        h_conn->obj.pfn_destroy( &h_conn->obj, NULL );\r
-                       AL_TRACE( AL_DBG_ERROR,\r
+                       AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                                ("cm_init_qp returned %s\n", ib_get_err_str(status)) );\r
                        goto cleanup;\r
                }\r
@@ -507,7 +515,7 @@ ib_cm_req(
        case IB_QPT_UNRELIABLE_DGRM:\r
                if( AL_OBJ_INVALID_HANDLE( p_cm_req->h_al, AL_OBJ_TYPE_H_AL ) )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                                ("IB_INVALID_AL_HANDLE\n") );\r
                        status = IB_INVALID_AL_HANDLE;\r
                        goto cleanup;\r
@@ -516,7 +524,7 @@ ib_cm_req(
                h_conn = __get_conn( p_cm_req->h_al );\r
                if( !h_conn )\r
                {\r
-                       CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT(TRACE_LEVEL_ERROR , AL_DBG_ERROR ,\r
                                ("Failed to allocate connection structure.\n") );\r
                        status = IB_INSUFFICIENT_MEMORY;\r
                        goto cleanup;\r
@@ -527,7 +535,7 @@ ib_cm_req(
                break;\r
 \r
        default:\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("Invalid qp_type.\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("Invalid qp_type.\n") );\r
                status = IB_INVALID_SETTING;\r
                goto cleanup;\r
        }\r
@@ -560,7 +568,7 @@ ib_cm_req(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(p_cm_ioctl->out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_CM_REQ IOCTL returned %s\n", CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
        }\r
@@ -571,7 +579,7 @@ ib_cm_req(
 \r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("Connection request ioctl failed with status (%s)\n",\r
                        ib_get_err_str(status) ) );\r
                h_conn->obj.pfn_destroy( &h_conn->obj, NULL );\r
@@ -598,7 +606,7 @@ __save_user_rep(
        ib_port_attr_t          *p_port_attr;\r
        ib_qp_handle_t          h_qp;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_CM);\r
 \r
        __bind_qp_and_conn( h_conn, p_cm_rep->h_qp );\r
        h_qp = p_cm_rep->h_qp;\r
@@ -610,7 +618,7 @@ __save_user_rep(
        if( !p_port_attr )\r
        {\r
                ci_ca_unlock_attr( h_qp->obj.p_ci_ca );\r
-               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl, ("invalid p_gid\n" ) );\r
+               AL_PRINT(TRACE_LEVEL_ERROR , AL_DBG_ERROR , ("invalid p_gid\n" ) );\r
                return IB_INVALID_GID;\r
        }\r
 \r
@@ -619,7 +627,7 @@ __save_user_rep(
                &h_conn->p_conn_req->qp_mod_rts );\r
        ci_ca_unlock_attr( h_qp->obj.p_ci_ca );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_CM);\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -637,18 +645,18 @@ ib_cm_rep(
        ib_api_status_t                 status;\r
        cl_status_t                             cl_status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_CM);\r
 \r
        /* Validate input parameters. */\r
        h_conn = h_cm_req;\r
        if( AL_OBJ_INVALID_HANDLE( h_conn, AL_OBJ_TYPE_H_CONN ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("Invalid REQ handle.\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("Invalid REQ handle.\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
        if( !p_cm_rep )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("NULL p_cm_rep\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("NULL p_cm_rep\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -666,7 +674,7 @@ ib_cm_rep(
        p_cm_ioctl = (ual_cm_rep_ioctl_t*)cl_zalloc( ioctl_buf_sz );\r
        if( !p_cm_ioctl )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("Failed to allocate IOCTL buffer.\n") );\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR, ("Failed to allocate IOCTL buffer.\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
 \r
@@ -675,7 +683,7 @@ ib_cm_rep(
        if( AL_OBJ_INVALID_HANDLE( p_cm_rep->h_qp, AL_OBJ_TYPE_H_QP ) ||\r
                p_cm_rep->h_qp->type != p_cm_rep->qp_type )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("Invalid QP handle.\n") );\r
                status = IB_INVALID_QP_HANDLE;\r
                goto cleanup;\r
@@ -689,7 +697,7 @@ ib_cm_rep(
        if( status != IB_SUCCESS )\r
        {\r
                __ual_conn_reject( h_conn, IB_REJ_INSUF_QP );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("__save_user_rep returned %s\n", ib_get_err_str(status) ) );\r
                goto cleanup;\r
        }\r
@@ -700,7 +708,7 @@ ib_cm_rep(
        if( status != IB_SUCCESS )\r
        {\r
                __ual_conn_reject( h_conn, IB_REJ_INSUF_QP );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("cm_init_qp returned %s\n", ib_get_err_str(status) ) );\r
                goto cleanup;\r
        }\r
@@ -713,7 +721,7 @@ ib_cm_rep(
                if( status != IB_SUCCESS )\r
                {\r
                        __ual_conn_reject( h_conn, IB_REJ_INSUF_QP );\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                                ("ib_post_recv returned %s.\n", ib_get_err_str(status)) );\r
                        goto cleanup;\r
                }\r
@@ -726,7 +734,7 @@ ib_cm_rep(
        if( status != IB_SUCCESS )\r
        {\r
                __ual_conn_reject( h_conn, IB_REJ_INSUF_QP );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("cm_rts_qp with status (%s)\n", ib_get_err_str(status) ) );\r
                goto cleanup;\r
        }\r
@@ -746,7 +754,7 @@ ib_cm_rep(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(p_cm_ioctl->out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_CM_REP IOCTL returned %s\n", CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
        }\r
@@ -757,7 +765,7 @@ ib_cm_rep(
 \r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR , AL_DBG_ERROR ,\r
                        ("Connection reply ioctl failed with status (%s)\n",\r
                        ib_get_err_str(status) ) );\r
                cm_reset_qp( h_conn->h_qp, 0 );\r
@@ -785,18 +793,18 @@ ib_cm_rtu(
        ib_api_status_t                 status;\r
        cl_status_t                             cl_status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_CM);\r
 \r
        /* Validate input parameters. */\r
        h_conn = h_cm_rep;\r
        if( AL_OBJ_INVALID_HANDLE( h_conn, AL_OBJ_TYPE_H_CONN ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("Invalid rep handle.\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("Invalid rep handle.\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
        if( !p_cm_rtu )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("NULL p_cm_rtu\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("NULL p_cm_rtu\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -811,7 +819,7 @@ ib_cm_rtu(
        if( status != IB_SUCCESS )\r
        {\r
                __ual_conn_reject( h_conn, IB_REJ_INSUF_QP );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("cm_rts_qp with status (%s)\n", ib_get_err_str(status) ) );\r
                return status;\r
        }\r
@@ -832,7 +840,7 @@ ib_cm_rtu(
        p_cm_ioctl = (ual_cm_rtu_ioctl_t*)cl_zalloc( ioctl_buf_sz );\r
        if( !p_cm_ioctl )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("Failed to allocate IOCTL buffer\n") );\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR, ("Failed to allocate IOCTL buffer\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
 \r
@@ -851,7 +859,7 @@ ib_cm_rtu(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(p_cm_ioctl->out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_CM_RTU IOCTL returned %s\n", CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
        }\r
@@ -862,7 +870,7 @@ ib_cm_rtu(
 \r
        if( IB_SUCCESS != status )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("IOCTL status %s.\n", ib_get_err_str(status)) );\r
                ref_al_obj( &h_conn->obj );\r
                h_conn->obj.pfn_destroy( &h_conn->obj, NULL );\r
@@ -891,12 +899,12 @@ ib_cm_handoff(
        h_conn = h_cm_req;\r
        if( AL_OBJ_INVALID_HANDLE( h_conn, AL_OBJ_TYPE_H_CONN ) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("Invalid REQ handle.\n") );\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR, ("Invalid REQ handle.\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
        if( !svc_id )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("0 svc_id\n" ) );\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR, ("0 svc_id\n" ) );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -912,13 +920,13 @@ ib_cm_handoff(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(cm_ioctl.out) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_CM_HANDOFF IOCTL returned %s\n", CL_STATUS_MSG(cl_status)) );\r
                return IB_ERROR;\r
        }\r
        else if( cm_ioctl.out.status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("IOCTL status %s\n", ib_get_err_str(cm_ioctl.out.status)) );\r
        }\r
 \r
@@ -945,18 +953,18 @@ ib_cm_rej(
        ib_api_status_t                 status;\r
        cl_status_t                             cl_status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_CM);\r
 \r
        /* Validate input parameters. */\r
        h_conn = h_cm;\r
        if( AL_OBJ_INVALID_HANDLE( h_conn, AL_OBJ_TYPE_H_CONN ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("Invalid REJ handle.\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("Invalid REJ handle.\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
        if( !p_cm_rej )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("NULL p_cm_rej\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("NULL p_cm_rej\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -969,7 +977,7 @@ ib_cm_rej(
        p_cm_ioctl = (ual_cm_rej_ioctl_t*)cl_zalloc( ioctl_buf_sz );\r
        if( !p_cm_ioctl )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("Failed to allocate IOCTL buffer.\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -993,7 +1001,7 @@ ib_cm_rej(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(p_cm_ioctl->out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_CM_REJ IOCTL returned %s\n", CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
        }\r
@@ -1013,7 +1021,7 @@ ib_cm_rej(
        }\r
        else\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("IOCTL status %s.\n", ib_get_err_str(status)) );\r
        }\r
 \r
@@ -1036,18 +1044,18 @@ ib_cm_mra(
        ib_api_status_t                 status;\r
        cl_status_t                             cl_status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_CM);\r
 \r
        /* Validate input parameters. */\r
        h_conn = h_cm;\r
        if( AL_OBJ_INVALID_HANDLE( h_conn, AL_OBJ_TYPE_H_CONN ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("Invalid CM handle.\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("Invalid CM handle.\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
        if( !p_cm_mra )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("NULL p_cm_mra\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("NULL p_cm_mra\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1058,7 +1066,7 @@ ib_cm_mra(
        p_cm_ioctl = (ual_cm_mra_ioctl_t*)cl_zalloc( ioctl_buf_sz );\r
        if( !p_cm_ioctl )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("Failed to allocate IOCTL buffer\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -1077,7 +1085,7 @@ ib_cm_mra(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(p_cm_ioctl->out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_CM_MRA IOCTL returned %s\n", CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
        }\r
@@ -1086,13 +1094,13 @@ ib_cm_mra(
                status = p_cm_ioctl->out.status;\r
                if( status != IB_SUCCESS )\r
                {\r
-                       AL_TRACE( AL_DBG_ERROR,\r
+                       AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                                ("IOCTL status %s.\n", ib_get_err_str(status)) );\r
                }\r
        }\r
 \r
        cl_free( p_cm_ioctl );\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_CM);\r
        return status;\r
 }\r
 \r
@@ -1109,12 +1117,12 @@ ib_cm_lap(
        ib_api_status_t                 status;\r
        cl_status_t                             cl_status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_CM);\r
 \r
        /* Validate input parameters. */\r
        if( !p_cm_lap || !p_cm_lap->p_alt_path )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("NULL p_cm_lap\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("NULL p_cm_lap\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1125,7 +1133,7 @@ ib_cm_lap(
        p_cm_ioctl = (ual_cm_lap_ioctl_t*)cl_zalloc( ioctl_buf_sz );\r
        if( !p_cm_ioctl )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("Failed to allocate IOCTL buffer.\n") );\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR, ("Failed to allocate IOCTL buffer.\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
 \r
@@ -1138,7 +1146,7 @@ ib_cm_lap(
                if( AL_OBJ_INVALID_HANDLE( p_cm_lap->h_qp, AL_OBJ_TYPE_H_QP ) ||\r
                        (p_cm_lap->h_qp->type != p_cm_lap->qp_type) )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                                ("IB_INVALID_QP_HANDLE\n") );\r
                        status = IB_INVALID_QP_HANDLE;\r
                        goto cleanup;\r
@@ -1148,14 +1156,14 @@ ib_cm_lap(
                break;\r
 \r
        default:\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("Invalid qp_type.\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("Invalid qp_type.\n") );\r
                status = IB_INVALID_SETTING;\r
                goto cleanup;\r
        }\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_conn, AL_OBJ_TYPE_H_CONN ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("No connection info!\n") );\r
                status = IB_INVALID_SETTING;\r
                goto cleanup;\r
@@ -1176,7 +1184,7 @@ ib_cm_lap(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(p_cm_ioctl->out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_CM_LAP IOCTL returned %s\n", CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
        }\r
@@ -1185,14 +1193,14 @@ ib_cm_lap(
                status = p_cm_ioctl->out.status;\r
                if( status != IB_SUCCESS )\r
                {\r
-                       AL_TRACE( AL_DBG_ERROR,\r
+                       AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                                ("IOCTL status %s.\n", ib_get_err_str(status)) );\r
                }\r
        }\r
 \r
 cleanup:\r
        cl_free( p_cm_ioctl );\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_CM);\r
        return status;\r
 }\r
 \r
@@ -1207,7 +1215,7 @@ ib_force_apm(
        ib_api_status_t                 status;\r
        cl_status_t                             cl_status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_CM);\r
 \r
        /* Clear the apm_ioctl */\r
        cl_memclr( &cm_ioctl, sizeof( cm_ioctl ) );\r
@@ -1215,7 +1223,7 @@ ib_force_apm(
        /* Replace the handles with kernel handles appropriately */\r
        if( AL_OBJ_INVALID_HANDLE( h_qp, AL_OBJ_TYPE_H_QP ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("Invalid QP handle.\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("Invalid QP handle.\n") );\r
                return IB_INVALID_QP_HANDLE;\r
        }\r
        \r
@@ -1227,7 +1235,7 @@ ib_force_apm(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(cm_ioctl.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_CM_FORCE_APM IOCTL returned %s\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
@@ -1237,12 +1245,12 @@ ib_force_apm(
                status = cm_ioctl.out.status;\r
                if( status != IB_SUCCESS )\r
                {\r
-                       AL_TRACE( AL_DBG_ERROR,\r
+                       AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                                ("IOCTL status %s.\n", ib_get_err_str(status)) );\r
                }\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_CM);\r
        return status;\r
 }\r
 \r
@@ -1261,18 +1269,18 @@ ib_cm_apr(
        cl_status_t                             cl_status;\r
        uint8_t                                 *p_buf;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_CM);\r
 \r
        /* Validate input parameters. */\r
        h_conn = h_cm_lap;\r
        if( AL_OBJ_INVALID_HANDLE( h_conn, AL_OBJ_TYPE_H_CONN ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("Invalid lap handle.\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("Invalid lap handle.\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
        if( !p_cm_apr )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("NULL p_cm_apr\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("NULL p_cm_apr\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1285,7 +1293,7 @@ ib_cm_apr(
        p_cm_ioctl = (ual_cm_apr_ioctl_t*)cl_zalloc( ioctl_buf_sz );\r
        if( !p_cm_ioctl )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("Failed to allocate IOCTL buffer.\n") );\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR, ("Failed to allocate IOCTL buffer.\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
 \r
@@ -1302,7 +1310,7 @@ ib_cm_apr(
                if( AL_OBJ_INVALID_HANDLE( p_cm_apr->h_qp, AL_OBJ_TYPE_H_QP ) ||\r
                        (p_cm_apr->h_qp->type != p_cm_apr->qp_type) )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                                ("IB_INVALID_QP_HANDLE\n") );\r
                        status = IB_INVALID_QP_HANDLE;\r
                        goto cleanup;\r
@@ -1312,14 +1320,14 @@ ib_cm_apr(
                break;\r
 \r
        default:\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("Invalid qp_type.\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("Invalid qp_type.\n") );\r
                status = IB_INVALID_SETTING;\r
                goto cleanup;\r
        }\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_conn, AL_OBJ_TYPE_H_CONN ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("No connection info!\n") );\r
                status = IB_INVALID_SETTING;\r
                goto cleanup;\r
@@ -1342,7 +1350,7 @@ ib_cm_apr(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(p_cm_ioctl->out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_CM_APR IOCTL returned %s.\n", CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
        }\r
@@ -1351,7 +1359,7 @@ ib_cm_apr(
                status = p_cm_ioctl->out.status;\r
                if( status != IB_SUCCESS )\r
                {\r
-                       AL_TRACE( AL_DBG_ERROR,\r
+                       AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                                ("IOCTL status %s.\n", ib_get_err_str(status)) );\r
                }\r
        }\r
@@ -1361,7 +1369,7 @@ ib_cm_apr(
 \r
 cleanup:\r
        cl_free( p_cm_ioctl );\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_CM);\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -1378,12 +1386,12 @@ ib_cm_dreq(
        ib_api_status_t                 status;\r
        cl_status_t                             cl_status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_CM);\r
 \r
        /* Validate input parameters. */\r
        if( !p_cm_dreq )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("NULL p_cm_dreq\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("NULL p_cm_dreq\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1394,7 +1402,7 @@ ib_cm_dreq(
        p_cm_ioctl = (ual_cm_dreq_ioctl_t*)cl_zalloc( ioctl_buf_sz );\r
        if( !p_cm_ioctl )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("Failed to allocate IOCTL buffer.\n") );\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR, ("Failed to allocate IOCTL buffer.\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
 \r
@@ -1407,7 +1415,7 @@ ib_cm_dreq(
                if( AL_OBJ_INVALID_HANDLE( p_cm_dreq->h_qp, AL_OBJ_TYPE_H_QP ) ||\r
                        (p_cm_dreq->h_qp->type != p_cm_dreq->qp_type) )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                                ("IB_INVALID_QP_HANDLE\n") );\r
                        status = IB_INVALID_QP_HANDLE;\r
                        goto cleanup;\r
@@ -1417,14 +1425,14 @@ ib_cm_dreq(
                break;\r
 \r
        default:\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("Invalid qp_type.\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("Invalid qp_type.\n") );\r
                status = IB_INVALID_SETTING;\r
                goto cleanup;\r
        }\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_conn, AL_OBJ_TYPE_H_CONN ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("No connection info!\n") );\r
                status = IB_INVALID_SETTING;\r
                goto cleanup;\r
@@ -1445,7 +1453,7 @@ ib_cm_dreq(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(p_cm_ioctl->out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_CM_DREQ IOCTL returned %s\n", CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
        }\r
@@ -1455,14 +1463,14 @@ ib_cm_dreq(
                if( IB_SUCCESS != status )\r
                {\r
                        /* We can fail if we just received a DREQ, which is not an error. */\r
-                       AL_TRACE( AL_DBG_CM,\r
+                       AL_PRINT(TRACE_LEVEL_INFORMATION ,AL_DBG_CM ,\r
                                ("IOCTL status %s\n", ib_get_err_str(status)) );\r
                }\r
        }\r
 \r
 cleanup:\r
        cl_free( p_cm_ioctl );\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_CM);\r
        return status;\r
 }\r
 \r
@@ -1480,18 +1488,18 @@ ib_cm_drep(
        ib_api_status_t                 status;\r
        cl_status_t                             cl_status;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_CM);\r
 \r
        /* Validate input parameters. */\r
        h_conn = h_cm_dreq;\r
        if( AL_OBJ_INVALID_HANDLE( h_conn, AL_OBJ_TYPE_H_CONN ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("Invalid DREP handle.\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("Invalid DREP handle.\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
        if( !p_cm_drep )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("NULL p_cm_drep\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("NULL p_cm_drep\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1502,7 +1510,7 @@ ib_cm_drep(
        p_cm_ioctl = (ual_cm_drep_ioctl_t*)cl_zalloc( ioctl_buf_sz );\r
        if( !p_cm_ioctl )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("Failed to allocate IOCTL buffer.\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -1523,7 +1531,7 @@ ib_cm_drep(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(p_cm_ioctl->out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_CM_DREP IOCTL returned %s\n", CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
        }\r
@@ -1540,7 +1548,7 @@ ib_cm_drep(
        }\r
        else\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("IOCTL status %s\n", ib_get_err_str(status)) );\r
 \r
                /* Release the reference taken when processing the callback. */\r
@@ -1548,7 +1556,7 @@ ib_cm_drep(
        }\r
 \r
        cl_free( p_cm_ioctl );\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_CM);\r
        return status;\r
 }\r
 \r
@@ -1560,7 +1568,7 @@ ual_listen_err_cb(
 {\r
        ib_listen_handle_t              h_listen;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_CM);\r
        \r
        /* Get the listen object. */\r
        h_listen = p_listen_err_rec->listen_context;\r
@@ -1578,7 +1586,7 @@ ual_listen_err_cb(
        ref_al_obj( &h_listen->obj );\r
        h_listen->obj.pfn_destroy( &h_listen->obj, NULL );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_CM);\r
 }\r
 \r
 \r
@@ -1594,7 +1602,7 @@ ual_cm_req_cb(
        ib_cm_handle_t                          h_conn;\r
        ib_qp_handle_t                          h_qp;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_CM);\r
 \r
        if( p_cm_req_rec->h_cm_listen )\r
        {\r
@@ -1621,7 +1629,7 @@ ual_cm_req_cb(
                h_conn = __get_conn( (ib_al_handle_t)h_listen->obj.p_parent_obj );\r
                if( !h_conn )\r
                {\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                                ("__get_conn failed.\n") );\r
                        __rej_conn( p_cm_req_rec->h_cm_req, IB_REJ_INSUF_RESOURCES );\r
                        return;\r
@@ -1668,7 +1676,7 @@ ual_cm_req_cb(
        /* Invoke the user's callback. */\r
        h_conn->p_conn_req->pfn_cm_req_cb( p_cm_req_rec );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_CM);\r
 }\r
 \r
 \r
@@ -1682,7 +1690,7 @@ ual_cm_rep_cb(
        ib_cm_handle_t                          h_conn;\r
        ib_qp_handle_t                          h_qp;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_CM);\r
 \r
        /* Get the user's context. */\r
        switch( p_cm_rep_rec->qp_type )\r
@@ -1724,11 +1732,11 @@ ual_cm_rep_cb(
                break;\r
 \r
        default:\r
-               CL_TRACE( AL_DBG_ERROR, g_al_dbg_lvl, ("Invalid qp_type.\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR , AL_DBG_ERROR , ("Invalid qp_type.\n") );\r
                break;\r
        }\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_CM);\r
 }\r
 \r
 \r
@@ -1741,7 +1749,7 @@ ual_cm_rtu_cb(
        ib_qp_handle_t                          h_qp;\r
        ib_pfn_cm_rtu_cb_t                      pfn_cm_rtu_cb;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_CM);\r
 \r
        h_qp = (ib_qp_handle_t)p_cm_rtu_rec->qp_context;\r
        p_cm_rtu_rec->qp_context = h_qp->obj.context;\r
@@ -1762,7 +1770,7 @@ ual_cm_rtu_cb(
        /* Invoke the user's callback. */\r
        pfn_cm_rtu_cb( p_cm_rtu_rec );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_CM);\r
 }\r
 \r
 \r
@@ -1775,7 +1783,7 @@ ual_cm_rej_cb(
        ib_qp_handle_t                          h_qp;\r
        ib_pfn_cm_rej_cb_t                      pfn_cm_rej_cb;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_CM);\r
 \r
        h_qp = (ib_qp_handle_t)p_cm_rej_rec->qp_context;\r
        p_cm_rej_rec->qp_context = h_qp->obj.context;\r
@@ -1807,7 +1815,7 @@ ual_cm_rej_cb(
            if( pfn_cm_rej_cb )\r
                pfn_cm_rej_cb( p_cm_rej_rec );\r
        }\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_CM);\r
 }\r
 \r
 \r
@@ -1819,7 +1827,7 @@ ual_cm_mra_cb(
        ib_cm_handle_t                          h_conn;\r
        ib_qp_handle_t                          h_qp;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_CM);\r
 \r
        /* Convert the user's handles. */\r
        switch( p_cm_mra_rec->qp_type )\r
@@ -1832,14 +1840,14 @@ ual_cm_mra_cb(
                break;\r
 \r
        default:\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("Invalid qp_type.\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("Invalid qp_type.\n") );\r
                return;\r
        }\r
 \r
        /* Call the application callback */\r
        h_conn->pfn_cm_mra_cb( p_cm_mra_rec );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_CM);\r
 }\r
 \r
 \r
@@ -1851,7 +1859,7 @@ ual_cm_lap_cb(
        ib_cm_handle_t                          h_conn;\r
        ib_qp_handle_t                          h_qp;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_CM);\r
 \r
        /* Convert the user's handles. */\r
        switch( p_cm_lap_rec->qp_type )\r
@@ -1864,7 +1872,7 @@ ual_cm_lap_cb(
                break;\r
 \r
        default:\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("Invalid qp_type.\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("Invalid qp_type.\n") );\r
                return;\r
        }\r
 \r
@@ -1878,7 +1886,7 @@ ual_cm_lap_cb(
        /* Call the application callback */\r
        h_conn->pfn_cm_lap_cb( p_cm_lap_rec );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_CM);\r
 }\r
 \r
 \r
@@ -1890,7 +1898,7 @@ ual_cm_apr_cb(
        ib_cm_handle_t                          h_conn;\r
        ib_qp_handle_t                          h_qp;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_CM);\r
 \r
        /* Convert the user's handles. */\r
        switch( p_cm_apr_rec->qp_type )\r
@@ -1903,14 +1911,14 @@ ual_cm_apr_cb(
                break;\r
 \r
        default:\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("Invalid qp_type.\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("Invalid qp_type.\n") );\r
                return;\r
        }\r
 \r
        /* Call the application callback */\r
        h_conn->pfn_cm_apr_cb( p_cm_apr_rec );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_CM);\r
 }\r
 \r
 \r
@@ -1922,7 +1930,7 @@ ual_cm_dreq_cb(
        ib_cm_handle_t                          h_conn;\r
        ib_qp_handle_t                          h_qp;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_CM);\r
 \r
        /* Convert the user's handles. */\r
        switch( p_cm_dreq_rec->qp_type )\r
@@ -1935,7 +1943,7 @@ ual_cm_dreq_cb(
                break;\r
 \r
        default:\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("Invalid qp_type.\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("Invalid qp_type.\n") );\r
                return;\r
        }\r
 \r
@@ -1948,7 +1956,7 @@ ual_cm_dreq_cb(
 \r
        /* Call the application callback */\r
        h_conn->pfn_cm_dreq_cb( p_cm_dreq_rec );\r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_CM);\r
 }\r
 \r
 \r
@@ -1961,7 +1969,7 @@ ual_cm_drep_cb(
        ib_qp_handle_t                          h_qp;\r
        ib_pfn_cm_drep_cb_t                     pfn_cm_drep_cb;\r
 \r
-       CL_ENTER( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_CM);\r
 \r
        /* Convert the user's handles. */\r
        switch( p_cm_drep_rec->qp_type )\r
@@ -1974,7 +1982,7 @@ ual_cm_drep_cb(
                break;\r
 \r
        default:\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("Invalid qp_type.\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("Invalid qp_type.\n") );\r
                return;\r
        }\r
 \r
@@ -1994,5 +2002,5 @@ ual_cm_drep_cb(
        /* Invoke the user's callback. */\r
        pfn_cm_drep_cb( p_cm_drep_rec );\r
 \r
-       CL_EXIT( AL_DBG_CM, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_CM);\r
 }\r
index 5b2842067717bbf37efe5f4695c06d9581d910ef..ce3986774d8b786761ce936a1630d42bdc3d5b5e 100644 (file)
 #include "al_cm_conn.h"\r
 #include "al_cm_sidr.h"\r
 #include "al_debug.h"\r
+\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "ual_cm_cep.tmh"\r
+#endif\r
+\r
 #include "ib_common.h"\r
 #include "al_mgr.h"\r
 //#include "al_ca.h"\r
@@ -126,7 +134,7 @@ create_cep_mgr(
        gp_cep_mgr = (ual_cep_mgr_t*)cl_zalloc( sizeof(ual_cep_mgr_t) );\r
        if( !gp_cep_mgr )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("Failed allocation of global CEP manager.\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -140,7 +148,7 @@ create_cep_mgr(
        if( status != IB_SUCCESS )\r
        {\r
                __free_cep_mgr( &gp_cep_mgr->obj );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("init_al_obj failed with status %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -149,7 +157,7 @@ create_cep_mgr(
        if( status != IB_SUCCESS )\r
        {\r
                gp_cep_mgr->obj.pfn_destroy( &gp_cep_mgr->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -159,7 +167,7 @@ create_cep_mgr(
        if( cl_status != CL_SUCCESS )\r
        {\r
                gp_cep_mgr->obj.pfn_destroy( &gp_cep_mgr->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("cl_vector_init failed with status %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                return ib_convert_cl_status( cl_status );\r
@@ -170,7 +178,7 @@ create_cep_mgr(
        if( gp_cep_mgr->h_file == INVALID_HANDLE_VALUE )\r
        {\r
                gp_cep_mgr->obj.pfn_destroy( &gp_cep_mgr->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("ual_create_async_file for UAL_BIND_CM returned %d.\n",\r
                        GetLastError()) );\r
                return IB_ERROR;\r
@@ -248,7 +256,7 @@ __create_ucep(
        p_cep = cl_zalloc( sizeof(ucep_t) );\r
        if( !p_cep )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("Failed to allocate ucep_t\n") );\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR, ("Failed to allocate ucep_t\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
 \r
@@ -267,7 +275,7 @@ __create_ucep(
                        bytes_ret != sizeof(ioctl) )\r
                {\r
                        __destroy_ucep( p_cep );\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                                ("UAL_CREATE_CEP IOCTL failed with %d.\n", GetLastError()) );\r
                        return IB_ERROR;\r
                }\r
@@ -275,7 +283,7 @@ __create_ucep(
                if( ioctl.status != IB_SUCCESS )\r
                {\r
                        __destroy_ucep( p_cep );\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR, ("UAL_CREATE_CEP IOCTL returned %s\n",\r
+                       AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR, ("UAL_CREATE_CEP IOCTL returned %s\n",\r
                                ib_get_err_str( ioctl.status )) );\r
                        return ioctl.status;\r
                }\r
@@ -300,7 +308,7 @@ __create_ucep(
                NULL, 0, NULL, &p_cep->ov ) ||\r
                GetLastError() != ERROR_IO_PENDING )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR, ("Failed to issue CEP poll IOCTL.\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("Failed to issue CEP poll IOCTL.\n") );\r
                cl_spinlock_acquire( &gp_cep_mgr->obj.lock );\r
                cl_ptr_vector_set( &gp_cep_mgr->cep_vector, p_cep->cid, NULL );\r
                cl_spinlock_release( &gp_cep_mgr->obj.lock );\r
@@ -441,7 +449,7 @@ al_cep_listen(
        {\r
                if( p_listen_info->cmp_len > IB_REQ_PDATA_SIZE )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                                ("Listen compare data larger than REQ private data.\n") );\r
                        return IB_INVALID_SETTING;\r
                }\r
@@ -454,7 +462,7 @@ al_cep_listen(
                sizeof(ioctl), &status, sizeof(status), &bytes_ret, NULL ) ||\r
                bytes_ret != sizeof(status) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("ual_cep_listen IOCTL failed with %d.\n", GetLastError()) );\r
                return IB_ERROR;\r
        }\r
@@ -505,7 +513,7 @@ al_cep_pre_req(
        {\r
                if( p_cm_req->req_length > IB_REQ_PDATA_SIZE )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                                ("private data larger than REQ private data.\n") );\r
                        return IB_INVALID_SETTING;\r
                }\r
@@ -519,7 +527,7 @@ al_cep_pre_req(
        {\r
                if( p_cm_req->compare_length > IB_REQ_PDATA_SIZE )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                                ("REQ compare data larger than REQ private data.\n") );\r
                        return IB_INVALID_SETTING;\r
                }\r
@@ -532,7 +540,7 @@ al_cep_pre_req(
                sizeof(ioctl.in), &ioctl, sizeof(ioctl.out), &bytes_ret, NULL ) ||\r
                bytes_ret != sizeof(ioctl.out) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_CEP_PRE_REQ IOCTL failed with %d.\n", GetLastError()) );\r
                return IB_ERROR;\r
        }\r
@@ -565,7 +573,7 @@ al_cep_send_req(
                sizeof(cid), &status, sizeof(status), &bytes_ret, NULL ) ||\r
                bytes_ret != sizeof(status) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_CEP_SEND_REQ IOCTL failed with %d.\n", GetLastError()) );\r
                return IB_ERROR;\r
        }\r
@@ -628,7 +636,7 @@ al_cep_pre_rep(
        {\r
                if( p_cm_rep->rep_length > IB_REP_PDATA_SIZE )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                                ("private data larger than REP private data.\n") );\r
                        return IB_INVALID_SETTING;\r
                }\r
@@ -641,7 +649,7 @@ al_cep_pre_rep(
                sizeof(ioctl.in), &ioctl, sizeof(ioctl.out), &bytes_ret, NULL ) ||\r
                bytes_ret != sizeof(ioctl.out) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_CEP_PRE_REQ IOCTL failed with %d.\n", GetLastError()) );\r
                return IB_ERROR;\r
        }\r
@@ -674,7 +682,7 @@ al_cep_send_rep(
                sizeof(cid), &status, sizeof(status), &bytes_ret, NULL ) ||\r
                bytes_ret != sizeof(status) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_CEP_SEND_REP IOCTL failed with %d.\n", GetLastError()) );\r
                return IB_ERROR;\r
        }\r
@@ -711,7 +719,7 @@ al_cep_get_rtr_attr(
                sizeof(cid), &ioctl, sizeof(ioctl), &bytes_ret, NULL ) ||\r
                bytes_ret != sizeof(ioctl) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_CEP_GET_RTR IOCTL failed with %d.\n", GetLastError()) );\r
                return IB_ERROR;\r
        }\r
@@ -751,7 +759,7 @@ al_cep_get_rts_attr(
                sizeof(cid), &ioctl, sizeof(ioctl), &bytes_ret, NULL ) ||\r
                bytes_ret != sizeof(ioctl) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_CEP_GET_RTS IOCTL failed with %d.\n", GetLastError()) );\r
                return IB_ERROR;\r
        }\r
@@ -789,7 +797,7 @@ al_cep_rtu(
        {\r
                if( pdata_len > IB_RTU_PDATA_SIZE )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                                ("private data larger than RTU private data.\n") );\r
                        return IB_INVALID_SETTING;\r
                }\r
@@ -802,7 +810,7 @@ al_cep_rtu(
                sizeof(ioctl), &status, sizeof(status), &bytes_ret, NULL ) ||\r
                bytes_ret != sizeof(status) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_CEP_RTU IOCTL failed with %d.\n", GetLastError()) );\r
                return IB_ERROR;\r
        }\r
@@ -840,7 +848,7 @@ al_cep_rej(
        {\r
                if( ari_len > IB_ARI_SIZE )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                                ("private data larger than REJ ARI data.\n") );\r
                        return IB_INVALID_SETTING;\r
                }\r
@@ -857,7 +865,7 @@ al_cep_rej(
        {\r
                if( pdata_len > IB_REJ_PDATA_SIZE )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                                ("private data larger than REJ private data.\n") );\r
                        return IB_INVALID_SETTING;\r
                }\r
@@ -874,7 +882,7 @@ al_cep_rej(
                sizeof(ioctl), &status, sizeof(status), &bytes_ret, NULL ) ||\r
                bytes_ret != sizeof(status) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_CEP_PRE_REQ IOCTL failed with %d.\n", GetLastError()) );\r
                return IB_ERROR;\r
        }\r
@@ -915,7 +923,7 @@ al_cep_mra(
        {\r
                if( p_cm_mra->mra_length > IB_MRA_PDATA_SIZE )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                                ("private data larger than MRA private data.\n") );\r
                        return IB_INVALID_SETTING;\r
                }\r
@@ -928,7 +936,7 @@ al_cep_mra(
                sizeof(ioctl), &status, sizeof(status), &bytes_ret, NULL ) ||\r
                bytes_ret != sizeof(status) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_CEP_MRA IOCTL failed with %d.\n", GetLastError()) );\r
                return IB_ERROR;\r
        }\r
@@ -977,7 +985,7 @@ al_cep_lap(
        {\r
                if( p_cm_lap->lap_length > IB_LAP_PDATA_SIZE )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                                ("private data larger than LAP private data.\n") );\r
                        return IB_INVALID_SETTING;\r
                }\r
@@ -990,7 +998,7 @@ al_cep_lap(
                sizeof(ioctl), &status, sizeof(status), &bytes_ret, NULL ) ||\r
                bytes_ret != sizeof(status) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_CEP_LAP IOCTL failed with %d.\n", GetLastError()) );\r
                return IB_ERROR;\r
        }\r
@@ -1031,7 +1039,7 @@ al_cep_pre_apr(
        {\r
                if( p_cm_apr->info_length > IB_APR_INFO_SIZE )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                                ("private data larger than APR info data.\n") );\r
                        return IB_INVALID_SETTING;\r
                }\r
@@ -1044,7 +1052,7 @@ al_cep_pre_apr(
        {\r
                if( p_cm_apr->apr_length > IB_REJ_PDATA_SIZE )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                                ("private data larger than APR private data.\n") );\r
                        return IB_INVALID_SETTING;\r
                }\r
@@ -1057,7 +1065,7 @@ al_cep_pre_apr(
                sizeof(ioctl.in), &ioctl.out, sizeof(ioctl.out), &bytes_ret, NULL ) ||\r
                bytes_ret != sizeof(ioctl.out) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_CEP_PRE_REQ IOCTL failed with %d.\n", GetLastError()) );\r
                return IB_ERROR;\r
        }\r
@@ -1090,7 +1098,7 @@ al_cep_send_apr(
                sizeof(cid), &status, sizeof(status), &bytes_ret, NULL ) ||\r
                bytes_ret != sizeof(status) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_CEP_SEND_APR IOCTL failed with %d.\n", GetLastError()) );\r
                return IB_ERROR;\r
        }\r
@@ -1125,7 +1133,7 @@ al_cep_dreq(
        {\r
                if( pdata_len > IB_DREQ_PDATA_SIZE )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                                ("private data larger than DREQ private data.\n") );\r
                        return IB_INVALID_SETTING;\r
                }\r
@@ -1142,7 +1150,7 @@ al_cep_dreq(
                sizeof(ioctl), &status, sizeof(status), &bytes_ret, NULL ) ||\r
                bytes_ret != sizeof(status) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_CEP_DREQ IOCTL failed with %d.\n", GetLastError()) );\r
                return IB_ERROR;\r
        }\r
@@ -1183,7 +1191,7 @@ al_cep_drep(
        {\r
                if( p_cm_drep->drep_length > IB_DREP_PDATA_SIZE )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                                ("private data larger than DREP private data.\n") );\r
                        return IB_INVALID_SETTING;\r
                }\r
@@ -1196,7 +1204,7 @@ al_cep_drep(
                sizeof(ioctl), &status, sizeof(status), &bytes_ret, NULL ) ||\r
                bytes_ret != sizeof(status) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_CEP_DREP IOCTL failed with %d.\n", GetLastError()) );\r
                return IB_ERROR;\r
        }\r
@@ -1233,7 +1241,7 @@ al_cep_get_timewait(
                &ioctl, sizeof(ioctl), &bytes_ret, NULL ) ||\r
                bytes_ret != sizeof(ioctl) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_CEP_DREP IOCTL failed with %d.\n", GetLastError()) );\r
                return IB_ERROR;\r
        }\r
@@ -1303,7 +1311,7 @@ al_cep_poll(
        status = ib_get_mad( g_pool_key, MAD_BLOCK_SIZE, &p_mad );\r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("ib_get_mad returned %s.\n", ib_get_err_str( status )) );\r
                return status;\r
        }\r
@@ -1316,7 +1324,7 @@ al_cep_poll(
                bytes_ret != sizeof(ioctl) )\r
        {\r
                ib_put_mad( p_mad );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_CEP_GET_RTS IOCTL failed with %d.\n", GetLastError()) );\r
                return IB_ERROR;\r
        }\r
@@ -1396,14 +1404,14 @@ cm_cb(
                else if( GetLastError() != ERROR_INVALID_PARAMETER )\r
                {\r
                        /* We can get ERROR_INVALID_PARAMETER if the CEP was destroyed. */\r
-                       AL_TRACE( AL_DBG_ERROR,\r
+                       AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                                ("DeviceIoControl for CEP callback request returned %d.\n",\r
                                GetLastError()) );\r
                }\r
        }\r
        else\r
        {\r
-               AL_TRACE( AL_DBG_WARN,\r
+               AL_PRINT(TRACE_LEVEL_WARNING ,AL_DBG_CM ,\r
                        ("UAL_CEP_GET_EVENT IOCTL returned %d.\n", error_code) );\r
        }\r
 \r
index cd7939b4ef4522563ee061a191e9474b91074eec..abc7291da5987e4d7137efee3ed68d2b9307797c 100644 (file)
 #include "al_ci_ca.h"\r
 #include "al_cq.h"\r
 \r
+#include "al_debug.h"\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "ual_cq.tmh"\r
+#endif\r
 \r
 \r
 ib_api_status_t\r
@@ -79,7 +86,7 @@ ual_create_cq(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(cq_ioctl.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_CREATE_CQ IOCTL returned %s.\n", CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
        }\r
@@ -205,7 +212,7 @@ ual_destroy_cq(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(cq_ioctl.out ) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_DESTROY_CQ IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
@@ -261,7 +268,7 @@ ual_modify_cq(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(cq_ioctl.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_MODIFY_CQ IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
@@ -325,7 +332,7 @@ ual_query_cq(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(cq_ioctl.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_QUERY_CQ IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
@@ -371,7 +378,7 @@ ual_peek_cq(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(cq_ioctl.out) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_PEEK_CQ IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                return IB_ERROR;\r
@@ -445,7 +452,7 @@ ual_poll_cq(
                sizeof(ib_wc_t) + (sizeof(ib_wc_t) * p_cq_ioctl->out.num_wc))) )\r
        {\r
                cl_free( p_cq_ioctl );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_POLL_CQ IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                return IB_ERROR;\r
@@ -507,7 +514,7 @@ ual_rearm_cq(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(cq_ioctl.out) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_REARM_CQ IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                return IB_ERROR;\r
@@ -541,7 +548,7 @@ ual_rearm_n_cq(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(cq_ioctl.out) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_REARM_N_CQ IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                return IB_ERROR;\r
index 4c00e530a3866c52a780f167953aedbbd074499a..d59cfaf7a9727e812ed410a905b1bc47f4aa1afe 100644 (file)
 #include "al_av.h"\r
 #include "al_common.h"\r
 #include "al_debug.h"\r
+\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "ual_mad.tmh"\r
+#endif\r
+\r
 #include "al_dev.h"\r
 #include "al_qp.h"\r
 #include "al_pd.h"\r
@@ -48,14 +56,14 @@ __destroying_ual_mad_svc(
 {\r
        ib_mad_svc_handle_t             h_mad_svc;\r
 \r
-       CL_ENTER( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_MAD_SVC);\r
        CL_ASSERT( p_obj );\r
        h_mad_svc = PARENT_STRUCT( p_obj, al_mad_svc_t, obj );\r
 \r
        /* Deregister the MAD service. */\r
        ual_dereg_mad_svc( h_mad_svc );\r
 \r
-       CL_EXIT( AL_DBG_MAD_SVC, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_MAD_SVC);\r
 }\r
 \r
 \r
@@ -117,7 +125,7 @@ ual_reg_mad_svc(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(ioctl_buf.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_REG_MAD_SVC IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
@@ -152,7 +160,7 @@ ual_dereg_mad_svc(
        cl_status_t                                     cl_status;\r
        ib_api_status_t                         status;\r
 \r
-       CL_ENTER( AL_DBG_MAD, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_MAD);\r
 \r
        cl_memclr( &ioctl_buf, sizeof(ioctl_buf) );\r
 \r
@@ -167,11 +175,11 @@ ual_dereg_mad_svc(
 \r
        if( status != IB_SUCCESS )\r
        {\r
-               CL_PRINT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("Error deregistering MAD svc: %s\n", ib_get_err_str( status ) ) );\r
        }\r
 \r
-       CL_EXIT( AL_DBG_MAD, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_MAD);\r
        return status;\r
 }\r
 \r
@@ -223,7 +231,7 @@ ual_send_one_mad(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(ioctl_buf.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_MAD_SEND IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
@@ -300,7 +308,7 @@ ual_spl_qp_cancel_mad(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(ioctl_buf.out) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_CANCEL_MAD IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                return IB_ERROR;\r
@@ -337,7 +345,7 @@ ual_create_reg_mad_pool(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(ioctl_buf.out) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_REG_MAD_POOL IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                return IB_ERROR;\r
@@ -372,12 +380,13 @@ ual_dereg_destroy_mad_pool(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(ioctl_buf.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
-                       ("UAL_DEREG_MAD_POOL IOCTL returned %s.\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
+                       ("UAL_DEREG_MAD_POOL IOCTL returned %s.\n",\r
+                       CL_STATUS_MSG(cl_status)));\r
        }\r
        else if( ioctl_buf.out.status != IB_SUCCESS )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("Error deregistering MAD pool: %s\n",\r
                        ib_get_err_str( ioctl_buf.out.status )) );\r
        }\r
@@ -439,7 +448,7 @@ ual_get_recv_mad(
                &bytes_ret );\r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(ioctl_buf.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_MAD_RECV_COMP IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
@@ -494,7 +503,7 @@ ual_local_mad(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(local_mad_ioctl.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_LOCAL_MAD IOCTL returned %s\n", CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
        }\r
index 78f38fac76972188856a5cc9da4942cb39263e5e..71277e61bff5da7ef61e8fb7ce064e28905c24e2 100644 (file)
 #include "al_mad_pool.h"\r
 #include "al_debug.h"\r
 \r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "ual_mad_pool.tmh"\r
+#endif\r
+\r
+\r
 \r
 \r
 /*\r
@@ -54,16 +62,16 @@ ual_reg_global_mad_pool(
        al_pool_key_t*                  p_pool_key;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_MAD_POOL);\r
 \r
        if( AL_OBJ_INVALID_HANDLE( h_pool, AL_OBJ_TYPE_H_MAD_POOL ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("IB_INVALID_HANDLE\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
        if( !pp_pool_key )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -85,7 +93,7 @@ ual_reg_global_mad_pool(
        {\r
                __ual_free_pool_key( &p_pool_key->obj );\r
 \r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("init_al_obj failed with status %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -94,7 +102,7 @@ ual_reg_global_mad_pool(
        if( status != IB_SUCCESS )\r
        {\r
                p_pool_key->obj.pfn_destroy( &p_pool_key->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -106,7 +114,7 @@ ual_reg_global_mad_pool(
        /* Release the reference taken in init_al_obj. */\r
        deref_al_obj( &p_pool_key->obj );\r
 \r
-       CL_EXIT( AL_DBG_MAD_POOL, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_MAD_POOL);\r
        return IB_SUCCESS;\r
 }\r
 \r
index e342bd69ffa37ca63482245d0f49e5360dcc13fd..0da173a1ee74faccd018d4ed66561c448920a145 100644 (file)
 #include "ual_support.h"\r
 #include "ual_mcast.h"\r
 \r
+#include "al_debug.h"\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "ual_mcast.tmh"\r
+#endif\r
 \r
 ib_api_status_t\r
 ual_attach_mcast(\r
@@ -81,7 +88,7 @@ ual_attach_mcast(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(ioctl_buf.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_ATTACH_MCAST IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
@@ -145,7 +152,7 @@ ual_detach_mcast(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(ioctl_buf.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_DETACH_MCAST IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
index 87f29930bde43ef6d6580af96afcdf90ff716292..532e1775628729236c3589cf1282d38ca8e2b894 100644 (file)
 \r
 #include "ual_support.h"\r
 #include "al_debug.h"\r
+\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "ual_mgr.tmh"\r
+#endif\r
+\r
 #include "al_mgr.h"\r
 #include "al_init.h"\r
 #include "al_res_mgr.h"\r
@@ -79,7 +87,7 @@ static void
 __cleanup_ual_mgr(\r
        IN                              al_obj_t                                        *p_obj )\r
 {\r
-       CL_ENTER( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_MGR);\r
 \r
        UNUSED_PARAM( p_obj );\r
 \r
@@ -123,7 +131,7 @@ __free_ual_mgr(
                        if( !PostQueuedCompletionStatus( gp_al_mgr->ual_mgr.h_cb_port,\r
                                0, 0, NULL ) )\r
                        {\r
-                               AL_TRACE( AL_DBG_ERROR,\r
+                               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                                        ("PostQueuedCompletionStatus returned %d\n",\r
                                        GetLastError()) );\r
                        }\r
@@ -164,7 +172,7 @@ ual_create_async_file(
                NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL );\r
        if( ioctl.h_file == INVALID_HANDLE_VALUE )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("CreateFile returned %d.\n", GetLastError()) );\r
                return INVALID_HANDLE_VALUE;\r
        }\r
@@ -174,7 +182,7 @@ ual_create_async_file(
                ioctl.h_file, gp_al_mgr->ual_mgr.h_cb_port, type, 0 ) )\r
        {\r
                CloseHandle( ioctl.h_file );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("CreateIoCompletionPort for file of type %d returned %d.\n",\r
                        type, GetLastError()) );\r
                return INVALID_HANDLE_VALUE;\r
@@ -189,9 +197,9 @@ ual_create_async_file(
        if( cl_status != CL_SUCCESS )\r
        {\r
                CloseHandle( ioctl.h_file );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("Bind IOCTL for type %d returned %s.\n",\r
-                       CL_STATUS_MSG(cl_status)) );\r
+                       type,CL_STATUS_MSG(cl_status)) );\r
                return INVALID_HANDLE_VALUE;\r
        }\r
 \r
@@ -213,7 +221,7 @@ ual_create_cb_threads( void )
                &gp_al_mgr->ual_mgr.cb_threads, cl_proc_count(), 0 );\r
        if( cl_status != CL_SUCCESS )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("cl_ptr_vector_init returned %s.\n", CL_STATUS_MSG( cl_status )) );\r
                return IB_ERROR;\r
        }\r
@@ -223,7 +231,7 @@ ual_create_cb_threads( void )
                h_thread = CreateThread( NULL, 0, __cb_thread_routine, NULL, 0, NULL );\r
                if( !h_thread )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                                ("CreateThread returned %d.\n", GetLastError()) );\r
                        return IB_ERROR;\r
                }\r
@@ -250,7 +258,7 @@ create_al_mgr()
        uintn_t                                 bytes_ret;\r
        ULONG                                   ver;\r
 \r
-       CL_ENTER( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_MGR);\r
 \r
        CL_ASSERT( !gp_al_mgr );\r
 \r
@@ -272,7 +280,7 @@ create_al_mgr()
        gp_al_mgr = cl_zalloc( sizeof( al_mgr_t ) );\r
        if( !gp_al_mgr )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("Failed to cl_zalloc ual_mgr_t.\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -292,7 +300,7 @@ create_al_mgr()
        if( ib_status != IB_SUCCESS )\r
        {\r
                __free_ual_mgr( &gp_al_mgr->obj );\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("init_al_obj failed, status = 0x%x.\n", ib_status) );\r
                return ib_status;\r
        }\r
@@ -303,7 +311,7 @@ create_al_mgr()
        if( !gp_al_mgr->ual_mgr.h_cb_port )\r
        {\r
                gp_al_mgr->obj.pfn_destroy( &gp_al_mgr->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("Failed to create I/O completion port.\n") );\r
                return IB_ERROR;\r
        }\r
@@ -313,7 +321,7 @@ create_al_mgr()
        if( ib_status != IB_SUCCESS )\r
        {\r
                gp_al_mgr->obj.pfn_destroy( &gp_al_mgr->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("ual_create_cb_threads failed.\n") );\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR, ("ual_create_cb_threads failed.\n") );\r
                return ib_status;\r
        }\r
 \r
@@ -322,7 +330,7 @@ create_al_mgr()
        //if( gp_al_mgr->ual_mgr.h_cq_file == INVALID_HANDLE_VALUE )\r
        //{\r
        //      gp_al_mgr->obj.pfn_destroy( &gp_al_mgr->obj, NULL );\r
-       //      AL_TRACE_EXIT( AL_DBG_ERROR,\r
+       //      AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
        //              ("ual_create_async_file for UAL_BIND_CM returned %d.\n",\r
        //              GetLastError()) );\r
        //      return IB_ERROR;\r
@@ -333,7 +341,7 @@ create_al_mgr()
        if( gp_al_mgr->ual_mgr.h_cq_file == INVALID_HANDLE_VALUE )\r
        {\r
                gp_al_mgr->obj.pfn_destroy( &gp_al_mgr->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("ual_create_async_file for UAL_BIND_CQ returned %d.\n",\r
                        GetLastError()) );\r
                return IB_ERROR;\r
@@ -344,7 +352,7 @@ create_al_mgr()
        if( gp_al_mgr->ual_mgr.h_misc_file == INVALID_HANDLE_VALUE )\r
        {\r
                gp_al_mgr->obj.pfn_destroy( &gp_al_mgr->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("ual_create_async_file for UAL_BIND_CQ returned %d.\n",\r
                        GetLastError()) );\r
                return IB_ERROR;\r
@@ -368,7 +376,7 @@ create_al_mgr()
        if ((ib_status = do_open_al(&gp_al_mgr->ual_mgr.h_al)) != IB_SUCCESS)\r
        {\r
                gp_al_mgr->obj.pfn_destroy(&gp_al_mgr->obj, NULL);\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("do_open_al() failed, status = 0x%x.\n", ib_status) );\r
                return ( ib_status );\r
        }\r
@@ -378,7 +386,7 @@ create_al_mgr()
        if( ib_status != IB_SUCCESS )\r
        {\r
                gp_al_mgr->obj.pfn_destroy(&gp_al_mgr->obj, NULL);\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("ib_create_mad_pool failed with %s.\n", ib_get_err_str(ib_status)) );\r
                return ib_status;\r
        }\r
@@ -391,7 +399,7 @@ create_al_mgr()
        if( ib_status != IB_SUCCESS )\r
        {\r
                gp_al_mgr->obj.pfn_destroy(&gp_al_mgr->obj, NULL);\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("ual_reg_global_mad_pool failed with %s.\n", ib_get_err_str(ib_status)) );\r
                return ib_status;\r
        }\r
@@ -404,7 +412,7 @@ create_al_mgr()
        if( ib_status != IB_SUCCESS )\r
        {\r
                gp_al_mgr->obj.pfn_destroy(&gp_al_mgr->obj, NULL);\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("al_pnp_create failed with %s.\n", ib_get_err_str(ib_status)) );\r
                return ib_status;\r
        }\r
@@ -414,7 +422,7 @@ create_al_mgr()
        if( ib_status != IB_SUCCESS )\r
        {\r
                gp_al_mgr->obj.pfn_destroy(&gp_al_mgr->obj, NULL);\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("create_res_mgr failed with %s.\n", ib_get_err_str(ib_status)) );\r
                return ib_status;\r
        }\r
@@ -424,7 +432,7 @@ create_al_mgr()
        if( ib_status != IB_SUCCESS )\r
        {\r
                gp_al_mgr->obj.pfn_destroy(&gp_al_mgr->obj, NULL);\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("create_sa_req_mgr failed with %s.\n", ib_get_err_str(ib_status)) );\r
                return ib_status;\r
        }\r
@@ -434,7 +442,7 @@ create_al_mgr()
        if( ib_status != IB_SUCCESS )\r
        {\r
                gp_al_mgr->obj.pfn_destroy( &gp_al_mgr->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("create_cm_mgr failed, status = 0x%x.\n", ib_status) );\r
                return ib_status;\r
        }\r
@@ -454,7 +462,7 @@ create_al_mgr()
        {\r
                if( GetLastError() != ERROR_IO_PENDING )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                                ("DeviceIoControl for misc callback request returned %d.\n",\r
                                GetLastError()) );\r
                        gp_al_mgr->obj.pfn_destroy(&gp_al_mgr->obj, NULL);\r
@@ -469,7 +477,7 @@ create_al_mgr()
        //{\r
        //      if( GetLastError() != ERROR_IO_PENDING )\r
        //      {\r
-       //              AL_TRACE_EXIT( AL_DBG_ERROR,\r
+       //              AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
        //                      ("DeviceIoControl for CM callback request returned %d.\n",\r
        //                      GetLastError()) );\r
        //              gp_al_mgr->obj.pfn_destroy(&gp_al_mgr->obj, NULL);\r
@@ -484,7 +492,7 @@ create_al_mgr()
        {\r
                if( GetLastError() != ERROR_IO_PENDING )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                                ("DeviceIoControl for CM callback request returned %d.\n",\r
                                GetLastError()) );\r
                        gp_al_mgr->obj.pfn_destroy(&gp_al_mgr->obj, NULL);\r
@@ -514,7 +522,7 @@ create_al_mgr()
        /* Release the reference taken in init_al_obj. */\r
        deref_al_obj( &gp_al_mgr->obj );\r
        \r
-       CL_EXIT( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_MGR);\r
        return IB_SUCCESS;\r
 }\r
 \r
@@ -552,7 +560,7 @@ create_al_mgr()
 //             {\r
 //                     if( GetLastError() != ERROR_IO_PENDING )\r
 //                     {\r
-//                             AL_TRACE_EXIT( AL_DBG_ERROR,\r
+//                             AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
 //                                     ("DeviceIoControl for CM callback request returned %d.\n",\r
 //                                     GetLastError()) );\r
 //                     }\r
@@ -734,7 +742,7 @@ cq_cb(
                {\r
                        if( GetLastError() != ERROR_IO_PENDING )\r
                        {\r
-                               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                                        ("DeviceIoControl for CM callback request returned %d.\n",\r
                                        GetLastError()) );\r
                        }\r
@@ -774,7 +782,7 @@ misc_cb(
                {\r
                        if( GetLastError() != ERROR_IO_PENDING )\r
                        {\r
-                               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                                        ("DeviceIoControl for misc callback request returned %d.\n",\r
                                        GetLastError()) );\r
                        }\r
@@ -897,7 +905,7 @@ __process_misc_cb(
                        &bytes_ret );\r
                if( cl_status != CL_SUCCESS || bytes_ret != sizeof(ioctl_buf.out) )\r
                {\r
-                       AL_TRACE( AL_DBG_ERROR,\r
+                       AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                                ("UAL_MAD_RECV_COMP IOCTL returned %s.\n",\r
                                CL_STATUS_MSG(cl_status)) );\r
                        status = IB_ERROR;\r
@@ -1107,11 +1115,11 @@ do_open_al(
        ib_al_handle_t                  h_al;\r
        ib_api_status_t                 status;\r
 \r
-       CL_ENTER( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_ENTER(AL_DBG_MGR);\r
 \r
        if( !ph_al )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1125,7 +1133,7 @@ do_open_al(
                if( status != IB_SUCCESS )\r
                {\r
                        al_cleanup();\r
-                       CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+                       AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                                ("ual_init failed, status = %s\n", ib_get_err_str(status) ) );\r
                        return status;\r
                }\r
@@ -1140,7 +1148,7 @@ do_open_al(
        h_al = (ib_al_handle_t)cl_zalloc( sizeof( ib_al_t ) );\r
        if( !h_al )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("cl_malloc failed\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("cl_malloc failed\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
 \r
@@ -1165,7 +1173,7 @@ do_open_al(
        if( status != IB_SUCCESS )\r
        {\r
                free_al( &h_al->obj );\r
-               CL_EXIT( AL_DBG_MGR, g_al_dbg_lvl );\r
+               AL_EXIT(AL_DBG_MGR);\r
                return status;\r
        }\r
        attach_al_obj( &gp_al_mgr->obj, &h_al->obj );\r
@@ -1192,7 +1200,7 @@ do_open_al(
        /* Release the reference taken in init_al_obj. */\r
        deref_al_obj( &h_al->obj );\r
 \r
-       CL_EXIT( AL_DBG_MGR, g_al_dbg_lvl );\r
+       AL_EXIT(AL_DBG_MGR);\r
        return IB_SUCCESS;\r
 }\r
 \r
index d5eecf466192eb7223257ce75731be601bd15eb5..0af1c36d82b52beaa64e6522a3d217ccf931913e 100644 (file)
 #include "al.h"\r
 #include "ual_support.h"\r
 #include "al_debug.h"\r
+\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "ual_mr.tmh"\r
+#endif\r
+\r
 #include "al_mr.h"\r
 #include "al_pd.h"\r
 #include "al_res_mgr.h"\r
@@ -67,7 +75,7 @@ ual_reg_mem(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(mr_ioctl.out) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_REG_MR IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                return IB_ERROR;\r
@@ -106,7 +114,7 @@ ual_dereg_mr(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(mr_ioctl.out) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_DEREG_MR IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                return IB_ERROR;\r
@@ -152,7 +160,7 @@ ual_modify_mr(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(mr_ioctl.out) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_MODIFY_MR IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                return IB_ERROR;\r
@@ -190,7 +198,7 @@ ual_query_mr(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(mr_ioctl.out) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_QUERY_MR IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                return IB_ERROR;\r
@@ -235,7 +243,7 @@ ual_reg_shared(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(mr_ioctl.out) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("UAL_REG_SHARED IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                return IB_ERROR;\r
@@ -273,12 +281,12 @@ ib_reg_shmid(
 \r
        if( AL_OBJ_INVALID_HANDLE( h_pd, AL_OBJ_TYPE_H_PD ) )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PD_HANDLE\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("IB_INVALID_PD_HANDLE\n") );\r
                return IB_INVALID_PD_HANDLE;\r
        }\r
        if( !p_mr_create || !p_vaddr || !p_lkey || !p_rkey || !ph_mr )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -286,7 +294,7 @@ ib_reg_shmid(
        h_mr = alloc_mr();\r
        if( !h_mr )\r
        {\r
-               CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                                ("unable to allocate memory handle\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -307,7 +315,7 @@ ib_reg_shmid(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(mr_ioctl.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_REG_SHMID IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
index c180a7106aeed125403c19467ea6945c2ad2b408..65e9c93980866ec299c186b912202e5e1ff56e93 100644 (file)
 #include "al_mr.h"\r
 \r
 \r
+#include "al_debug.h"\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "ual_mw.tmh"\r
+#endif\r
+\r
 ib_api_status_t\r
 ual_create_mw(\r
        IN              const   ib_pd_handle_t                          h_pd,\r
@@ -77,7 +85,7 @@ ual_create_mw(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(mw_ioctl.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_CREATE_MW IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
@@ -141,7 +149,7 @@ ual_destroy_mw(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(mw_ioctl.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_DESTROY_MW IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
@@ -202,7 +210,7 @@ ual_query_mw(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(mw_ioctl.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_QUERY_MW IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
@@ -277,7 +285,7 @@ ual_bind_mw(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(mw_ioctl.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_BIND_MW IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
index a40c9749d7c81e1e3a3b1bf97d4298b53063a40f..3d47dbf48cc2c88859baff9fea5a62983b102f51 100644 (file)
 #include "al_pd.h"\r
 \r
 \r
+#include "al_debug.h"\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "ual_pd.tmh"\r
+#endif\r
+\r
 ib_api_status_t\r
 ual_allocate_pd(\r
        IN                              ib_ca_handle_t                          h_ca,\r
@@ -79,7 +87,7 @@ ual_allocate_pd(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(pd_ioctl.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_ALLOC_PD IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
@@ -138,7 +146,7 @@ ual_deallocate_pd(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(pd_ioctl.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_DEALLOC_PD IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
index a6cd6bb8f652af7a38707857cee39861347b6fe4..624c3e60f95330340da83edfd6c9fa10a87a9c92 100644 (file)
 \r
 #include "al.h"\r
 #include "al_debug.h"\r
+\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "ual_pnp.tmh"\r
+#endif\r
+\r
 #include "al_mgr.h"\r
 #include "al_pnp.h"\r
 #include "ib_common.h"\r
@@ -117,7 +125,7 @@ create_pnp(
        gp_pnp = (ual_pnp_mgr_t*)cl_zalloc( sizeof(ual_pnp_mgr_t) );\r
        if( !gp_pnp )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("Failed to allocate PnP manager.\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -130,7 +138,7 @@ create_pnp(
        if( status != IB_SUCCESS )\r
        {\r
                __pnp_free( &gp_pnp->obj );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("init_al_obj() failed with status %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -138,7 +146,7 @@ create_pnp(
        if( status != IB_SUCCESS )\r
        {\r
                gp_pnp->obj.pfn_destroy( &gp_pnp->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -148,7 +156,7 @@ create_pnp(
        if( gp_pnp->h_file == INVALID_HANDLE_VALUE )\r
        {\r
                gp_pnp->obj.pfn_destroy( &gp_pnp->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("ual_create_async_file for UAL_BIND_PNP returned %d.\n",\r
                        GetLastError()) );\r
                return IB_ERROR;\r
@@ -159,7 +167,7 @@ create_pnp(
        if( gp_pnp->h_destroy_file == INVALID_HANDLE_VALUE )\r
        {\r
                gp_pnp->obj.pfn_destroy( &gp_pnp->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("ual_create_async_file for UAL_BIND_DESTROY returned %d.\n",\r
                        GetLastError()) );\r
                return IB_ERROR;\r
@@ -266,12 +274,12 @@ ib_reg_pnp(
 \r
        if( AL_OBJ_INVALID_HANDLE( h_al, AL_OBJ_TYPE_H_AL ) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_AL_HANDLE\n") );\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR, ("IB_INVALID_AL_HANDLE\n") );\r
                return IB_INVALID_AL_HANDLE;\r
        }\r
        if( !p_pnp_req || !ph_pnp )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
@@ -279,8 +287,8 @@ ib_reg_pnp(
        p_reg = (al_pnp_t*)cl_zalloc( sizeof(al_pnp_t) );\r
        if( !p_reg )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
-                       ("Failed to cl_zalloc al_pnp_t (%"PRIdSIZE_T" bytes).\n",\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
+                       ("Failed to cl_zalloc al_pnp_t (%I64d bytes).\n",\r
                        sizeof(al_pnp_t)) );\r
                return( IB_INSUFFICIENT_MEMORY );\r
        }\r
@@ -294,7 +302,7 @@ ib_reg_pnp(
        if( status != IB_SUCCESS )\r
        {\r
                __pnp_reg_free( &p_reg->obj );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("init_al_obj() failed with status %s.\n", ib_get_err_str(status)) );\r
                return( status );\r
        }\r
@@ -302,7 +310,7 @@ ib_reg_pnp(
        if( status != IB_SUCCESS )\r
        {\r
                p_reg->obj.pfn_destroy( &p_reg->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -323,7 +331,7 @@ ib_reg_pnp(
                if( !in.sync_event )\r
                {\r
                        p_reg->obj.pfn_destroy( &p_reg->obj, NULL );\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                                ("CreateEvent returned %d\n", GetLastError()) );\r
                        return IB_ERROR;\r
                }\r
@@ -371,7 +379,7 @@ ib_dereg_pnp(
 \r
        if( AL_OBJ_INVALID_HANDLE( h_pnp, AL_OBJ_TYPE_H_PNP ) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
 \r
@@ -392,12 +400,12 @@ ib_reject_ioc(
 \r
        if( AL_OBJ_INVALID_HANDLE( h_al, AL_OBJ_TYPE_H_AL ) )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_AL_HANDLE\n") );\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR, ("IB_INVALID_AL_HANDLE\n") );\r
                return IB_INVALID_AL_HANDLE;\r
        }\r
        if( !h_event )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );\r
                return IB_INVALID_HANDLE;\r
        }\r
 \r
@@ -548,7 +556,7 @@ pnp_cb(
                        return;\r
                }\r
 \r
-               AL_TRACE( AL_DBG_ERROR, ("IOCTL failed with error code %d\n",\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("IOCTL failed with error code %d\n",\r
                        error_code) );\r
                p_reg->rearm.evt_hdl = AL_INVALID_HANDLE;\r
                p_reg->rearm.evt_size = 0;\r
index 6194671f6626db61e3eb8792b50217dd8362ccf8..c8a409f26f1c3e9232a75644f82ea37ac4785a5b 100644 (file)
 #include "ual_support.h"\r
 \r
 \r
+#include "al_debug.h"\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "ual_qp.tmh"\r
+#endif\r
 ib_api_status_t\r
 ual_post_send(\r
        IN              const   ib_qp_handle_t                          h_qp,\r
@@ -93,7 +100,7 @@ ual_post_send(
        p_qp_ioctl = (ual_post_send_ioctl_t*)cl_zalloc( ioctl_buf_sz );\r
        if( !p_qp_ioctl )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("Failed to allocate IOCTL buffer.\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -121,7 +128,7 @@ ual_post_send(
        {\r
                if( pp_send_failure )\r
                        *pp_send_failure = p_send_wr;\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_POST_SEND IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
@@ -200,7 +207,7 @@ ual_post_recv(
        p_qp_ioctl = (ual_post_recv_ioctl_t*)cl_zalloc( ioctl_buf_sz );\r
        if( !p_qp_ioctl )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("Failed to allocate IOCTL buffer.\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
@@ -229,7 +236,7 @@ ual_post_recv(
                if( pp_recv_failure )\r
                        *pp_recv_failure = p_recv_wr;\r
 \r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_POST_RECV IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
@@ -314,7 +321,7 @@ ual_create_qp(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(qp_ioctl.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_CREATE_QP IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
@@ -403,7 +410,7 @@ ual_destroy_qp(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(qp_ioctl.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_DESTROY_QP IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
@@ -461,7 +468,7 @@ ual_modify_qp(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(qp_ioctl.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_MODIFY_QP IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
@@ -527,7 +534,7 @@ ual_query_qp(
 \r
        if( cl_status != CL_SUCCESS || bytes_ret != sizeof(qp_ioctl.out) )\r
        {\r
-               AL_TRACE( AL_DBG_ERROR,\r
+               AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,\r
                        ("UAL_QUERY_QP IOCTL returned %s.\n",\r
                        CL_STATUS_MSG(cl_status)) );\r
                status = IB_ERROR;\r
@@ -609,7 +616,7 @@ ual_init_qp_alias(
 \r
                if( cl_status != CL_SUCCESS || bytes_ret != sizeof(qp_ioctl.out) )\r
                {\r
-                       AL_TRACE_EXIT( AL_DBG_ERROR,\r
+                       AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                                ("UAL_GET_SPL_QP_ALIAS IOCTL returned %s.\n",\r
                                CL_STATUS_MSG(cl_status)) );\r
                        return IB_ERROR;\r
index 1450d66cd532715f0c7aaf6d36e0f9416bff2825..f1dba3b6a5728888f54a85fe96de12e65c164c43 100644 (file)
 #include "al_ca.h"\r
 #include "al_common.h"\r
 #include "al_debug.h"\r
+\r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "ual_sa_req.tmh"\r
+#endif\r
+\r
 #include "al_mgr.h"\r
 #include "al_query.h"\r
 #include "ib_common.h"\r
@@ -97,7 +105,7 @@ create_sa_req_mgr(
        gp_sa_req_mgr = cl_zalloc( sizeof( sa_req_mgr_t ) );\r
        if( gp_sa_req_mgr == NULL )\r
        {\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("cl_zalloc failed\n") );\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR, ("cl_zalloc failed\n") );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
 \r
@@ -111,14 +119,14 @@ create_sa_req_mgr(
        if( status != IB_SUCCESS )\r
        {\r
                free_sa_req_mgr( &gp_sa_req_mgr->obj );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR, ("cl_spinlock_init failed\n") );\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR, ("cl_spinlock_init failed\n") );\r
                return status;\r
        }\r
        status = attach_al_obj( p_parent_obj, &gp_sa_req_mgr->obj );\r
        if( status != IB_SUCCESS )\r
        {\r
                gp_sa_req_mgr->obj.pfn_destroy( &gp_sa_req_mgr->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("attach_al_obj returned %s.\n", ib_get_err_str(status)) );\r
                return status;\r
        }\r
@@ -128,7 +136,7 @@ create_sa_req_mgr(
        if( gp_sa_req_mgr->h_sa_dev == INVALID_HANDLE_VALUE )\r
        {\r
                gp_sa_req_mgr->obj.pfn_destroy( &gp_sa_req_mgr->obj, NULL );\r
-               AL_TRACE_EXIT( AL_DBG_ERROR,\r
+               AL_PRINT_EXIT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR,\r
                        ("ual_create_async_file returned %d.\n", GetLastError()) );\r
                return IB_ERROR;\r
        }\r
@@ -205,7 +213,7 @@ al_send_sa_req(
                if( GetLastError() != ERROR_IO_PENDING )\r
                {\r
                        status = p_sa_req->status;\r
-                       AL_TRACE( AL_DBG_ERROR, ("UAL_SEND_SA_REQ IOCTL returned %s\n",\r
+                       AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("UAL_SEND_SA_REQ IOCTL returned %s\n",\r
                                ib_get_err_str(status)) );\r
                }\r
                else\r
index 40154d7c908c807cc73f8f5a6e5dee8931822e2b..9dcd784be1c7aad11a310902182500e0c9166241 100644 (file)
@@ -44,6 +44,9 @@
 #include <iba/ib_al_ioctl.h>\r
 #include "al_dev.h"\r
 #include "al_debug.h"\r
+\r
+\r
+\r
 #include <strsafe.h>\r
 \r
 \r
@@ -116,11 +119,11 @@ al_uvp_lib_err(
                MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),\r
                (LPSTR)&error, 0, NULL ) )\r
        {\r
-               AL_TRACE( dbg_lvl, ("%s (%d)\n", buffer, GetLastError()) );\r
+               //AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR, ("%s (%d)\n", buffer, GetLastError()) );\r
        }\r
        else\r
        {\r
-               AL_TRACE( dbg_lvl, ("%s (%s)\n", buffer, error) );\r
+               //AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR, ("%s (%s)\n", buffer, error) );\r
                LocalFree( error );\r
        }\r
 }\r
index 4bdc58da962d7ca11cff8444fb32a023dd5171a6..f8ca870f87a8eef0b64b88659276d0ce8930c571 100644 (file)
@@ -2,6 +2,14 @@ TARGETNAME=ibbus
 TARGETPATH=..\..\..\bin\kernel\obj$(BUILD_ALT_DIR)\r
 TARGETTYPE=DRIVER\r
 \r
+\r
+!if $(FREEBUILD)\r
+ENABLE_EVENT_TRACING=1\r
+!else\r
+#ENABLE_EVENT_TRACING=1\r
+!endif\r
+\r
+\r
 SOURCES= ibbus.rc              \\r
        bus_driver.c            \\r
        bus_pnp.c                       \\r
@@ -24,4 +32,13 @@ TARGETLIBS= \
 TARGETLIBS= $(TARGETLIBS) $(DDK_LIB_PATH)\ntstrsafe.lib\r
 !endif\r
 \r
+!IFDEF ENABLE_EVENT_TRACING\r
+\r
+C_DEFINES = $(C_DEFINES) -DEVENT_TRACING\r
+\r
+RUN_WPP = $(SOURCES) -km -ext: .c .h .C .H \r
+\r
+!ENDIF\r
+\r
+\r
 MSC_WARNING_LEVEL= /W4\r
index 1416c16a21aecad47cba37bc6bc5a48ca187ed71..80d97eccdf68602d5981b25cda944142a7223ead 100644 (file)
 #include <complib/cl_init.h>\r
 \r
 \r
+#if defined(EVENT_TRACING)\r
+#ifdef offsetof\r
+#undef offsetof\r
+#endif\r
+#include "bus_driver.tmh"\r
+#endif\r
+\r
+\r
 #define DEFAULT_NODE_DESC      "OpenIB Windows® Host"\r
 \r
 \r
@@ -129,7 +137,7 @@ __read_machine_name( void )
        UNICODE_STRING                          hostNameW;\r
        ANSI_STRING                                     hostName;\r
 \r
-       AL_ENTER( AL_DBG_DEV );\r
+       BUS_ENTER( BUS_DBG_DRV );\r
 \r
        /* Get the host name. */\r
        RtlInitUnicodeString( &hostNamePath, L"ComputerName\\ComputerName" );\r
@@ -164,13 +172,13 @@ __read_machine_name( void )
        }\r
        else\r
        {\r
-               AL_TRACE( AL_DBG_ERROR, ("Failed to get host name.\n") );\r
+               BUS_TRACE(BUS_DBG_ERROR , ("Failed to get host name.\n") );\r
                /* Use the default name... */\r
                RtlStringCbCopyNA( node_desc, sizeof(node_desc),\r
                        DEFAULT_NODE_DESC, sizeof(DEFAULT_NODE_DESC) );\r
        }\r
 \r
-       AL_EXIT( AL_DBG_DEV );\r
+       BUS_ENTER( BUS_DBG_DRV );\r
 }\r
 \r
 \r
@@ -180,7 +188,7 @@ __read_registry(
 {\r
        NTSTATUS                                        status;\r
        /* Remember the terminating entry in the table below. */\r
-       RTL_QUERY_REGISTRY_TABLE        table[8];\r
+       RTL_QUERY_REGISTRY_TABLE        table[9];\r
        UNICODE_STRING                          param_path;\r
 \r
        BUS_ENTER( BUS_DBG_DRV );\r
@@ -223,40 +231,48 @@ __read_registry(
        table[1].DefaultLength = sizeof(ULONG);\r
 \r
        table[2].Flags = RTL_QUERY_REGISTRY_DIRECT;\r
-       table[2].Name = L"IbalDebugFlags";\r
-       table[2].EntryContext = &g_al_dbg_lvl;\r
+       table[2].Name = L"IbalDebugLevel";\r
+       table[2].EntryContext = &g_al_dbg_level;\r
        table[2].DefaultType = REG_DWORD;\r
-       table[2].DefaultData = &g_al_dbg_lvl;\r
+       table[2].DefaultData = &g_al_dbg_level;\r
        table[2].DefaultLength = sizeof(ULONG);\r
 \r
        table[3].Flags = RTL_QUERY_REGISTRY_DIRECT;\r
-       table[3].Name = L"SmiPollInterval";\r
-       table[3].EntryContext = &g_smi_poll_interval;\r
+       table[3].Name = L"IbalDebugFlags";\r
+       table[3].EntryContext = &g_al_dbg_flags;\r
        table[3].DefaultType = REG_DWORD;\r
-       table[3].DefaultData = &g_smi_poll_interval;\r
+       table[3].DefaultData = &g_al_dbg_flags;\r
        table[3].DefaultLength = sizeof(ULONG);\r
+       \r
 \r
        table[4].Flags = RTL_QUERY_REGISTRY_DIRECT;\r
-       table[4].Name = L"IocQueryTimeout";\r
-       table[4].EntryContext = &g_ioc_query_timeout;\r
+       table[4].Name = L"SmiPollInterval";\r
+       table[4].EntryContext = &g_smi_poll_interval;\r
        table[4].DefaultType = REG_DWORD;\r
-       table[4].DefaultData = &g_ioc_query_timeout;\r
+       table[4].DefaultData = &g_smi_poll_interval;\r
        table[4].DefaultLength = sizeof(ULONG);\r
 \r
        table[5].Flags = RTL_QUERY_REGISTRY_DIRECT;\r
-       table[5].Name = L"IocQueryRetries";\r
-       table[5].EntryContext = &g_ioc_query_retries;\r
+       table[5].Name = L"IocQueryTimeout";\r
+       table[5].EntryContext = &g_ioc_query_timeout;\r
        table[5].DefaultType = REG_DWORD;\r
-       table[5].DefaultData = &g_ioc_query_retries;\r
+       table[5].DefaultData = &g_ioc_query_timeout;\r
        table[5].DefaultLength = sizeof(ULONG);\r
 \r
        table[6].Flags = RTL_QUERY_REGISTRY_DIRECT;\r
-       table[6].Name = L"IocPollInterval";\r
-       table[6].EntryContext = &g_ioc_poll_interval;\r
+       table[6].Name = L"IocQueryRetries";\r
+       table[6].EntryContext = &g_ioc_query_retries;\r
        table[6].DefaultType = REG_DWORD;\r
-       table[6].DefaultData = &g_ioc_poll_interval;\r
+       table[6].DefaultData = &g_ioc_query_retries;\r
        table[6].DefaultLength = sizeof(ULONG);\r
 \r
+       table[7].Flags = RTL_QUERY_REGISTRY_DIRECT;\r
+       table[7].Name = L"IocPollInterval";\r
+       table[7].EntryContext = &g_ioc_poll_interval;\r
+       table[7].DefaultType = REG_DWORD;\r
+       table[7].DefaultData = &g_ioc_poll_interval;\r
+       table[7].DefaultLength = sizeof(ULONG);\r
+\r
        /* Have at it! */\r
        status = RtlQueryRegistryValues( RTL_REGISTRY_ABSOLUTE, \r
                param_path.Buffer, table, NULL, NULL );\r
@@ -431,7 +447,12 @@ bus_drv_unload(
 \r
        CL_DEINIT;\r
 \r
+#if defined(EVENT_TRACING)\r
+       WPP_CLEANUP(p_driver_obj);\r
+#endif\r
+\r
        BUS_EXIT( BUS_DBG_DRV );\r
+       \r
 }\r
 \r
 \r
@@ -444,6 +465,10 @@ DriverEntry(
 \r
        BUS_ENTER( BUS_DBG_DRV );\r
 \r
+#if defined(EVENT_TRACING)\r
+       WPP_INIT_TRACING(p_driver_obj ,p_registry_path);\r
+#endif\r
+\r
        status = CL_INIT;\r
        if( !NT_SUCCESS(status) )\r
        {\r
index 6a16bfb1fa362880cddd636e10cd4533d1e2ff2f..b3369cf9d9ec9099e33170ba79837ecbcb7402b2 100644 (file)
@@ -164,6 +164,7 @@ AddReg          = Iou.ParamsReg
 [Ibbus.ParamsReg]\r
 HKR,"Parameters","DebugFlags",%REG_DWORD%,0x80000000\r
 HKR,"Parameters","ReportPortNIC",%REG_DWORD%,1\r
+HKR,"Parameters","IbalDebugLevel",%REG_DWORD%,0x80000000\r
 HKR,"Parameters","IbalDebugFlags",%REG_DWORD%,0x80000000\r
 HKR,"Parameters","SmiPollInterval",%REG_DWORD_NO_CLOBBER%,20000\r
 HKR,"Parameters","IocQueryTimeout",%REG_DWORD_NO_CLOBBER%,250\r
index a314aa4d733d432b0d0da84b2808867ff16a7f19..324587ae3b611ab9f6d16483321cbfc51829c590 100644 (file)
@@ -1696,7 +1696,7 @@ ib_get_port_state_from_str(
                return(1);\r
        else if( !strncmp(p_port_state_str, "INIT", 4) )\r
                return(2);\r
-       else if( !strncmp(p_port_state_str,"ARMED" , 5) )\r
+       else if( !strncmp(p_port_state_str,"ARMED", 5) )\r
                return(3);\r
        else if( !strncmp(p_port_state_str, "ACTIVE", 6) )\r
                return(4);\r