[openib-general] [PATCH][3/26] kDAPL: Remove typedef DAT_LMR_TRIPLET
Tom Duffy
Tom.Duffy at Sun.COM
Mon May 9 14:39:40 PDT 2005
Signed-off-by: Tom Duffy <tduffy at sun.com>
diff -ur -X /home/tduffy/dontdiff linux-kernel2/dat/dat.h linux-kernel3/dat/dat.h
--- linux-kernel2/dat/dat.h 2005-05-09 11:24:22.839026000 -0700
+++ linux-kernel3/dat/dat.h 2005-05-09 11:36:42.184000000 -0700
@@ -524,12 +524,12 @@
* dat_lmr_triplet are irrelevant and can be invalid.
*/
-typedef struct dat_lmr_triplet {
+struct dat_lmr_triplet {
DAT_LMR_CONTEXT lmr_context;
u32 pad; /* align structure on 64-bit boundry */
DAT_VADDR virtual_address;
DAT_VLEN segment_length;
-} DAT_LMR_TRIPLET;
+};
typedef struct dat_rmr_triplet {
DAT_RMR_CONTEXT rmr_context;
@@ -566,7 +566,7 @@
typedef struct dat_rmr_param {
DAT_IA_HANDLE ia_handle;
DAT_PZ_HANDLE pz_handle;
- DAT_LMR_TRIPLET lmr_triplet;
+ struct dat_lmr_triplet lmr_triplet;
DAT_MEM_PRIV_FLAGS mem_priv;
DAT_RMR_CONTEXT rmr_context;
} DAT_RMR_PARAM;
@@ -1168,19 +1168,19 @@
typedef DAT_RETURN (*DAT_EP_DISCONNECT_FUNC) (DAT_EP_HANDLE, DAT_CLOSE_FLAGS);
typedef DAT_RETURN (*DAT_EP_POST_SEND_FUNC) (
- DAT_EP_HANDLE, DAT_COUNT, DAT_LMR_TRIPLET *, DAT_DTO_COOKIE,
+ DAT_EP_HANDLE, DAT_COUNT, struct dat_lmr_triplet *, DAT_DTO_COOKIE,
DAT_COMPLETION_FLAGS);
typedef DAT_RETURN (*DAT_EP_POST_RECV_FUNC) (
- DAT_EP_HANDLE, DAT_COUNT, DAT_LMR_TRIPLET *, DAT_DTO_COOKIE,
+ DAT_EP_HANDLE, DAT_COUNT, struct dat_lmr_triplet *, DAT_DTO_COOKIE,
DAT_COMPLETION_FLAGS);
typedef DAT_RETURN (*DAT_EP_POST_RDMA_READ_FUNC) (
- DAT_EP_HANDLE, DAT_COUNT, DAT_LMR_TRIPLET *, DAT_DTO_COOKIE,
+ DAT_EP_HANDLE, DAT_COUNT, struct dat_lmr_triplet *, DAT_DTO_COOKIE,
const DAT_RMR_TRIPLET *, DAT_COMPLETION_FLAGS);
typedef DAT_RETURN (*DAT_EP_POST_RDMA_WRITE_FUNC) (
- DAT_EP_HANDLE, DAT_COUNT, DAT_LMR_TRIPLET *, DAT_DTO_COOKIE,
+ DAT_EP_HANDLE, DAT_COUNT, struct dat_lmr_triplet *, DAT_DTO_COOKIE,
const DAT_RMR_TRIPLET *, DAT_COMPLETION_FLAGS);
typedef DAT_RETURN (*DAT_EP_GET_STATUS_FUNC) (
@@ -1201,17 +1201,17 @@
typedef DAT_RETURN (*DAT_LMR_QUERY_FUNC) (DAT_LMR_HANDLE, DAT_LMR_PARAM *);
typedef DAT_RETURN (*DAT_LMR_SYNC_RDMA_READ_FUNC) (
- DAT_IA_HANDLE, const DAT_LMR_TRIPLET *, DAT_VLEN);
+ DAT_IA_HANDLE, const struct dat_lmr_triplet *, DAT_VLEN);
typedef DAT_RETURN (*DAT_LMR_SYNC_RDMA_WRITE_FUNC) (
- DAT_IA_HANDLE, const DAT_LMR_TRIPLET *, DAT_VLEN);
+ DAT_IA_HANDLE, const struct dat_lmr_triplet *, DAT_VLEN);
typedef DAT_RETURN (*DAT_RMR_CREATE_FUNC) (DAT_PZ_HANDLE, DAT_RMR_HANDLE *);
typedef DAT_RETURN (*DAT_RMR_QUERY_FUNC) (DAT_RMR_HANDLE, DAT_RMR_PARAM *);
typedef DAT_RETURN (*DAT_RMR_BIND_FUNC) (
- DAT_RMR_HANDLE, const DAT_LMR_TRIPLET *, DAT_MEM_PRIV_FLAGS,
+ DAT_RMR_HANDLE, const struct dat_lmr_triplet *, DAT_MEM_PRIV_FLAGS,
DAT_EP_HANDLE, DAT_RMR_COOKIE, DAT_COMPLETION_FLAGS, DAT_RMR_CONTEXT *);
typedef DAT_RETURN (*DAT_RMR_FREE_FUNC) (DAT_RMR_HANDLE);
@@ -1254,7 +1254,7 @@
typedef DAT_RETURN (*DAT_SRQ_RESIZE_FUNC) (DAT_SRQ_HANDLE, DAT_COUNT);
typedef DAT_RETURN (*DAT_SRQ_POST_RECV_FUNC) (
- DAT_SRQ_HANDLE, DAT_COUNT, DAT_LMR_TRIPLET *, DAT_DTO_COOKIE);
+ DAT_SRQ_HANDLE, DAT_COUNT, struct dat_lmr_triplet *, DAT_DTO_COOKIE);
typedef DAT_RETURN (*DAT_LMR_KCREATE_FUNC) (
DAT_IA_HANDLE, DAT_MEM_TYPE, DAT_REGION_DESCRIPTION, DAT_VLEN,
@@ -1591,7 +1591,7 @@
static inline DAT_RETURN dat_ep_post_rdma_read(DAT_EP_HANDLE ep,
DAT_COUNT size,
- DAT_LMR_TRIPLET * local_iov,
+ struct dat_lmr_triplet *local_iov,
DAT_DTO_COOKIE cookie,
const DAT_RMR_TRIPLET * remote_iov,
DAT_COMPLETION_FLAGS flags)
@@ -1602,7 +1602,7 @@
static inline DAT_RETURN dat_ep_post_rdma_write(DAT_EP_HANDLE ep,
DAT_COUNT size,
- DAT_LMR_TRIPLET * local_iov,
+ struct dat_lmr_triplet *local_iov,
DAT_DTO_COOKIE cookie,
const DAT_RMR_TRIPLET * remote_iov,
DAT_COMPLETION_FLAGS flags)
@@ -1613,7 +1613,7 @@
static inline DAT_RETURN dat_ep_post_recv(DAT_EP_HANDLE ep,
DAT_COUNT size,
- DAT_LMR_TRIPLET * local_iov,
+ struct dat_lmr_triplet *local_iov,
DAT_DTO_COOKIE cookie,
DAT_COMPLETION_FLAGS flags)
{
@@ -1623,7 +1623,7 @@
static inline DAT_RETURN dat_ep_post_send(DAT_EP_HANDLE ep,
DAT_COUNT size,
- DAT_LMR_TRIPLET * local_iov,
+ struct dat_lmr_triplet *local_iov,
DAT_DTO_COOKIE cookie,
DAT_COMPLETION_FLAGS flags)
{
@@ -1668,7 +1668,7 @@
}
static inline DAT_RETURN dat_lmr_sync_rdma_read(DAT_IA_HANDLE ia,
- const DAT_LMR_TRIPLET * iovs,
+ const struct dat_lmr_triplet *iovs,
DAT_VLEN num_iovs)
{
return DAT_CALL_PROVIDER_FUNC(
@@ -1676,7 +1676,7 @@
}
static inline DAT_RETURN dat_lmr_sync_rdma_write(DAT_IA_HANDLE ia,
- const DAT_LMR_TRIPLET * iovs,
+ const struct dat_lmr_triplet *iovs,
DAT_VLEN num_iovs)
{
return DAT_CALL_PROVIDER_FUNC(
@@ -1694,7 +1694,7 @@
}
static inline DAT_RETURN dat_rmr_bind(DAT_RMR_HANDLE rmr,
- const DAT_LMR_TRIPLET * iov,
+ const struct dat_lmr_triplet *iov,
DAT_MEM_PRIV_FLAGS mem_flags,
DAT_EP_HANDLE ep,
DAT_RMR_COOKIE cookie,
@@ -1790,7 +1790,7 @@
static inline DAT_RETURN dat_srq_post_recv(DAT_SRQ_HANDLE srq,
DAT_COUNT num_iovs,
- DAT_LMR_TRIPLET * iovs,
+ struct dat_lmr_triplet *iovs,
DAT_DTO_COOKIE cookie)
{
return DAT_CALL_PROVIDER_FUNC(
diff -ur -X /home/tduffy/dontdiff linux-kernel2/dat-provider/dapl_ep_post_rdma_read.c linux-kernel3/dat-provider/dapl_ep_post_rdma_read.c
--- linux-kernel2/dat-provider/dapl_ep_post_rdma_read.c 2005-04-20 12:42:08.299025000 -0700
+++ linux-kernel3/dat-provider/dapl_ep_post_rdma_read.c 2005-05-09 11:37:00.776002000 -0700
@@ -69,7 +69,7 @@
DAT_RETURN
dapl_ep_post_rdma_read(DAT_EP_HANDLE ep_handle,
DAT_COUNT num_segments,
- DAT_LMR_TRIPLET * local_iov,
+ struct dat_lmr_triplet *local_iov,
DAT_DTO_COOKIE user_cookie,
const DAT_RMR_TRIPLET * remote_iov,
DAT_COMPLETION_FLAGS completion_flags)
diff -ur -X /home/tduffy/dontdiff linux-kernel2/dat-provider/dapl_ep_post_rdma_write.c linux-kernel3/dat-provider/dapl_ep_post_rdma_write.c
--- linux-kernel2/dat-provider/dapl_ep_post_rdma_write.c 2005-04-20 12:42:06.702005000 -0700
+++ linux-kernel3/dat-provider/dapl_ep_post_rdma_write.c 2005-05-09 11:37:10.118025000 -0700
@@ -69,7 +69,7 @@
DAT_RETURN
dapl_ep_post_rdma_write(DAT_EP_HANDLE ep_handle,
DAT_COUNT num_segments,
- DAT_LMR_TRIPLET * local_iov,
+ struct dat_lmr_triplet *local_iov,
DAT_DTO_COOKIE user_cookie,
const DAT_RMR_TRIPLET * remote_iov,
DAT_COMPLETION_FLAGS completion_flags)
diff -ur -X /home/tduffy/dontdiff linux-kernel2/dat-provider/dapl_ep_post_recv.c linux-kernel3/dat-provider/dapl_ep_post_recv.c
--- linux-kernel2/dat-provider/dapl_ep_post_recv.c 2005-04-27 11:38:35.803083000 -0700
+++ linux-kernel3/dat-provider/dapl_ep_post_recv.c 2005-05-09 11:37:22.915007000 -0700
@@ -69,7 +69,7 @@
DAT_RETURN
dapl_ep_post_recv(DAT_EP_HANDLE ep_handle,
DAT_COUNT num_segments,
- DAT_LMR_TRIPLET * local_iov,
+ struct dat_lmr_triplet *local_iov,
DAT_DTO_COOKIE user_cookie,
DAT_COMPLETION_FLAGS completion_flags)
{
diff -ur -X /home/tduffy/dontdiff linux-kernel2/dat-provider/dapl_ep_post_send.c linux-kernel3/dat-provider/dapl_ep_post_send.c
--- linux-kernel2/dat-provider/dapl_ep_post_send.c 2005-04-20 12:42:07.360001000 -0700
+++ linux-kernel3/dat-provider/dapl_ep_post_send.c 2005-05-09 11:37:33.432060000 -0700
@@ -66,7 +66,7 @@
DAT_RETURN
dapl_ep_post_send(DAT_EP_HANDLE ep_handle,
DAT_COUNT num_segments,
- DAT_LMR_TRIPLET * local_iov,
+ struct dat_lmr_triplet *local_iov,
DAT_DTO_COOKIE user_cookie,
DAT_COMPLETION_FLAGS completion_flags)
{
diff -ur -X /home/tduffy/dontdiff linux-kernel2/dat-provider/dapl_ep_util.c linux-kernel3/dat-provider/dapl_ep_util.c
--- linux-kernel2/dat-provider/dapl_ep_util.c 2005-05-04 08:19:32.791989000 -0700
+++ linux-kernel3/dat-provider/dapl_ep_util.c 2005-05-09 11:37:43.486003000 -0700
@@ -287,7 +287,7 @@
DAT_RETURN
dapl_ep_post_send_req(DAT_EP_HANDLE ep_handle,
DAT_COUNT num_segments,
- DAT_LMR_TRIPLET * local_iov,
+ struct dat_lmr_triplet *local_iov,
DAT_DTO_COOKIE user_cookie,
const DAT_RMR_TRIPLET * remote_iov,
DAT_COMPLETION_FLAGS completion_flags,
diff -ur -X /home/tduffy/dontdiff linux-kernel2/dat-provider/dapl_ep_util.h linux-kernel3/dat-provider/dapl_ep_util.h
--- linux-kernel2/dat-provider/dapl_ep_util.h 2005-04-20 12:42:08.254017000 -0700
+++ linux-kernel3/dat-provider/dapl_ep_util.h 2005-05-09 11:37:53.155002000 -0700
@@ -55,7 +55,7 @@
extern DAT_RETURN
dapl_ep_post_send_req(DAT_EP_HANDLE ep_handle,
DAT_COUNT num_segments,
- DAT_LMR_TRIPLET * local_iov,
+ struct dat_lmr_triplet *local_iov,
DAT_DTO_COOKIE user_cookie,
const DAT_RMR_TRIPLET * remote_iov,
DAT_COMPLETION_FLAGS completion_flags,
diff -ur -X /home/tduffy/dontdiff linux-kernel2/dat-provider/dapl.h linux-kernel3/dat-provider/dapl.h
--- linux-kernel2/dat-provider/dapl.h 2005-05-09 11:15:26.428002000 -0700
+++ linux-kernel3/dat-provider/dapl.h 2005-05-09 11:34:28.653042000 -0700
@@ -591,26 +591,26 @@
extern DAT_RETURN dapl_ep_post_send(DAT_EP_HANDLE, /* ep_handle */
DAT_COUNT, /* num_segments */
- DAT_LMR_TRIPLET *, /* local_iov */
+ struct dat_lmr_triplet *, /* local_iov */
DAT_DTO_COOKIE, /* user_cookie */
DAT_COMPLETION_FLAGS); /* completion_flags */
extern DAT_RETURN dapl_ep_post_recv(DAT_EP_HANDLE, /* ep_handle */
DAT_COUNT, /* num_segments */
- DAT_LMR_TRIPLET *, /* local_iov */
+ struct dat_lmr_triplet *, /* local_iov */
DAT_DTO_COOKIE, /* user_cookie */
DAT_COMPLETION_FLAGS); /* completion_flags */
extern DAT_RETURN dapl_ep_post_rdma_read(DAT_EP_HANDLE, /* ep_handle */
DAT_COUNT, /* num_segments */
- DAT_LMR_TRIPLET *, /* local_iov */
+ struct dat_lmr_triplet *, /* local_iov */
DAT_DTO_COOKIE, /* user_cookie */
const DAT_RMR_TRIPLET *, /* remote_iov */
DAT_COMPLETION_FLAGS); /* completion_flags */
extern DAT_RETURN dapl_ep_post_rdma_write(DAT_EP_HANDLE, /* ep_handle */
DAT_COUNT, /* num_segments */
- DAT_LMR_TRIPLET *, /* local_iov */
+ struct dat_lmr_triplet *, /* local_iov */
DAT_DTO_COOKIE, /* user_cookie */
const DAT_RMR_TRIPLET *, /* remote_iov */
DAT_COMPLETION_FLAGS); /* completion_flags */
@@ -661,11 +661,11 @@
extern DAT_RETURN dapl_lmr_free(DAT_LMR_HANDLE);
extern DAT_RETURN dapl_lmr_sync_rdma_read(DAT_IA_HANDLE, /* ia_handle */
- const DAT_LMR_TRIPLET *, /* local_segments */
+ const struct dat_lmr_triplet *, /* local_segments */
DAT_VLEN); /* num_segments */
extern DAT_RETURN dapl_lmr_sync_rdma_write(DAT_IA_HANDLE, /* ia_handle */
- const DAT_LMR_TRIPLET *, /* local_segments */
+ const struct dat_lmr_triplet *, /* local_segments */
DAT_VLEN); /* num_segments */
/* RMR Functions */
@@ -677,7 +677,7 @@
DAT_RMR_PARAM *); /* rmr_args */
extern DAT_RETURN dapl_rmr_bind(DAT_RMR_HANDLE, /* rmr_handle */
- const DAT_LMR_TRIPLET *, /* lmr_triplet */
+ const struct dat_lmr_triplet *, /* lmr_triplet */
DAT_MEM_PRIV_FLAGS, /* mem_priv */
DAT_EP_HANDLE, /* ep_handle */
DAT_RMR_COOKIE, /* user_cookie */
@@ -737,7 +737,7 @@
extern DAT_RETURN dapl_srq_post_recv(DAT_SRQ_HANDLE, /* srq_handle */
DAT_COUNT, /* num_segments */
- DAT_LMR_TRIPLET *, /* local_iov */
+ struct dat_lmr_triplet *, /* local_iov */
DAT_DTO_COOKIE); /* user_cookie */
extern DAT_RETURN dapl_srq_query(DAT_SRQ_HANDLE, /* srq_handle */
diff -ur -X /home/tduffy/dontdiff linux-kernel2/dat-provider/dapl_lmr_sync_rdma_read.c linux-kernel3/dat-provider/dapl_lmr_sync_rdma_read.c
--- linux-kernel2/dat-provider/dapl_lmr_sync_rdma_read.c 2005-04-20 12:42:06.609025000 -0700
+++ linux-kernel3/dat-provider/dapl_lmr_sync_rdma_read.c 2005-05-09 11:38:23.940013000 -0700
@@ -58,7 +58,7 @@
*/
DAT_RETURN
dapl_lmr_sync_rdma_read(DAT_IA_HANDLE ia_handle,
- const DAT_LMR_TRIPLET * local_segments,
+ const struct dat_lmr_triplet *local_segments,
DAT_VLEN num_segments)
{
DAPL_IA *ia_ptr;
diff -ur -X /home/tduffy/dontdiff linux-kernel2/dat-provider/dapl_lmr_sync_rdma_write.c linux-kernel3/dat-provider/dapl_lmr_sync_rdma_write.c
--- linux-kernel2/dat-provider/dapl_lmr_sync_rdma_write.c 2005-04-20 12:42:08.144018000 -0700
+++ linux-kernel3/dat-provider/dapl_lmr_sync_rdma_write.c 2005-05-09 11:38:36.655003000 -0700
@@ -43,7 +43,7 @@
*/
DAT_RETURN
dapl_lmr_sync_rdma_write(DAT_IA_HANDLE ia_handle,
- const DAT_LMR_TRIPLET * local_segments,
+ const struct dat_lmr_triplet *local_segments,
DAT_VLEN num_segments)
{
DAPL_IA *ia_ptr;
diff -ur -X /home/tduffy/dontdiff linux-kernel2/dat-provider/dapl_openib_dto.h linux-kernel3/dat-provider/dapl_openib_dto.h
--- linux-kernel2/dat-provider/dapl_openib_dto.h 2005-05-09 11:07:01.719014000 -0700
+++ linux-kernel3/dat-provider/dapl_openib_dto.h 2005-05-09 11:38:52.342013000 -0700
@@ -53,7 +53,7 @@
static __inline__ DAT_RETURN
dapl_ib_post_recv(DAPL_EP * ep_ptr,
DAPL_COOKIE * cookie,
- DAT_COUNT num_segments, DAT_LMR_TRIPLET * local_iov)
+ DAT_COUNT num_segments, struct dat_lmr_triplet *local_iov)
{
struct ib_recv_wr rr_desc = { NULL };
struct ib_recv_wr *rr_desc_fail;
@@ -105,7 +105,7 @@
int op_type,
DAPL_COOKIE * cookie,
DAT_COUNT num_segments,
- DAT_LMR_TRIPLET * local_iov,
+ struct dat_lmr_triplet *local_iov,
const DAT_RMR_TRIPLET * remote_iov,
DAT_COMPLETION_FLAGS completion_flags)
{
diff -ur -X /home/tduffy/dontdiff linux-kernel2/dat-provider/dapl_rmr_bind.c linux-kernel3/dat-provider/dapl_rmr_bind.c
--- linux-kernel2/dat-provider/dapl_rmr_bind.c 2005-04-27 11:38:35.313024000 -0700
+++ linux-kernel3/dat-provider/dapl_rmr_bind.c 2005-05-09 11:39:36.436004000 -0700
@@ -48,7 +48,7 @@
static __inline__ DAT_RETURN
dapl_rmr_bind_fuse(DAPL_RMR * rmr,
- const DAT_LMR_TRIPLET * lmr_triplet,
+ const struct dat_lmr_triplet *lmr_triplet,
DAT_MEM_PRIV_FLAGS mem_priv,
DAPL_EP * ep_ptr,
DAT_RMR_COOKIE user_cookie,
@@ -69,7 +69,7 @@
DAT_RETURN
dapl_rmr_bind_fuse(DAPL_RMR * rmr,
- const DAT_LMR_TRIPLET * lmr_triplet,
+ const struct dat_lmr_triplet *lmr_triplet,
DAT_MEM_PRIV_FLAGS mem_priv,
DAPL_EP * ep_ptr,
DAT_RMR_COOKIE user_cookie,
@@ -291,7 +291,7 @@
*/
DAT_RETURN
dapl_rmr_bind(DAT_RMR_HANDLE rmr_handle,
- const DAT_LMR_TRIPLET * lmr_triplet,
+ const struct dat_lmr_triplet *lmr_triplet,
DAT_MEM_PRIV_FLAGS mem_priv,
DAT_EP_HANDLE ep_handle,
DAT_RMR_COOKIE user_cookie,
diff -ur -X /home/tduffy/dontdiff linux-kernel2/dat-provider/dapl_srq_post_recv.c linux-kernel3/dat-provider/dapl_srq_post_recv.c
--- linux-kernel2/dat-provider/dapl_srq_post_recv.c 2005-04-27 11:38:35.467007000 -0700
+++ linux-kernel3/dat-provider/dapl_srq_post_recv.c 2005-05-09 11:39:54.162012000 -0700
@@ -70,7 +70,8 @@
DAT_RETURN
dapl_srq_post_recv(DAT_SRQ_HANDLE srq_handle,
DAT_COUNT num_segments,
- DAT_LMR_TRIPLET * local_iov, DAT_DTO_COOKIE user_cookie)
+ struct dat_lmr_triplet *local_iov,
+ DAT_DTO_COOKIE user_cookie)
{
DAPL_SRQ *srq_ptr;
DAPL_COOKIE *cookie;
diff -ur -X /home/tduffy/dontdiff linux-kernel2/test/dapltest/include/dapl_bpool.h linux-kernel3/test/dapltest/include/dapl_bpool.h
--- linux-kernel2/test/dapltest/include/dapl_bpool.h 2005-05-05 13:50:25.453960000 -0700
+++ linux-kernel3/test/dapltest/include/dapl_bpool.h 2005-05-09 11:42:16.577006000 -0700
@@ -35,25 +35,24 @@
* struct Bpool
*/
-struct Bpool_tag
-{
- unsigned char *alloc_ptr;
- uint32_t alloc_size;
- DAT_PZ_HANDLE pz_handle;
- DAT_COUNT seg_size;
- DAT_COUNT num_segs; /* num segments */
- unsigned char *buffer_start; /* Start of buffer area */
- DAT_VLEN buffer_size; /* Size of data buffer (rounded) */
- DAT_VADDR reg_addr; /* start of registered area */
- DAT_VLEN reg_size; /* size of registered area */
- DAT_EP_HANDLE ep_handle; /* EP area is registered to */
- DAT_LMR_HANDLE lmr_handle; /* local access */
- DAT_LMR_CONTEXT lmr_context;
- DAT_LMR_TRIPLET*tripl_start; /* local IOV */
- DAT_BOOLEAN enable_rdma_write; /* remote access */
- DAT_BOOLEAN enable_rdma_read;
- DAT_RMR_HANDLE rmr_handle;
- DAT_RMR_CONTEXT rmr_context;
- DAT_EVD_HANDLE rmr_evd_handle;
+struct Bpool_tag {
+ unsigned char *alloc_ptr;
+ uint32_t alloc_size;
+ DAT_PZ_HANDLE pz_handle;
+ DAT_COUNT seg_size;
+ DAT_COUNT num_segs; /* num segments */
+ unsigned char *buffer_start; /* Start of buffer area */
+ DAT_VLEN buffer_size; /* Size of data buffer (rounded) */
+ DAT_VADDR reg_addr; /* start of registered area */
+ DAT_VLEN reg_size; /* size of registered area */
+ DAT_EP_HANDLE ep_handle; /* EP area is registered to */
+ DAT_LMR_HANDLE lmr_handle; /* local access */
+ DAT_LMR_CONTEXT lmr_context;
+ struct dat_lmr_triplet *tripl_start; /* local IOV */
+ DAT_BOOLEAN enable_rdma_write; /* remote access */
+ DAT_BOOLEAN enable_rdma_read;
+ DAT_RMR_HANDLE rmr_handle;
+ DAT_RMR_CONTEXT rmr_context;
+ DAT_EVD_HANDLE rmr_evd_handle;
};
#endif
diff -ur -X /home/tduffy/dontdiff linux-kernel2/test/dapltest/include/dapl_proto.h linux-kernel3/test/dapltest/include/dapl_proto.h
--- linux-kernel2/test/dapltest/include/dapl_proto.h 2005-05-06 16:22:25.178003000 -0700
+++ linux-kernel3/test/dapltest/include/dapl_proto.h 2005-05-09 11:34:28.736009000 -0700
@@ -98,7 +98,7 @@
unsigned char *DT_Bpool_GetBuffer (Bpool * bpool_ptr, int index);
DAT_VADDR DT_Bpool_GetRegBuff (Bpool * bpool_ptr, int index);
DAT_COUNT DT_Bpool_GetBuffSize (Bpool * bpool_ptr, int index);
-DAT_LMR_TRIPLET *DT_Bpool_GetIOV (Bpool * bpool_ptr, int index);
+struct dat_lmr_triplet *DT_Bpool_GetIOV (Bpool * bpool_ptr, int index);
DAT_LMR_CONTEXT DT_Bpool_GetLMR (Bpool * bpool_ptr, int index);
DAT_RMR_CONTEXT DT_Bpool_GetRMR (Bpool * bpool_ptr, int index);
diff -ur -X /home/tduffy/dontdiff linux-kernel2/test/dapltest/test/dapl_bpool.c linux-kernel3/test/dapltest/test/dapl_bpool.c
--- linux-kernel2/test/dapltest/test/dapl_bpool.c 2005-05-05 13:45:32.607002000 -0700
+++ linux-kernel3/test/dapltest/test/dapl_bpool.c 2005-05-09 11:34:28.741036000 -0700
@@ -120,7 +120,7 @@
goto err;
}
- bpool_size = sizeof (Bpool) + num_segs * sizeof (DAT_LMR_TRIPLET);
+ bpool_size = sizeof (Bpool) + num_segs * sizeof (struct dat_lmr_triplet);
bpool_ptr = (Bpool *) DT_MemListAlloc (pt_ptr, "bpool", BPOOL, bpool_size);
if (!bpool_ptr)
@@ -136,7 +136,7 @@
bpool_ptr->ep_handle = ep_handle;
bpool_ptr->buffer_size = seg_size * num_segs;
bpool_ptr->buffer_start = DT_AlignPtr (alloc_ptr, alignment) + GG_ALLOC_OFFSET;
- bpool_ptr->tripl_start = (DAT_LMR_TRIPLET *) (bpool_ptr + 1);
+ bpool_ptr->tripl_start = (struct dat_lmr_triplet *) (bpool_ptr + 1);
bpool_ptr->seg_size = seg_size;
bpool_ptr->enable_rdma_write = enable_rdma_write;
bpool_ptr->enable_rdma_read = enable_rdma_read;
@@ -207,7 +207,7 @@
#endif
if (enable_rdma_write || enable_rdma_read)
{
- DAT_LMR_TRIPLET iov;
+ struct dat_lmr_triplet iov;
DAT_RMR_COOKIE cookie;
DAT_MEM_PRIV_FLAGS mflags;
DAT_RMR_BIND_COMPLETION_EVENT_DATA rmr_stat;
@@ -326,7 +326,7 @@
{
if (bpool_ptr->rmr_handle)
{
- DAT_LMR_TRIPLET iov;
+ struct dat_lmr_triplet iov;
DAT_RMR_COOKIE cookie;
DAT_RETURN ret;
@@ -399,7 +399,7 @@
}
/*****************************************************************************/
-DAT_LMR_TRIPLET *
+struct dat_lmr_triplet *
DT_Bpool_GetIOV (Bpool * bpool_ptr, int index)
{
return ( bpool_ptr->tripl_start + index );
diff -ur -X /home/tduffy/dontdiff linux-kernel2/test/dapltest/test/dapl_limit.c linux-kernel3/test/dapltest/test/dapl_limit.c
--- linux-kernel2/test/dapltest/test/dapl_limit.c 2005-05-05 13:45:32.614001000 -0700
+++ linux-kernel3/test/dapltest/test/dapl_limit.c 2005-05-09 11:44:35.444001000 -0700
@@ -1011,7 +1011,7 @@
* but that should be OK.
*/
unsigned int count = START_COUNT;
- DAT_LMR_TRIPLET *hdlptr = (DAT_LMR_TRIPLET *)
+ struct dat_lmr_triplet *hdlptr = (struct dat_lmr_triplet *)
DT_Mdep_Malloc (count * cmd->width * sizeof (*hdlptr));
/* Recv-Post Exhaustion test loop */
@@ -1042,7 +1042,7 @@
}
for (i = 0; i < cmd->width; i++)
{
- DAT_LMR_TRIPLET *iovp = &hdlptr[w * cmd->width + i];
+ struct dat_lmr_triplet *iovp = &hdlptr[w * cmd->width + i];
DAT_DTO_COOKIE cookie;
iovp->virtual_address = (DAT_VADDR) (uintptr_t)
diff -ur -X /home/tduffy/dontdiff linux-kernel2/test/dapltest/test/dapl_performance_client.c linux-kernel3/test/dapltest/test/dapl_performance_client.c
--- linux-kernel2/test/dapltest/test/dapl_performance_client.c 2005-05-05 09:42:06.336001000 -0700
+++ linux-kernel3/test/dapltest/test/dapl_performance_client.c 2005-05-09 11:45:05.677016000 -0700
@@ -252,7 +252,7 @@
Performance_Test_t *test_ptr,
Performance_Stats_t *stats )
{
- DAT_LMR_TRIPLET *iov;
+ struct dat_lmr_triplet *iov;
DAT_RMR_TRIPLET rmr_triplet;
DAT_DTO_COOKIE cookie;
DAT_EVENT event;
diff -ur -X /home/tduffy/dontdiff linux-kernel2/test/dapltest/test/dapl_performance_util.c linux-kernel3/test/dapltest/test/dapl_performance_util.c
--- linux-kernel2/test/dapltest/test/dapl_performance_util.c 2005-05-05 13:35:54.404000000 -0700
+++ linux-kernel3/test/dapltest/test/dapl_performance_util.c 2005-05-09 11:45:34.287003000 -0700
@@ -429,7 +429,7 @@
DAT_DTO_COOKIE cookie;
DAT_RETURN ret;
Performance_Test_Op_t *op = &ep_context->op;
- DAT_LMR_TRIPLET *iov = DT_Bpool_GetIOV (op->bp, 0);
+ struct dat_lmr_triplet *iov = DT_Bpool_GetIOV(op->bp, 0);
DAT_RMR_TRIPLET rmr_triplet;
bytes = op->seg_size * op->num_segs;
diff -ur -X /home/tduffy/dontdiff linux-kernel2/test/dapltest/test/dapl_test_util.c linux-kernel3/test/dapltest/test/dapl_test_util.c
--- linux-kernel2/test/dapltest/test/dapl_test_util.c 2005-05-05 13:45:32.619003000 -0700
+++ linux-kernel3/test/dapltest/test/dapl_test_util.c 2005-05-09 11:45:59.822013000 -0700
@@ -166,7 +166,7 @@
int size)
{
unsigned char *buff = DT_Bpool_GetBuffer (bp, index);
- DAT_LMR_TRIPLET *iov = DT_Bpool_GetIOV (bp, index);
+ struct dat_lmr_triplet *iov = DT_Bpool_GetIOV(bp, index);
DAT_LMR_CONTEXT lmr_c = DT_Bpool_GetLMR (bp, index);
DAT_DTO_COOKIE cookie;
DAT_RETURN ret;
@@ -211,7 +211,7 @@
int size)
{
unsigned char *buff = DT_Bpool_GetBuffer (bp, index);
- DAT_LMR_TRIPLET *iov = DT_Bpool_GetIOV (bp, index);
+ struct dat_lmr_triplet *iov = DT_Bpool_GetIOV(bp, index);
DAT_LMR_CONTEXT lmr_c = DT_Bpool_GetLMR (bp, index);
DAT_DTO_COOKIE cookie;
DAT_RETURN ret;
diff -ur -X /home/tduffy/dontdiff linux-kernel2/test/dapltest/test/dapl_transaction_util.c linux-kernel3/test/dapltest/test/dapl_transaction_util.c
--- linux-kernel2/test/dapltest/test/dapl_transaction_util.c 2005-05-05 13:45:32.630004000 -0700
+++ linux-kernel3/test/dapltest/test/dapl_transaction_util.c 2005-05-09 11:46:47.629003000 -0700
@@ -41,7 +41,7 @@
for (i = 0; i < num_eps; i++)
{
Transaction_Test_Op_t *op = &ep_context[i].op[op_indx];
- DAT_LMR_TRIPLET *iov = DT_Bpool_GetIOV (op->bp, 0);
+ struct dat_lmr_triplet *iov = DT_Bpool_GetIOV(op->bp, 0);
DAT_DTO_COOKIE cookie;
DAT_RETURN ret;
@@ -103,7 +103,7 @@
for (i = 0; i < num_eps; i++)
{
Transaction_Test_Op_t *op = &ep_context[i].op[op_indx];
- DAT_LMR_TRIPLET *iov = DT_Bpool_GetIOV (op->bp, 0);
+ struct dat_lmr_triplet *iov = DT_Bpool_GetIOV(op->bp, 0);
DAT_DTO_COOKIE cookie;
DAT_RETURN ret;
@@ -484,7 +484,7 @@
for (i = 0; i < num_eps; i++)
{
Transaction_Test_Op_t *op = &ep_context[i].op[op_indx];
- DAT_LMR_TRIPLET *iov = DT_Bpool_GetIOV (op->bp, 0);
+ struct dat_lmr_triplet *iov = DT_Bpool_GetIOV (op->bp, 0);
DAT_DTO_COOKIE cookie;
DAT_RMR_TRIPLET rmr_triplet;
More information about the general
mailing list