[IBAL] Change all use of %p to %016I64x to support WPP. Turn on WPP in free builds...

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

diff --git a/trunk/core/al/al_common.c b/trunk/core/al/al_common.c
index 6021574563cf87a551df8588c15a49c575abdb21..5300bf46b29023e7a1d9d4b9985175c3256b104c 100644 (file)
--- a/trunk/core/al/al_common.c
+++ b/trunk/core/al/al_common.c
@@ -175,7 +175,8 @@ init_al_obj(
        AL_ENTER( AL_DBG_AL_OBJ );\r
        CL_ASSERT( p_obj && pfn_free );\r
        CL_ASSERT( p_obj->state == CL_UNINITIALIZED );\r
-       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_AL_OBJ, ("%p\n", p_obj ) );\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_AL_OBJ,\r
+               ("%016I64x\n", (LONG_PTR)p_obj ) );\r
 \r
        /* Initialize the object. */\r
        p_obj->async_item.pfn_callback = async_destroy_cb;\r
@@ -273,9 +274,9 @@ attach_al_obj(
        CL_ASSERT( p_child_obj->state == CL_INITIALIZED );\r
 \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
+               ("%016I64x(%s) to %016I64x(%s)\n",\r
+               (LONG_PTR)p_child_obj, ib_get_obj_type( p_child_obj ),\r
+               (LONG_PTR)p_parent_obj, ib_get_obj_type( p_parent_obj ) ) );\r
 \r
        /* Insert the object into the parent's object tracking list. */\r
        p_child_obj->p_ci_ca = p_parent_obj->p_ci_ca;\r
@@ -342,9 +343,9 @@ detach_al_obj(
                p_parent_obj->state == CL_DESTROYING );\r
 \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
+               ("%016I64x(%s) from %016I64x(%s)\n",\r
+               (LONG_PTR)p_obj, ib_get_obj_type( p_obj ),\r
+               (LONG_PTR)p_parent_obj, ib_get_obj_type( p_parent_obj ) ) );\r
 \r
        /* Remove the object from the parent's list. */\r
        cl_spinlock_acquire( &p_parent_obj->lock );\r
@@ -368,7 +369,7 @@ ref_al_obj(
 \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
+               ("%016I64x(%s)\n", (LONG_PTR)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
@@ -396,7 +397,7 @@ deref_al_obj(
        CL_ASSERT( p_obj->ref_cnt );\r
 \r
        AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_AL_OBJ,\r
-               ("%p(%s)\n", p_obj, ib_get_obj_type( p_obj ) ) );\r
+               ("%016I64x(%s)\n", (LONG_PTR)p_obj, ib_get_obj_type( p_obj ) ) );\r
 \r
        ref_cnt = cl_atomic_dec( &p_obj->ref_cnt );\r
 \r
@@ -564,7 +565,7 @@ destroy_obj(
                p_obj->state == CL_DESTROYING );\r
 \r
        AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_AL_OBJ,\r
-               ("%p(%s)\n", p_obj, ib_get_obj_type( p_obj ) ) );\r
+               ("%016I64x(%s)\n", (LONG_PTR)p_obj, ib_get_obj_type( p_obj ) ) );\r
 \r
        /*\r
         * Lock to synchronize with asynchronous event processing.\r
@@ -606,7 +607,7 @@ destroy_obj(
                p_child_obj = PARENT_STRUCT( p_list_item, al_obj_t, pool_item );\r
                CL_ASSERT( p_child_obj->pfn_destroy );\r
                AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_AL_OBJ,\r
-                       ("bye bye: %p(%s)\n", p_child_obj,\r
+                       ("bye bye: %016I64x(%s)\n", (LONG_PTR)p_child_obj,\r
                        ib_get_obj_type( p_child_obj ) ) );\r
                ref_al_obj( p_child_obj );\r
                p_child_obj->pfn_destroy( p_child_obj, NULL );\r
@@ -647,7 +648,7 @@ async_destroy_cb(
        CL_ASSERT( !p_obj->ref_cnt );\r
 \r
        AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_AL_OBJ,\r
-               ("%p\n", p_obj ) );\r
+               ("%016I64x\n", (LONG_PTR)p_obj ) );\r
 \r
        /* Cleanup any hardware related resources. */\r
        if( p_obj->pfn_cleanup )\r

