[ofw] [PATCH] Cleanup XXX_PTR64 macros from tests
Fab Tillier
ftillier at windows.microsoft.com
Mon Jun 30 14:43:56 PDT 2008
>>>> Tried to apply the patch and get conflict in cmtest.c
>>>
>>> Looks like changes in line endings...
>> It also appears that I screwed up generating the patch... Ignore this
>> last one, I'll resend (yet again)...
>>
>> I'll eventually get the hang of it...
>
> Ok, so I'm having a hard time with diff/patch and SVN... Actually, I
> think it's just SVN.
>
> I've updated to the latest version of patch from the gnuwin32
> sourceforge project, version 2.5.9.2670.
>
> I cannot apply patches generated by SVN if my changes touch a file
> with non-Windows line endings. I tried 'svn diff' as well as 'svn
> diff -x - -ignore-eol-style'. So rather than manually changing the
> line endings of the diff file, I will change culprit files to
> consistent, Windows line ending, check that in, and then resend my patches...
I gave up on using SVN, as patch couldn't apply the diffs generated by SVN. I have little faith in the SVN-generated diffs.
I switched to using Sean's documented instructions for how to use the diff utility.
You have to apply thus:
patch -p 1 < tests.patch
Signed-off-by: Fab Tillier <ftillier at microsoft.com>
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\tests\alts\allocdeallocpd.c trunk\tests\alts\allocdeallocpd.c
--- old\tests\alts\allocdeallocpd.c Mon Jun 30 14:22:39 2008
+++ trunk\tests\alts\allocdeallocpd.c Mon Jun 30 14:19:01 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -51,9 +52,9 @@ ib_api_status_t
al_test_alloc_dealloc_pd(void)
{
ib_api_status_t ib_status = IB_SUCCESS;
- ib_al_handle_t VOID_PTR64 h_al = NULL;
- ib_ca_handle_t VOID_PTR64 h_ca;
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_al_handle_t h_al = NULL;
+ ib_ca_handle_t h_ca;
+ ib_pd_handle_t h_pd;
ALTS_ENTER( ALTS_DBG_VERBOSE );
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\tests\alts\alts_common.h trunk\tests\alts\alts_common.h
--- old\tests\alts\alts_common.h Mon Jun 30 14:22:39 2008
+++ trunk\tests\alts\alts_common.h Mon Jun 30 14:19:01 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -42,7 +43,7 @@
typedef struct _mem_region
{
void *buffer;
- TO_LONG_PTR(struct _ib_mr* ,mr_h) ;
+ struct _ib_mr* mr_h;
uint32_t lkey;
uint32_t rkey;
@@ -245,19 +246,19 @@ al_test_register_shared_mem( void );
*/
ib_api_status_t
-alts_open_al( ib_al_handle_t FUNC_PTR64 *ph_al );
+alts_open_al( ib_al_handle_t *ph_al );
ib_api_status_t
-alts_close_al( ib_al_handle_t FUNC_PTR64 ph_al );
+alts_close_al( ib_al_handle_t ph_al );
ib_api_status_t
alts_open_ca(
- IN ib_al_handle_t FUNC_PTR64 h_al,
- OUT ib_ca_handle_t FUNC_PTR64 *p_alts_ca_h
+ IN ib_al_handle_t h_al,
+ OUT ib_ca_handle_t *p_alts_ca_h
);
ib_api_status_t
-alts_close_ca( IN ib_ca_handle_t FUNC_PTR64 alts_ca_h );
+alts_close_ca( IN ib_ca_handle_t alts_ca_h );
void
alts_ca_err_cb( ib_async_event_rec_t *p_err_rec);
@@ -284,7 +285,7 @@ alts_qp_destroy_cb(
void
alts_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context );
void
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\tests\alts\alts_misc.c trunk\tests\alts\alts_misc.c
--- old\tests\alts\alts_misc.c Mon Jun 30 14:22:39 2008
+++ trunk\tests\alts\alts_misc.c Mon Jun 30 14:19:01 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -50,7 +51,7 @@
ib_api_status_t
alts_open_al(
- ib_al_handle_t VOID_PTR64 *ph_al )
+ ib_al_handle_t *ph_al )
{
ib_api_status_t ib_status;
@@ -74,7 +75,7 @@ alts_open_al(
ib_api_status_t
alts_close_al(
- ib_al_handle_t VOID_PTR64 h_al )
+ ib_al_handle_t h_al )
{
ib_api_status_t ib_status;
@@ -97,8 +98,8 @@ alts_close_al(
ib_api_status_t
alts_open_ca(
- IN ib_al_handle_t FUNC_PTR64 h_al,
- OUT ib_ca_handle_t FUNC_PTR64 *p_alts_ca_h )
+ IN ib_al_handle_t h_al,
+ OUT ib_ca_handle_t *p_alts_ca_h )
{
ib_api_status_t ib_status = IB_SUCCESS;
size_t guid_count;
@@ -168,7 +169,7 @@ alts_open_ca(
ib_api_status_t
alts_close_ca(
- IN ib_ca_handle_t FUNC_PTR64 alts_ca_h
+ IN ib_ca_handle_t alts_ca_h
)
{
ib_api_status_t ib_status;
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\tests\alts\cmtests.c trunk\tests\alts\cmtests.c
--- old\tests\alts\cmtests.c Mon Jun 30 14:22:39 2008
+++ trunk\tests\alts\cmtests.c Mon Jun 30 14:19:01 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -64,7 +65,7 @@ typedef struct _alts_cm_ca_obj
ib_qp_type_t test_type;
ib_pfn_comp_cb_t pfn_comp_cb;
- ib_ca_handle_t VOID_PTR64 h_ca;
+ ib_ca_handle_t h_ca;
ib_ca_attr_t *p_ca_attr;
ib_port_attr_t *p_src_port_attr;
ib_port_attr_t *p_dest_port_attr;
@@ -81,20 +82,20 @@ typedef struct _alts_cm_ca_obj
ib_net16_t slid;
ib_net16_t dlid;
- ib_pool_key_t VOID_PTR64 h_src_pool;
- ib_pool_key_t VOID_PTR64 h_dest_pool;
+ ib_pool_key_t h_src_pool;
+ ib_pool_key_t h_dest_pool;
- ib_mad_svc_handle_t VOID_PTR64 h_src_mad_svc;
- ib_mad_svc_handle_t VOID_PTR64 h_dest_mad_svc;
+ ib_mad_svc_handle_t h_src_mad_svc;
+ ib_mad_svc_handle_t h_dest_mad_svc;
boolean_t num_cq;
- ib_cq_handle_t VOID_PTR64 h_cq;
- ib_cq_handle_t VOID_PTR64 h_cq_alt;
+ ib_cq_handle_t h_cq;
+ ib_cq_handle_t h_cq_alt;
uint32_t cq_size;
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_pd_handle_t h_pd;
- ib_qp_handle_t VOID_PTR64 h_qp[MAX_QPS];
+ ib_qp_handle_t h_qp[MAX_QPS];
uint32_t qkey;
ib_qp_attr_t qp_attr[MAX_QPS];
@@ -107,8 +108,8 @@ typedef struct _alts_cm_ca_obj
uint32_t ds_list_depth;
uint32_t msg_size; // Initialize this field
- ib_av_handle_t VOID_PTR64 h_av_src;
- ib_av_handle_t VOID_PTR64 h_av_dest;
+ ib_av_handle_t h_av_src;
+ ib_av_handle_t h_av_dest;
uint32_t send_done;
uint32_t recv_done;
@@ -127,7 +128,7 @@ typedef struct _alts_cm_ca_obj
ib_cm_req_t req_dest;
ib_cm_listen_t listen;
- ib_listen_handle_t VOID_PTR64 h_cm_listen;
+ ib_listen_handle_t h_cm_listen;
ib_cm_rep_t rep_dest;
@@ -148,7 +149,7 @@ typedef struct _alts_cm_ca_obj
cl_event_t destroy_event;
boolean_t handoff;
- ib_listen_handle_t VOID_PTR64 h_cm_listen_handoff;
+ ib_listen_handle_t h_cm_listen_handoff;
ib_net64_t handoff_svc_id;
mem_region_t mem_region[10];
@@ -162,8 +163,8 @@ typedef struct _alts_serv_object
{
alts_cm_ca_obj_t alts_obj;
- ib_cq_handle_t VOID_PTR64 h_cq[MAX_SERVER];
- ib_qp_handle_t VOID_PTR64 h_qp[MAX_SERVER];
+ ib_cq_handle_t h_cq[MAX_SERVER];
+ ib_qp_handle_t h_qp[MAX_SERVER];
} alts_serv_object_t;
@@ -182,7 +183,7 @@ typedef struct _alts_rmda
ib_api_status_t
alts_cm_activate_qp(
alts_cm_ca_obj_t *p_ca_obj,
- ib_qp_handle_t VOID_PTR64 h_qp );
+ ib_qp_handle_t h_qp );
ib_api_status_t
alts_cm_check_active_ports(
@@ -212,47 +213,47 @@ __mra_thread(
*/
ib_api_status_t
alts_cm_rc_tests (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_cm_rc_rej_test (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_cm_handoff_test (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_cm_rc_flush_test (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_rc_no_cm_test (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_cm_rc_rdma_tests (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_rc_mra_test (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_cm_uc_test (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_cm_sidr_tests (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
#define ALTS_TEST_MGMT_CLASS 0x56
@@ -261,7 +262,7 @@ alts_cm_sidr_tests (
/*
* Gloabal Variables
*/
-ib_al_handle_t VOID_PTR64 h_al;
+ib_al_handle_t h_al;
ib_dgrm_info_t dgrm_info;
ib_mad_svc_t mad_svc;
ib_send_wr_t send_wr;
@@ -294,7 +295,7 @@ ib_api_status_t
al_test_cm(void)
{
ib_api_status_t ib_status = IB_ERROR;
- ib_ca_handle_t VOID_PTR64 h_ca = NULL;
+ ib_ca_handle_t h_ca = NULL;
uint32_t bsize;
ib_ca_attr_t *p_ca_attr = NULL;
//alts_cm_ca_obj_t ca_obj; // for testing stack
@@ -867,13 +868,13 @@ rc_cm_cq_comp_cb(
uint32_t i = 0, id;
ib_wc_t *p_free_wcl, *p_done_cl= NULL;
alts_cm_ca_obj_t *p_ca_obj;
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_cq_handle_t h_cq;
ALTS_ENTER( ALTS_DBG_VERBOSE );
CL_ASSERT(cq_context);
- h_cq = *((ib_cq_handle_t VOID_PTR64*)cq_context);
+ h_cq = *((ib_cq_handle_t*)cq_context);
p_ca_obj = gp_ca_obj;
ib_status = ib_rearm_cq(h_cq, FALSE);
@@ -1120,7 +1121,7 @@ rdma_cq_comp_cb(
uint32_t i = 0, id;
ib_wc_t *p_free_wcl, *p_done_cl= NULL;
alts_cm_ca_obj_t *p_ca_obj;
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_cq_handle_t h_cq;
alts_rdma_t *p_data;
ALTS_ENTER( ALTS_DBG_VERBOSE );
@@ -1129,7 +1130,7 @@ rdma_cq_comp_cb(
CL_ASSERT(cq_context);
- h_cq = *((ib_cq_handle_t VOID_PTR64*)cq_context);
+ h_cq = *((ib_cq_handle_t*)cq_context);
p_ca_obj = gp_ca_obj;
ib_status = ib_rearm_cq(h_cq, FALSE);
@@ -1220,7 +1221,7 @@ rdma_cq_comp_cb(
void
cm_rc_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context )
{
UNUSED_PARAM( h_cq );
@@ -1229,7 +1230,7 @@ cm_rc_cq_comp_cb(
void
cm_ud_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context )
{
UNUSED_PARAM( h_cq );
@@ -1238,7 +1239,7 @@ cm_ud_cq_comp_cb(
void
cm_rdma_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context )
{
UNUSED_PARAM( h_cq );
@@ -1852,7 +1853,7 @@ alts_cm_dreq_cb(
CL_ASSERT( p_cm_dreq_rec );
- p_ca_obj = (alts_cm_ca_obj_t* VOID_PTR64)p_cm_dreq_rec->qp_context;
+ p_ca_obj = (alts_cm_ca_obj_t*)p_cm_dreq_rec->qp_context;
CL_ASSERT( p_ca_obj );
p_ca_obj->cm_cbs++; // count crows
@@ -1880,7 +1881,7 @@ alts_cm_rep_cb(
if(( p_cm_rep_rec->qp_type == IB_QPT_RELIABLE_CONN ) ||
( p_cm_rep_rec->qp_type == IB_QPT_UNRELIABLE_CONN ))
{
- p_ca_obj = (alts_cm_ca_obj_t* VOID_PTR64)p_cm_rep_rec->qp_context;
+ p_ca_obj = (alts_cm_ca_obj_t*)p_cm_rep_rec->qp_context;
CL_ASSERT( p_ca_obj );
p_ca_obj->cm_cbs++; // count crows
@@ -1921,7 +1922,7 @@ alts_cm_rep_cb(
p_cm_rep_rec->remote_qp,
p_cm_rep_rec->remote_qkey ));
- p_ca_obj = (alts_cm_ca_obj_t* VOID_PTR64)p_cm_rep_rec->sidr_context;
+ p_ca_obj = (alts_cm_ca_obj_t*)p_cm_rep_rec->sidr_context;
CL_ASSERT( p_ca_obj );
p_ca_obj->cm_cbs++; // count crows
@@ -1945,7 +1946,7 @@ alts_cm_rej_cb(
ALTS_ENTER( ALTS_DBG_VERBOSE );
- p_ca_obj = (alts_cm_ca_obj_t* VOID_PTR64)p_cm_rej_rec->qp_context;
+ p_ca_obj = (alts_cm_ca_obj_t*)p_cm_rej_rec->qp_context;
// only use context if qp was set up
if( p_ca_obj )
@@ -1964,7 +1965,7 @@ alts_cm_mra_cb(
ALTS_ENTER( ALTS_DBG_VERBOSE );
- p_ca_obj = (alts_cm_ca_obj_t* VOID_PTR64)p_cm_mra_rec->qp_context;
+ p_ca_obj = (alts_cm_ca_obj_t*)p_cm_mra_rec->qp_context;
CL_ASSERT( p_ca_obj );
@@ -1993,7 +1994,7 @@ alts_cm_rtu_cb(
CL_ASSERT( p_cm_rtu_rec );
- p_ca_obj = (alts_cm_ca_obj_t* VOID_PTR64)p_cm_rtu_rec->qp_context;
+ p_ca_obj = (alts_cm_ca_obj_t*)p_cm_rtu_rec->qp_context;
CL_ASSERT( p_ca_obj );
p_ca_obj->cm_cbs++; // count crows
@@ -2026,7 +2027,7 @@ alts_cm_req_cb(
CL_ASSERT( p_cm_req_rec );
- p_ca_obj = (alts_cm_ca_obj_t* VOID_PTR64)p_cm_req_rec->context;
+ p_ca_obj = (alts_cm_ca_obj_t*)p_cm_req_rec->context;
CL_ASSERT( p_ca_obj );
@@ -2372,7 +2373,7 @@ alts_cm_drep_cb(
CL_ASSERT( p_cm_drep_rec );
- p_ca_obj = (alts_cm_ca_obj_t* VOID_PTR64)p_cm_drep_rec->qp_context;
+ p_ca_obj = (alts_cm_ca_obj_t*)p_cm_drep_rec->qp_context;
CL_ASSERT( p_ca_obj );
p_ca_obj->cm_cbs++; // count crows
@@ -2446,7 +2447,7 @@ cm_destroy_end:
ib_api_status_t
alts_cm_rc_tests (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -2581,7 +2582,7 @@ alts_cm_rc_tests (
ib_api_status_t
alts_cm_rc_rej_test (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -2710,7 +2711,7 @@ alts_cm_rc_rej_test (
ib_api_status_t
alts_cm_handoff_test (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -2849,7 +2850,7 @@ alts_cm_handoff_test (
ib_api_status_t
alts_cm_rc_flush_test (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -2995,7 +2996,7 @@ alts_cm_rc_flush_test (
ib_api_status_t
alts_cm_activate_qp(
alts_cm_ca_obj_t *p_ca_obj,
- ib_qp_handle_t VOID_PTR64 h_qp
+ ib_qp_handle_t h_qp
)
{
@@ -3154,7 +3155,7 @@ alts_cm_activate_qp(
ib_api_status_t
alts_rc_no_cm_test (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -3649,7 +3650,7 @@ alts_rc_rdma_message_passing(
ib_api_status_t
alts_cm_rc_rdma_tests (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -3880,7 +3881,7 @@ __mra_thread(
ib_api_status_t
alts_rc_mra_test (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -4016,7 +4017,7 @@ alts_rc_mra_test (
ib_api_status_t
alts_cm_uc_test (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -4150,7 +4151,7 @@ alts_cm_uc_test (
ib_api_status_t
alts_cm_sidr_tests (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\tests\alts\createanddestroycq.c trunk\tests\alts\createanddestroycq.c
--- old\tests\alts\createanddestroycq.c Mon Jun 30 14:22:39 2008
+++ trunk\tests\alts\createanddestroycq.c Mon Jun 30 14:19:01 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -78,12 +79,12 @@ alts_cq(
)
{
ib_api_status_t ib_status = IB_SUCCESS;
- ib_al_handle_t VOID_PTR64 h_al = NULL;
- ib_ca_handle_t VOID_PTR64 h_ca;
- ib_cq_handle_t VOID_PTR64 h_cq = NULL;
+ ib_al_handle_t h_al = NULL;
+ ib_ca_handle_t h_ca;
+ ib_cq_handle_t h_cq = NULL;
cl_status_t cl_status;
ib_cq_create_t cq_create;
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_pd_handle_t h_pd;
int iteration = 0;
#ifdef CL_KERNEL
cl_event_t cq_event;
@@ -296,7 +297,7 @@ alts_cq(
void
alts_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context )
{
ALTS_ENTER( ALTS_DBG_VERBOSE );
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\tests\alts\createanddestroyqp.c trunk\tests\alts\createanddestroyqp.c
--- old\tests\alts\createanddestroyqp.c Mon Jun 30 14:22:39 2008
+++ trunk\tests\alts\createanddestroyqp.c Mon Jun 30 14:19:01 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -80,11 +81,11 @@ alts_qp(
)
{
ib_api_status_t ib_status = IB_SUCCESS;
- ib_al_handle_t VOID_PTR64 h_al = NULL;
- ib_ca_handle_t VOID_PTR64 h_ca;
- ib_cq_handle_t VOID_PTR64 h_cq = NULL;
- ib_qp_handle_t VOID_PTR64 h_qp = NULL;
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_al_handle_t h_al = NULL;
+ ib_ca_handle_t h_ca;
+ ib_cq_handle_t h_cq = NULL;
+ ib_qp_handle_t h_qp = NULL;
+ ib_pd_handle_t h_pd;
cl_status_t cl_status;
ib_cq_create_t cq_create;
ib_qp_create_t qp_create;
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\tests\alts\createdestroyav.c trunk\tests\alts\createdestroyav.c
--- old\tests\alts\createdestroyav.c Mon Jun 30 14:22:39 2008
+++ trunk\tests\alts\createdestroyav.c Mon Jun 30 14:19:01 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -75,13 +76,13 @@ alts_av(
)
{
ib_api_status_t ib_status = IB_SUCCESS;
- ib_al_handle_t VOID_PTR64 h_al = NULL;
+ ib_al_handle_t h_al = NULL;
size_t guid_count;
ib_port_attr_t *p_alts_port_attr;
ib_av_attr_t alts_av_attr, query_av_attr;
- ib_ca_handle_t VOID_PTR64 h_ca;
- ib_pd_handle_t VOID_PTR64 h_pd, h_pd1;
- ib_av_handle_t VOID_PTR64 h_av;
+ ib_ca_handle_t h_ca;
+ ib_pd_handle_t h_pd, h_pd1;
+ ib_av_handle_t h_av;
ib_net64_t ca_guid_array[ALTS_MAX_CA];
uint32_t bsize;
ib_ca_attr_t *alts_ca_attr = NULL;
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\tests\alts\creatememwindow.c trunk\tests\alts\creatememwindow.c
--- old\tests\alts\creatememwindow.c Mon Jun 30 14:22:39 2008
+++ trunk\tests\alts\creatememwindow.c Mon Jun 30 14:19:01 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -59,16 +60,16 @@ al_test_create_mem_window(
)
{
ib_api_status_t ib_status = IB_SUCCESS;
- ib_al_handle_t VOID_PTR64 h_al = NULL;
- ib_ca_handle_t VOID_PTR64 h_ca = NULL;
- ib_pd_handle_t VOID_PTR64 h_pd = NULL;
+ ib_al_handle_t h_al = NULL;
+ ib_ca_handle_t h_ca = NULL;
+ ib_pd_handle_t h_pd = NULL;
ib_mr_create_t virt_mem;
char *ptr = NULL, *ptr_align;
size_t mask;
uint32_t lkey;
uint32_t rkey;
- ib_mr_handle_t VOID_PTR64 h_mr = NULL;
+ ib_mr_handle_t h_mr = NULL;
ib_mr_attr_t alts_mr_attr;
ALTS_ENTER( ALTS_DBG_VERBOSE );
@@ -166,9 +167,9 @@ al_test_create_mem_window(
{
uint32_t rkey_mw;
- ib_mw_handle_t VOID_PTR64 h_mw;
+ ib_mw_handle_t h_mw;
- ib_pd_handle_t VOID_PTR64 h_pd_query;
+ ib_pd_handle_t h_pd_query;
uint32_t rkey_mw_query;
ib_status = ib_create_mw(h_pd,&rkey_mw,&h_mw);
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\tests\alts\ibquery.c trunk\tests\alts\ibquery.c
--- old\tests\alts\ibquery.c Mon Jun 30 14:22:39 2008
+++ trunk\tests\alts\ibquery.c Mon Jun 30 14:19:01 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -83,9 +84,9 @@ ib_api_status_t
al_test_query(void)
{
ib_api_status_t ib_status = IB_ERROR;
- ib_al_handle_t VOID_PTR64 h_al = NULL;
+ ib_al_handle_t h_al = NULL;
- ib_ca_handle_t VOID_PTR64 h_ca = NULL;
+ ib_ca_handle_t h_ca = NULL;
uint32_t bsize;
uint32_t i;
ib_ca_attr_t *p_ca_attr = NULL;
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\tests\alts\madtests.c trunk\tests\alts\madtests.c
--- old\tests\alts\madtests.c Mon Jun 30 14:22:39 2008
+++ trunk\tests\alts\madtests.c Mon Jun 30 14:19:01 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -66,7 +67,7 @@ typedef struct _alts_mad_ca_obj
ib_api_status_t status;
uint32_t test_type;
- ib_ca_handle_t VOID_PTR64 h_ca;
+ ib_ca_handle_t h_ca;
ib_ca_attr_t *p_ca_attr;
ib_port_attr_t *p_src_port_attr;
ib_port_attr_t *p_dest_port_attr;
@@ -83,18 +84,18 @@ typedef struct _alts_mad_ca_obj
ib_net16_t slid;
ib_net16_t dlid;
- ib_pool_key_t VOID_PTR64 h_src_pool;
- ib_pool_key_t VOID_PTR64 h_dest_pool;
+ ib_pool_key_t h_src_pool;
+ ib_pool_key_t h_dest_pool;
- ib_mad_svc_handle_t VOID_PTR64 h_src_mad_svc;
- ib_mad_svc_handle_t VOID_PTR64 h_dest_mad_svc;
+ ib_mad_svc_handle_t h_src_mad_svc;
+ ib_mad_svc_handle_t h_dest_mad_svc;
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_cq_handle_t h_cq;
uint32_t cq_size;
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_pd_handle_t h_pd;
- ib_qp_handle_t VOID_PTR64 h_qp[MAX_QPS];
+ ib_qp_handle_t h_qp[MAX_QPS];
uint32_t qkey;
ib_qp_attr_t qp_attr[MAX_QPS];
@@ -108,8 +109,8 @@ typedef struct _alts_mad_ca_obj
uint32_t ds_list_depth;
uint32_t msg_size; // Initialize this field
- ib_av_handle_t VOID_PTR64 h_av_src;
- ib_av_handle_t VOID_PTR64 h_av_dest;
+ ib_av_handle_t h_av_src;
+ ib_av_handle_t h_av_dest;
uint32_t send_done;
uint32_t send_done_error;
@@ -140,7 +141,7 @@ mad_create_resources(
ib_api_status_t
mad_activate_svc(
alts_mad_ca_obj_t *p_ca_obj,
- ib_qp_handle_t VOID_PTR64 h_qp );
+ ib_qp_handle_t h_qp );
ib_api_status_t
alts_spl_destroy_resources(
@@ -176,7 +177,7 @@ mad_qp_destroy_cb(
void
mad_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context );
/*
@@ -196,65 +197,65 @@ mad_qp_err_cb(
void
mad_svc_send_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_element );
void
mad_svc_recv_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_element );
void
mad_svc_qp0_recv_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_element );
ib_api_status_t
alts_qp1_loopback(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_qp1_2_ports(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_qp1_2_ports_100(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_qp1_pingpong(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_qp0_loopback(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_qp0_2_ports(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_qp0_2_ports_100(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_qp0_pingpong(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_qp0_ping_switch (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
#define ALTS_TEST_MGMT_CLASS 0x56
@@ -264,7 +265,7 @@ alts_qp0_ping_switch (
/*
* Gloabal Variables
*/
-ib_al_handle_t VOID_PTR64 h_al;
+ib_al_handle_t h_al;
ib_dgrm_info_t dgrm_info;
ib_mad_svc_t mad_svc;
ib_send_wr_t send_wr;
@@ -293,7 +294,7 @@ ib_api_status_t
al_test_mad(void)
{
ib_api_status_t ib_status = IB_ERROR;
- ib_ca_handle_t VOID_PTR64 h_ca = NULL;
+ ib_ca_handle_t h_ca = NULL;
uint32_t bsize;
ib_ca_attr_t *p_ca_attr = NULL;
//alts_mad_ca_obj_t ca_obj; // for testing stack
@@ -969,10 +970,10 @@ mad_post_recvs(
ib_api_status_t
mad_activate_svc(
alts_mad_ca_obj_t *p_ca_obj,
- ib_qp_handle_t VOID_PTR64 h_qp )
+ ib_qp_handle_t h_qp )
{
ib_api_status_t ib_status;
- ib_mad_svc_handle_t VOID_PTR64 h_mad_svc;
+ ib_mad_svc_handle_t h_mad_svc;
ALTS_ENTER( ALTS_DBG_VERBOSE );
@@ -1302,7 +1303,7 @@ alts_send_mad_resp(
void
mad_svc_send_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_element )
{
@@ -1369,7 +1370,7 @@ mad_svc_send_cb(
void
mad_svc_recv_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_element )
{
@@ -1444,7 +1445,7 @@ mad_svc_recv_cb(
void
mad_svc_qp0_recv_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_element )
{
@@ -1682,7 +1683,7 @@ mad_create_spl_resources(
void
mad_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context )
{
ib_api_status_t ib_status;
@@ -1826,7 +1827,7 @@ mad_cq_destroy_cb(
ib_api_status_t
alts_qp1_loopback(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -1956,7 +1957,7 @@ alts_qp1_loopback(
ib_api_status_t
alts_qp1_2_ports(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -2086,7 +2087,7 @@ alts_qp1_2_ports(
ib_api_status_t
alts_qp1_2_ports_100(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -2216,7 +2217,7 @@ alts_qp1_2_ports_100(
ib_api_status_t
alts_qp1_pingpong(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -2349,7 +2350,7 @@ alts_qp1_pingpong(
ib_api_status_t
alts_qp0_loopback(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -2481,7 +2482,7 @@ alts_qp0_loopback(
ib_api_status_t
alts_qp0_2_ports(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -2613,7 +2614,7 @@ alts_qp0_2_ports(
ib_api_status_t
alts_qp0_2_ports_100(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -2745,7 +2746,7 @@ alts_qp0_2_ports_100(
ib_api_status_t
alts_qp0_pingpong(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -2879,7 +2880,7 @@ alts_qp0_pingpong(
ib_api_status_t
alts_qp0_ping_switch (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\tests\alts\multisendrecv.c trunk\tests\alts\multisendrecv.c
--- old\tests\alts\multisendrecv.c Mon Jun 30 14:22:39 2008
+++ trunk\tests\alts\multisendrecv.c Mon Jun 30 14:19:01 2008
@@ -2,6 +2,7 @@
* Copyright (c) 2005 Mellanox Technologies. All rights reserved.
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -67,7 +68,7 @@ typedef struct _alts_multisr_ca_obj
ib_api_status_t status;
uint32_t test_type;
- ib_ca_handle_t VOID_PTR64 h_ca;
+ ib_ca_handle_t h_ca;
ib_ca_attr_t *p_ca_attr;
ib_port_attr_t *p_src_port_attr;
ib_port_attr_t *p_dest_port_attr;
@@ -81,12 +82,12 @@ typedef struct _alts_multisr_ca_obj
ib_net16_t slid;
ib_net16_t dlid;
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_cq_handle_t h_cq;
uint32_t cq_size;
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_pd_handle_t h_pd;
- ib_qp_handle_t VOID_PTR64 h_qp[MAX_QPS];
+ ib_qp_handle_t h_qp[MAX_QPS];
ib_net32_t qkey;
ib_qp_attr_t qp_attr[MAX_QPS];
@@ -100,7 +101,7 @@ typedef struct _alts_multisr_ca_obj
uint32_t ds_list_depth;
uint32_t msg_size; // Initialize this field
- ib_av_handle_t VOID_PTR64 h_av_src;
+ ib_av_handle_t h_av_src;
mem_region_t mem_region[200];
uint32_t cq_done; // total completions
@@ -126,7 +127,7 @@ alts_create_resources(
ib_api_status_t
alts_activate_qp(
alts_multisr_ca_obj_t *p_ca_obj,
- ib_qp_handle_t VOID_PTR64 h_qp );
+ ib_qp_handle_t h_qp );
ib_api_status_t
alts_destroy_resources(
@@ -178,12 +179,12 @@ multisend_cq_comp_cb(
void
ud_multisend_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context );
void
rc_multisend_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context );
/*
* CQ Error callback function
@@ -202,32 +203,32 @@ multisend_qp_err_cb(
ib_api_status_t
alts_ud_loopback (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_ud_2_ports (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_ud_2_ports_100_msgs (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_rc_loopback (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_rc_2_ports (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_rc_2_ports_100_msgs (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
/*
@@ -258,8 +259,8 @@ ib_api_status_t
al_test_multi_send_recv(void)
{
ib_api_status_t ib_status = IB_ERROR;
- ib_al_handle_t VOID_PTR64 h_al;
- ib_ca_handle_t VOID_PTR64 h_ca = NULL;
+ ib_al_handle_t h_al;
+ ib_ca_handle_t h_ca = NULL;
uint32_t bsize;
ib_ca_attr_t *p_ca_attr = NULL;
//alts_multisr_ca_obj_t ca_obj; // for testing stack
@@ -904,7 +905,7 @@ alts_deregister_mem(
ib_api_status_t
alts_activate_qp(
alts_multisr_ca_obj_t *p_ca_obj,
- ib_qp_handle_t VOID_PTR64 h_qp
+ ib_qp_handle_t h_qp
)
{
@@ -1411,7 +1412,7 @@ poll_loop:
void
ud_multisend_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context )
{
UNUSED_PARAM( h_cq );
@@ -1420,7 +1421,7 @@ ud_multisend_cq_comp_cb(
void
rc_multisend_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context )
{
UNUSED_PARAM( h_cq );
@@ -1508,7 +1509,7 @@ multisend_cq_destroy_cb(
*/
ib_api_status_t
alts_ud_loopback (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -1645,7 +1646,7 @@ alts_ud_loopback (
ib_api_status_t
alts_ud_2_ports (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -1789,7 +1790,7 @@ alts_ud_2_ports (
ib_api_status_t
alts_ud_2_ports_100_msgs (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -1934,7 +1935,7 @@ alts_ud_2_ports_100_msgs (
ib_api_status_t
alts_rc_loopback (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -2084,7 +2085,7 @@ alts_rc_loopback (
ib_api_status_t
alts_rc_2_ports (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -2228,7 +2229,7 @@ alts_rc_2_ports (
ib_api_status_t
alts_rc_2_ports_100_msgs (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\tests\alts\openclose.c trunk\tests\alts\openclose.c
--- old\tests\alts\openclose.c Mon Jun 30 14:22:39 2008
+++ trunk\tests\alts\openclose.c Mon Jun 30 14:19:01 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -39,7 +40,7 @@
ib_api_status_t
al_test_openclose(void)
{
- ib_al_handle_t VOID_PTR64 ph_al;
+ ib_al_handle_t ph_al;
ib_api_status_t ib_status = IB_SUCCESS;
ALTS_ENTER( ALTS_DBG_VERBOSE );
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\tests\alts\querycaattr.c trunk\tests\alts\querycaattr.c
--- old\tests\alts\querycaattr.c Mon Jun 30 14:22:39 2008
+++ trunk\tests\alts\querycaattr.c Mon Jun 30 14:19:01 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -74,14 +75,14 @@ alts_ca_attr(
boolean_t modify_attr
)
{
- ib_al_handle_t VOID_PTR64 h_al = NULL;
+ ib_al_handle_t h_al = NULL;
ib_api_status_t ib_status = IB_SUCCESS;
ib_api_status_t ret_status = IB_SUCCESS;
size_t guid_count;
ib_net64_t ca_guid_array[ALTS_MAX_CA];
ib_ca_attr_t *alts_ca_attr;
uintn_t i;
- ib_ca_handle_t VOID_PTR64 h_ca = NULL;
+ ib_ca_handle_t h_ca = NULL;
uint32_t bsize;
ib_port_attr_mod_t port_attr_mod;
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\tests\alts\registermemregion.c trunk\tests\alts\registermemregion.c
--- old\tests\alts\registermemregion.c Mon Jun 30 14:22:39 2008
+++ trunk\tests\alts\registermemregion.c Mon Jun 30 14:19:01 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -58,16 +59,16 @@ al_test_register_mem(
)
{
ib_api_status_t ib_status = IB_SUCCESS;
- ib_al_handle_t VOID_PTR64 h_al = NULL;
- ib_ca_handle_t VOID_PTR64 h_ca = NULL;
- ib_pd_handle_t VOID_PTR64 h_pd = NULL;
+ ib_al_handle_t h_al = NULL;
+ ib_ca_handle_t h_ca = NULL;
+ ib_pd_handle_t h_pd = NULL;
ib_mr_create_t virt_mem;
char *ptr = NULL, *ptr_align;
size_t mask;
uint32_t lkey;
uint32_t rkey;
- ib_mr_handle_t VOID_PTR64 h_mr = NULL;
+ ib_mr_handle_t h_mr = NULL;
ib_mr_attr_t alts_mr_attr;
ALTS_ENTER( ALTS_DBG_VERBOSE );
@@ -236,15 +237,15 @@ al_test_register_var_mem(
)
{
ib_api_status_t ib_status = IB_SUCCESS;
- ib_al_handle_t VOID_PTR64 h_al = NULL;
- ib_ca_handle_t VOID_PTR64 h_ca = NULL;
- ib_pd_handle_t VOID_PTR64 h_pd = NULL;
+ ib_al_handle_t h_al = NULL;
+ ib_ca_handle_t h_ca = NULL;
+ ib_pd_handle_t h_pd = NULL;
ib_mr_create_t virt_mem;
char *ptr = NULL;
uint32_t lkey;
uint32_t rkey;
- ib_mr_handle_t VOID_PTR64 h_mr = NULL;
+ ib_mr_handle_t h_mr = NULL;
ib_mr_attr_t alts_mr_attr;
ALTS_ENTER( ALTS_DBG_VERBOSE );
@@ -403,9 +404,9 @@ al_test_register_phys_mem(
)
{
ib_api_status_t ib_status = IB_SUCCESS;
- ib_al_handle_t VOID_PTR64 h_al = NULL;
- ib_ca_handle_t VOID_PTR64 h_ca = NULL;
- ib_pd_handle_t VOID_PTR64 h_pd = NULL;
+ ib_al_handle_t h_al = NULL;
+ ib_ca_handle_t h_ca = NULL;
+ ib_pd_handle_t h_pd = NULL;
ib_phys_range_t phys_range;
ib_phys_create_t phys_mem;
@@ -413,7 +414,7 @@ al_test_register_phys_mem(
void *virt_addr = NULL;
uint32_t lkey;
uint32_t rkey;
- ib_mr_handle_t VOID_PTR64 h_mr = NULL;
+ ib_mr_handle_t h_mr = NULL;
ib_mr_attr_t alts_mr_attr;
ALTS_ENTER( ALTS_DBG_VERBOSE );
@@ -553,9 +554,9 @@ al_test_register_shared_mem(
)
{
ib_api_status_t ib_status = IB_SUCCESS;
- ib_al_handle_t VOID_PTR64 h_al = NULL;
- ib_ca_handle_t VOID_PTR64 h_ca = NULL;
- ib_pd_handle_t VOID_PTR64 h_pd = NULL;
+ ib_al_handle_t h_al = NULL;
+ ib_ca_handle_t h_ca = NULL;
+ ib_pd_handle_t h_pd = NULL;
ib_mr_create_t virt_mem;
uint64_t virt_ptr = 0;
@@ -563,8 +564,8 @@ al_test_register_shared_mem(
size_t mask;
uint32_t lkey;
uint32_t rkey;
- ib_mr_handle_t VOID_PTR64 h_base_mr = NULL;
- ib_mr_handle_t VOID_PTR64 h_mr = NULL;
+ ib_mr_handle_t h_base_mr = NULL;
+ ib_mr_handle_t h_mr = NULL;
ib_mr_attr_t alts_mr_attr;
ALTS_ENTER( ALTS_DBG_VERBOSE );
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\tests\alts\registerpnp.c trunk\tests\alts\registerpnp.c
--- old\tests\alts\registerpnp.c Mon Jun 30 14:22:39 2008
+++ trunk\tests\alts\registerpnp.c Mon Jun 30 14:19:01 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -47,10 +48,10 @@ al_test_pnp_callback(
ib_api_status_t
al_test_register_pnp(void)
{
- ib_al_handle_t VOID_PTR64 h_al;
+ ib_al_handle_t h_al;
ib_api_status_t ib_status = IB_SUCCESS;
ib_pnp_req_t pnp_req;
- ib_pnp_handle_t VOID_PTR64 h_pnp;
+ ib_pnp_handle_t h_pnp;
ALTS_ENTER( ALTS_DBG_VERBOSE );
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\tests\alts\reregister_hca.c trunk\tests\alts\reregister_hca.c
--- old\tests\alts\reregister_hca.c Mon Jun 30 14:22:39 2008
+++ trunk\tests\alts\reregister_hca.c Mon Jun 30 14:19:01 2008
@@ -1,7 +1,7 @@
-
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -54,8 +54,8 @@ al_test_reregister_hca(
)
{
ib_api_status_t ib_status = IB_SUCCESS;
- ib_al_handle_t VOID_PTR64 h_al = NULL;
- ib_ca_handle_t VOID_PTR64 h_ca = NULL;
+ ib_al_handle_t h_al = NULL;
+ ib_ca_handle_t h_ca = NULL;
ib_ci_op_t ci_op;
ALTS_ENTER( ALTS_DBG_VERBOSE );
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\tests\alts\smatests.c trunk\tests\alts\smatests.c
--- old\tests\alts\smatests.c Mon Jun 30 14:22:39 2008
+++ trunk\tests\alts\smatests.c Mon Jun 30 14:19:01 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -60,20 +61,20 @@ extern ib_mad_svc_t mad_svc;
typedef struct _alts_sma_object
{
ib_api_status_t status;
- ib_al_handle_t VOID_PTR64 h_al;
- ib_ca_handle_t VOID_PTR64 h_ca;
+ ib_al_handle_t h_al;
+ ib_ca_handle_t h_ca;
ib_ca_attr_t *p_ca_attr;
ib_port_attr_t *p_send_port_attr;
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_pd_handle_t h_pd;
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_cq_handle_t h_cq;
uint32_t cq_size;
- ib_pool_key_t VOID_PTR64 h_mad_pool;
- ib_qp_handle_t VOID_PTR64 h_qp0;
+ ib_pool_key_t h_mad_pool;
+ ib_qp_handle_t h_qp0;
- ib_mad_svc_handle_t VOID_PTR64 h_sma_mad_svc;
+ ib_mad_svc_handle_t h_sma_mad_svc;
} alts_sma_object_t;
@@ -99,14 +100,14 @@ sma_mad_qp_err_cb(
);
void
alts_sma_mad_svc_send_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_element
);
void
alts_sma_mad_svc_recv_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_element
);
@@ -401,7 +402,7 @@ alts_init_tst_resource_sma(alts_sma_obje
void
alts_sma_mad_svc_send_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_element )
{
@@ -414,7 +415,7 @@ alts_sma_mad_svc_send_cb(
void
alts_sma_mad_svc_recv_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_element )
{
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\tests\cmtest\user\cmtest_main.c trunk\tests\cmtest\user\cmtest_main.c
--- old\tests\cmtest\user\cmtest_main.c Mon Jun 30 14:22:39 2008
+++ trunk\tests\cmtest\user\cmtest_main.c Mon Jun 30 14:19:01 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 1996-2002 Intel Corporation. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corp. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -73,8 +74,8 @@ typedef enum _cmtest_state
typedef struct _ib_root
{
- ib_al_handle_t VOID_PTR64 h_al;
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_al_handle_t h_al;
+ ib_pd_handle_t h_pd;
/* Input parameters to control test. */
int32_t num_nodes;
@@ -92,7 +93,7 @@ typedef struct _ib_root
uint32_t msg_size;
- ib_ca_handle_t VOID_PTR64 h_ca;
+ ib_ca_handle_t h_ca;
ib_net16_t l_lid;
ib_net16_t r_lid;
ib_net64_t ca_guid;
@@ -103,7 +104,7 @@ typedef struct _ib_root
/* cm info */
boolean_t is_server;
- ib_listen_handle_t VOID_PTR64 h_listen;
+ ib_listen_handle_t h_listen;
ib_path_rec_t path_rec;
/* CQ info. */
@@ -115,7 +116,7 @@ typedef struct _ib_root
ib_qp_mod_t qp_mod_init;
/* reg mem info */
- ib_mr_handle_t VOID_PTR64 h_mr;
+ ib_mr_handle_t h_mr;
uint32_t lkey;
uint32_t rkey;
uint8_t *p_mem;
@@ -152,9 +153,9 @@ typedef struct _ib_node
{
uint64_t id;
- ib_cq_handle_t VOID_PTR64 h_send_cq;
- ib_cq_handle_t VOID_PTR64 h_recv_cq;
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_cq_handle_t h_send_cq;
+ ib_cq_handle_t h_recv_cq;
+ ib_qp_handle_t h_qp;
uint32_t max_inline;
cmnode_state_t state;
@@ -245,7 +246,7 @@ __drep_cb(
static boolean_t
__poll_cq(
IN ib_node_t *p_node,
- IN ib_cq_handle_t FUNC_PTR64 h_cq );
+ IN ib_cq_handle_t h_cq );
/**********************************************************************
@@ -928,7 +929,7 @@ __drep_cb(
static void AL_API
__cq_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void* cq_context )
{
ib_node_t *p_node = (ib_node_t*)cq_context;
@@ -1374,7 +1375,7 @@ __reg_pnp()
{
ib_api_status_t status;
ib_pnp_req_t pnp_req;
- ib_pnp_handle_t VOID_PTR64 h_pnp;
+ ib_pnp_handle_t h_pnp;
cl_memclr( &pnp_req, sizeof( ib_pnp_req_t ) );
pnp_req.pnp_class = IB_PNP_PORT;
@@ -1790,7 +1791,7 @@ __send_msgs()
static boolean_t
__poll_cq(
IN ib_node_t *p_node,
- IN ib_cq_handle_t FUNC_PTR64 h_cq )
+ IN ib_cq_handle_t h_cq )
{
ib_api_status_t status = IB_SUCCESS;
ib_wc_t free_wc[2];
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\tests\limits\user\limits_main.c trunk\tests\limits\user\limits_main.c
--- old\tests\limits\user\limits_main.c Mon Jun 30 14:22:39 2008
+++ trunk\tests\limits\user\limits_main.c Mon Jun 30 14:19:01 2008
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -269,13 +270,13 @@ __parse_options(
struct __mr_buf
{
cl_list_item_t list_item;
- ib_mr_handle_t VOID_PTR64 h_mr;
- char buf[8192 - sizeof(ib_mr_handle_t VOID_PTR64) - sizeof(cl_list_item_t)];
+ ib_mr_handle_t h_mr;
+ char buf[8192 - sizeof(ib_mr_handle_t) - sizeof(cl_list_item_t)];
};
static void
__test_mr(
- ib_pd_handle_t VOID_PTR64 h_pd )
+ ib_pd_handle_t h_pd )
{
ib_api_status_t status = IB_SUCCESS;
struct __mr_buf *p_mr;
@@ -346,12 +347,12 @@ __test_mr(
struct __cq
{
cl_list_item_t list_item;
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_cq_handle_t h_cq;
};
static void
__test_cq(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
boolean_t resize )
{
ib_api_status_t status = IB_SUCCESS;
@@ -447,9 +448,9 @@ main(
char* argv[] )
{
ib_api_status_t status;
- ib_al_handle_t VOID_PTR64 h_al;
- ib_ca_handle_t VOID_PTR64 h_ca;
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_al_handle_t h_al;
+ ib_ca_handle_t h_ca;
+ ib_pd_handle_t h_pd;
size_t size;
net64_t *ca_guids;
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\tests\wsd\user\test2\ibwrap.h trunk\tests\wsd\user\test2\ibwrap.h
--- old\tests\wsd\user\test2\ibwrap.h Mon Jun 30 14:22:39 2008
+++ trunk\tests\wsd\user\test2\ibwrap.h Mon Jun 30 14:19:01 2008
@@ -1,11 +1,11 @@
#include <iba/ib_al.h>
struct qp_pack {
-TO_LONG_PTR( ib_al_handle_t , al_handle) ;
-TO_LONG_PTR( ib_ca_handle_t , hca_handle) ;
-TO_LONG_PTR( ib_pd_handle_t , pd_handle) ;
-TO_LONG_PTR( ib_qp_handle_t , qp_handle) ;
-TO_LONG_PTR( ib_cq_handle_t , cq_handle) ;
+ ib_al_handle_t al_handle;
+ ib_ca_handle_t hca_handle;
+ ib_pd_handle_t pd_handle;
+ ib_qp_handle_t qp_handle;
+ ib_cq_handle_t cq_handle;
atomic32_t wq_posted;
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\tests\wsd\user\test3\ibwrap.h trunk\tests\wsd\user\test3\ibwrap.h
--- old\tests\wsd\user\test3\ibwrap.h Mon Jun 30 14:22:39 2008
+++ trunk\tests\wsd\user\test3\ibwrap.h Mon Jun 30 14:19:01 2008
@@ -1,11 +1,11 @@
#include <iba/ib_al.h>
struct qp_pack {
-TO_LONG_PTR( ib_al_handle_t , al_handle) ;
-TO_LONG_PTR( ib_ca_handle_t , hca_handle) ;
-TO_LONG_PTR( ib_pd_handle_t , pd_handle) ;
-TO_LONG_PTR( ib_qp_handle_t , qp_handle) ;
-TO_LONG_PTR( ib_cq_handle_t , cq_handle) ;
+ ib_al_handle_t al_handle;
+ ib_ca_handle_t hca_handle;
+ ib_pd_handle_t pd_handle;
+ ib_qp_handle_t qp_handle;
+ ib_cq_handle_t cq_handle;
atomic32_t wq_posted;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: tests.patch
Type: application/octet-stream
Size: 48906 bytes
Desc: tests.patch
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20080630/a18a64ac/attachment.obj>
More information about the ofw
mailing list