diff --git a/trunk/core/al/al_mad.c b/trunk/core/al/al_mad.c
index 00066a56ff721e51547a5475f774a9ade584d833..f06f091297c5b75f58e138712cc62aed5aa3a48e 100644 (file)
--- a/trunk/core/al/al_mad.c
+++ b/trunk/core/al/al_mad.c
@@ -678,13 +678,13 @@ __mad_disp_reg_unsol(
                        cl_ptr_vector_set( p_method_ptr_vector, i, h_mad_reg );\r
 \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
+                               ("Register version:%u (%u) class:0x%02X(%u) method:0x%02X Hdl:%016I64x\n",\r
                                p_mad_svc->mgmt_version,\r
                                __mgmt_version_index( p_mad_svc->mgmt_version ),\r
                                p_mad_svc->mgmt_class,\r
                                __mgmt_class_index( p_mad_svc->mgmt_class ),\r
                                i,\r
-                               h_mad_reg) );\r
+                               (LONG_PTR)h_mad_reg) );\r
                }\r
        }\r
 \r
@@ -838,7 +838,8 @@ mad_disp_send_done(
 \r
        AL_ENTER( AL_DBG_MAD_SVC );\r
 \r
-       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MAD_SVC, ("p_mad_wr 0x%p\n", p_mad_wr ) );\r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_MAD_SVC,\r
+               ("p_mad_wr 0x%016I64x\n", (LONG_PTR)p_mad_wr ) );\r
 \r
        /* Get the MAD header. */\r
        p_mad_hdr = get_mad_hdr_from_wr( p_mad_wr );\r

diff --git a/trunk/core/al/al_mgr_shared.c b/trunk/core/al/al_mgr_shared.c
index 4830707560f1a9a859ddaf57cd816cb615bc58e7..b9c8d23b9c83c60c55c3c75c3691b4ba2ff05b2b 100644 (file)
--- a/trunk/core/al/al_mgr_shared.c
+++ b/trunk/core/al/al_mgr_shared.c
@@ -62,9 +62,9 @@ print_al_obj(
        UNUSED_PARAM( p_obj );\r
 \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
+               ("AL object %016I64x(%s), parent: %016I64x ref_cnt: %d\n",\r
+               (LONG_PTR)p_obj, ib_get_obj_type( p_obj ),\r
+               (LONG_PTR)p_obj->p_parent_obj, p_obj->ref_cnt) );\r
 }\r
 \r
 \r

diff --git a/trunk/core/al/kernel/SOURCES b/trunk/core/al/kernel/SOURCES
index 6799a922204baf53042a5048b23e5b60880e6fa5..1ca593f1cc8882c6b62adaba89f72b30193ac597 100644 (file)
--- a/trunk/core/al/kernel/SOURCES
+++ b/trunk/core/al/kernel/SOURCES
@@ -5,7 +5,7 @@ TARGETTYPE=DRIVER_LIBRARY
 \r
 \r
 !if $(FREEBUILD)\r
-#ENABLE_EVENT_TRACING=1\r
+ENABLE_EVENT_TRACING=1\r
 !else\r
 #ENABLE_EVENT_TRACING=1\r
 !endif\r

diff --git a/trunk/core/al/kernel/al_cm.c b/trunk/core/al/kernel/al_cm.c
index ea77deded98aebc06594fc9a73ff23e2df95c3b2..45c83e937047e65136268b44ccfa8e703d40cb66 100644 (file)
--- a/trunk/core/al/kernel/al_cm.c
+++ b/trunk/core/al/kernel/al_cm.c
@@ -706,7 +706,7 @@ __deref_conn(
                {\r
                        /* We shouldn't have a QP at this point. */\r
                        AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
-                               ("QP (%p) still referenced by connection object\n", h_qp) );\r
+                               ("QP (%016I64x) still referenced by connection object\n", (LONG_PTR)h_qp) );\r
                        cm_reset_qp( h_qp, 0 );\r
                        deref_al_obj( &h_qp->obj );\r
                }\r

diff --git a/trunk/core/al/kernel/al_dev.c b/trunk/core/al/kernel/al_dev.c
index ca04be53ce150d13a361cb9d2cb2750a2c1d6f1b..cedf274a324fe88138c97fef1d129809e81f6158 100644 (file)
--- a/trunk/core/al/kernel/al_dev.c
+++ b/trunk/core/al/kernel/al_dev.c
@@ -442,8 +442,8 @@ al_dev_ioctl(
        p_open_context = p_io_stack->FileObject->FsContext;\r
 \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
+               ("al_dev_ioctl: buf_size (%d) p_buf (%016I64x).\n",\r
+               cl_ioctl_in_size( h_ioctl ), (LONG_PTR)cl_ioctl_in_buf( h_ioctl )) );\r
 \r
        /* Process the ioctl command. */\r
        if( IS_AL_PROXY_IOCTL(cl_ioctl_ctl_code( h_ioctl )) )\r

diff --git a/trunk/core/al/kernel/al_mad_pool.c b/trunk/core/al/kernel/al_mad_pool.c
index ca0a0b250bb06e43b4dce82b40193a2d916ad657..57d38b2799518474bba24e524cfd62037f347406 100644 (file)
--- a/trunk/core/al/kernel/al_mad_pool.c
+++ b/trunk/core/al/kernel/al_mad_pool.c
@@ -270,7 +270,7 @@ ib_destroy_mad_pool(
        if( busy )\r
        {\r
                AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
-                       ("h_pool (0x%p) is busy!.\n", h_pool) );\r
+                       ("h_pool (0x%016I64x) is busy!.\n", (LONG64)h_pool) );\r
                return IB_RESOURCE_BUSY;\r
        }\r
 \r

diff --git a/trunk/core/al/kernel/al_proxy.c b/trunk/core/al/kernel/al_proxy.c
index c8044e1f2cc465fe41b40f1404cea447e6d8ad6e..d6ef240e306bd074056e38290b72057b9edabfd8 100644 (file)
--- a/trunk/core/al/kernel/al_proxy.c
+++ b/trunk/core/al/kernel/al_proxy.c
@@ -307,8 +307,8 @@ proxy_get_cm_cb(
        if( (uintn_t)p_io_stack->FileObject->FsContext2 != AL_OBJ_TYPE_CM )\r
        {\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
+                       ("Invalid file object type for request: %016I64x\n",\r
+                       (LONG_PTR)p_io_stack->FileObject->FsContext2) );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -349,8 +349,8 @@ proxy_get_comp_cb(
        if( (uintn_t)p_io_stack->FileObject->FsContext2 != AL_OBJ_TYPE_H_CQ )\r
        {\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
+                       ("Invalid file object type for request: %016I64x\n",\r
+                       (LONG_PTR)p_io_stack->FileObject->FsContext2) );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -391,8 +391,8 @@ proxy_get_misc_cb(
        if( (uintn_t)p_io_stack->FileObject->FsContext2 != AL_OBJ_TYPE_AL_MGR )\r
        {\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
+                       ("Invalid file object type for request: %016I64x\n",\r
+                       (LONG_PTR)p_io_stack->FileObject->FsContext2) );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -976,8 +976,8 @@ proxy_reg_pnp(
        if( (uintn_t)p_io_stack->FileObject->FsContext2 != AL_OBJ_TYPE_PNP_MGR )\r
        {\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
+                       ("Invalid file object type for request: %016I64x\n",\r
+                       (LONG_PTR)p_io_stack->FileObject->FsContext2) );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1120,8 +1120,8 @@ proxy_rearm_pnp(
        if( (uintn_t)p_io_stack->FileObject->FsContext2 != AL_OBJ_TYPE_PNP_MGR )\r
        {\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
+                       ("Invalid file object type for request: %016I64x\n",\r
+                       (LONG_PTR)p_io_stack->FileObject->FsContext2) );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r
@@ -1202,8 +1202,8 @@ proxy_dereg_pnp(
        if( (uintn_t)p_io_stack->FileObject->FsContext2 != AL_OBJ_TYPE_PNP_MGR )\r
        {\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
+                       ("Invalid file object type for request: %016I64x\n",\r
+                       (LONG_PTR)p_io_stack->FileObject->FsContext2) );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r

diff --git a/trunk/core/al/kernel/al_proxy_cep.c b/trunk/core/al/kernel/al_proxy_cep.c
index 4e688f31d0f53b21ddeb6654f7f84328cc20924e..6b1ccdd0a74261de7a934d325a827b9d5f77baa5 100644 (file)
--- a/trunk/core/al/kernel/al_proxy_cep.c
+++ b/trunk/core/al/kernel/al_proxy_cep.c
@@ -831,8 +831,8 @@ proxy_cep_get_event(
        if( (uintn_t)p_io_stack->FileObject->FsContext2 != AL_OBJ_TYPE_CM )\r
        {\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
+                       ("Invalid file object type for request: %016I64x\n",\r
+                       (LONG_PTR)p_io_stack->FileObject->FsContext2) );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r

diff --git a/trunk/core/al/kernel/al_proxy_subnet.c b/trunk/core/al/kernel/al_proxy_subnet.c
index fed0e0670573887a04ddbdd447342667bc681271..e220d4a00356b8c9ba15bddb59ca7b85497e7a25 100644 (file)
--- a/trunk/core/al/kernel/al_proxy_subnet.c
+++ b/trunk/core/al/kernel/al_proxy_subnet.c
@@ -229,8 +229,8 @@ proxy_send_sa_req(
                (uintn_t)p_io_stack->FileObject->FsContext2 != AL_OBJ_TYPE_SA_REQ_SVC )\r
        {\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
+                       ("Invalid file object type for request: %016I64x\n",\r
+                       (LONG_PTR)p_io_stack->FileObject->FsContext2) );\r
                return CL_INVALID_PARAMETER;\r
        }\r
 \r

diff --git a/trunk/core/al/kernel/al_proxy_verbs.c b/trunk/core/al/kernel/al_proxy_verbs.c
index 5639c43ab09744715211d5f0529ab568c36dea68..2a5e0cd33a4df7b34ac09330b11c1df7d42fb96d 100644 (file)
--- a/trunk/core/al/kernel/al_proxy_verbs.c
+++ b/trunk/core/al/kernel/al_proxy_verbs.c
@@ -511,8 +511,8 @@ proxy_query_ca(
                __except(EXCEPTION_EXECUTE_HANDLER)\r
                {\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
+                               ("Failed to copy CA attributes to user buffer %016I64x\n",\r
+                               (LONG64)p_ioctl->in.p_ca_attr) );\r
                        status = IB_INVALID_PERMISSION;\r
                }\r
        }\r

diff --git a/trunk/core/al/kernel/al_smi.c b/trunk/core/al/kernel/al_smi.c
index ff0fbf52870036a8cee3015a376153fc2c531572..6004e706312b9f996005ea35b0747c0e381718ca 100644 (file)
--- a/trunk/core/al/kernel/al_smi.c
+++ b/trunk/core/al/kernel/al_smi.c
@@ -2737,7 +2737,8 @@ spl_qp_svc_post_recvs(
                if( status != IB_SUCCESS )\r
                {\r
                        AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
-                               ("Failed to post receive %p\n", p_al_element) );\r
+                               ("Failed to post receive %016I64x\n",\r
+                               (LONG_PTR)p_al_element) );\r
                        cl_qlist_remove_item( &p_spl_qp_svc->recv_queue,\r
                                &p_al_element->list_item );\r
 \r

diff --git a/trunk/inc/complib/cl_ioctl.h b/trunk/inc/complib/cl_ioctl.h
index 82b1a25847772c7ba0dc7d849e04d0ce0548aebe..93998a488b928f12f4b30d1288584154ba8fa245 100644 (file)
--- a/trunk/inc/complib/cl_ioctl.h
+++ b/trunk/inc/complib/cl_ioctl.h
@@ -414,7 +414,7 @@ cl_ioctl_in_buf(
 *\r
 * SYNOPSIS\r
 */\r
-CL_EXPORT size_t CL_API\r
+CL_EXPORT ULONG CL_API\r
 cl_ioctl_in_size(\r
        IN      cl_ioctl_handle_t       h_ioctl );\r
 /*\r
@@ -477,7 +477,7 @@ cl_ioctl_out_buf(
 *\r
 * SYNOPSIS\r
 */\r
-CL_EXPORT size_t CL_API\r
+CL_EXPORT ULONG CL_API\r
 cl_ioctl_out_size(\r
        IN      cl_ioctl_handle_t       h_ioctl );\r
 /*\r

diff --git a/trunk/inc/kernel/complib/cl_ioctl_osd.h b/trunk/inc/kernel/complib/cl_ioctl_osd.h
index 0e6f100b5e1cc8426ceedcba4a37193207a67d0f..450f3ef9766d83cbe2e7fcbcb2036c8efcff5440 100644 (file)
--- a/trunk/inc/kernel/complib/cl_ioctl_osd.h
+++ b/trunk/inc/kernel/complib/cl_ioctl_osd.h
@@ -128,7 +128,7 @@ cl_ioctl_in_buf(
 }\r
 \r
 \r
-CL_INLINE size_t\r
+CL_INLINE ULONG\r
 cl_ioctl_in_size(\r
        IN      cl_ioctl_handle_t       h_ioctl )\r
 {\r
@@ -172,7 +172,7 @@ cl_ioctl_out_buf(
 }\r
 \r
 \r
-CL_INLINE size_t\r
+CL_INLINE ULONG\r
 cl_ioctl_out_size(\r
        IN      cl_ioctl_handle_t       h_ioctl )\r
 {\r