[openib-general] Re: [PATCH] kDAPL: remove use of DAT_COUNT
James Lentini
jlentini at netapp.com
Fri May 13 10:11:50 PDT 2005
Committed in revision 2335.
On Thu, 12 May 2005, Tom Duffy wrote:
tduffy> Remove DAT_COUNT, just use int.
tduffy>
tduffy> Plus a few whitespace fixes thrown in for good measure. I am trying to
tduffy> clean these things up as I see them.
tduffy>
tduffy> Signed-off-by: Tom Duffy <tduffy at sun.com>
tduffy>
tduffy> Index: linux-kernel/test/dapltest/test/dapl_performance_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/test/dapl_performance_util.c (revision 2321)
tduffy> +++ linux-kernel/test/dapltest/test/dapl_performance_util.c (working copy)
tduffy> @@ -40,7 +40,7 @@ DT_Performance_Test_Create (
tduffy> Performance_Test_t **perf_test)
tduffy> {
tduffy> Performance_Test_t *test_ptr;
tduffy> - DAT_COUNT pipeline_len;
tduffy> + int pipeline_len;
tduffy> u32 ret;
tduffy> DT_Tdep_Print_Head *phead;
tduffy>
tduffy> @@ -523,8 +523,8 @@ DT_performance_wait (
tduffy> DAT_EVD_HANDLE evd_handle,
tduffy> Performance_Stats_t *stats)
tduffy> {
tduffy> - DAT_COUNT i;
tduffy> - DAT_COUNT queue_size;
tduffy> + int i;
tduffy> + int queue_size;
tduffy> u32 ret;
tduffy> struct dat_event event;
tduffy> unsigned long pre_ctxt_num;
tduffy> Index: linux-kernel/test/dapltest/test/dapl_limit.c
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/test/dapl_limit.c (revision 2321)
tduffy> +++ linux-kernel/test/dapltest/test/dapl_limit.c (working copy)
tduffy> @@ -1122,8 +1122,8 @@ limit_test ( DT_Tdep_Print_Head *phead,
tduffy> */
tduffy> if (depth == LIM_SIZE_LMR)
tduffy> {
tduffy> - DAT_COUNT last_size = 0;
tduffy> - DAT_COUNT test_size = DFLT_BUFFSZ;
tduffy> + int last_size = 0;
tduffy> + int test_size = DFLT_BUFFSZ;
tduffy> Bpool *test_bpool;
tduffy> for (;;)
tduffy> {
tduffy> Index: linux-kernel/test/dapltest/test/dapl_transaction_test.c
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/test/dapl_transaction_test.c (revision 2321)
tduffy> +++ linux-kernel/test/dapltest/test/dapl_transaction_test.c (working copy)
tduffy> @@ -742,7 +742,7 @@ retry:
tduffy> */
tduffy> {
tduffy> struct dat_event event;
tduffy> - DAT_COUNT drained = 0;
tduffy> + int drained = 0;
tduffy>
tduffy> dat_ep_reset (test_ptr->ep_context[i].ep_handle);
tduffy> do
tduffy> Index: linux-kernel/test/dapltest/test/dapl_bpool.c
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/test/dapl_bpool.c (revision 2321)
tduffy> +++ linux-kernel/test/dapltest/test/dapl_bpool.c (working copy)
tduffy> @@ -90,16 +90,16 @@ DT_BpoolAlloc (
tduffy> DAT_PZ_HANDLE pz_handle,
tduffy> DAT_EP_HANDLE ep_handle,
tduffy> DAT_EVD_HANDLE rmr_evd_handle,
tduffy> - DAT_COUNT seg_size,
tduffy> - DAT_COUNT num_segs,
tduffy> - DAT_COUNT alignment,
tduffy> + int seg_size,
tduffy> + int num_segs,
tduffy> + int alignment,
tduffy> boolean_t enable_rdma_write,
tduffy> boolean_t enable_rdma_read)
tduffy> {
tduffy> unsigned char *module = "DT_BpoolAlloc";
tduffy> unsigned char *alloc_ptr = NULL;
tduffy> Bpool *bpool_ptr = NULL;
tduffy> - DAT_COUNT alloc_size, bpool_size;
tduffy> + int alloc_size, bpool_size;
tduffy> DAT_REGION_DESCRIPTION region;
tduffy> u32 ret = DAT_SUCCESS;
tduffy> DAT_VLEN bp_len;
tduffy> @@ -392,7 +392,7 @@ DT_Bpool_GetRegBuff (Bpool * bpool_ptr,
tduffy> }
tduffy>
tduffy> /*****************************************************************************/
tduffy> -DAT_COUNT
tduffy> +int
tduffy> DT_Bpool_GetBuffSize (Bpool * bpool_ptr, int index)
tduffy> {
tduffy> return ( bpool_ptr->seg_size );
tduffy> Index: linux-kernel/test/dapltest/test/dapl_test_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/test/dapl_test_util.c (revision 2321)
tduffy> +++ linux-kernel/test/dapltest/test/dapl_test_util.c (working copy)
tduffy> @@ -573,7 +573,7 @@ boolean_t
tduffy> DT_dto_check ( DT_Tdep_Print_Head *phead,
tduffy> struct dat_dto_completion_event_data *dto_p,
tduffy> DAT_EP_HANDLE ep_expected,
tduffy> - DAT_COUNT len_expected,
tduffy> + int len_expected,
tduffy> DAT_DTO_COOKIE cookie_expected,
tduffy> char *message )
tduffy> {
tduffy> Index: linux-kernel/test/dapltest/test/dapl_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/test/dapl_util.c (revision 2321)
tduffy> +++ linux-kernel/test/dapltest/test/dapl_util.c (working copy)
tduffy> @@ -189,7 +189,7 @@ DT_State2Str (DAT_EP_STATE state_code)
tduffy> * and do the correct thing if align == 0.
tduffy> */
tduffy> unsigned char *
tduffy> -DT_AlignPtr (void * val, DAT_COUNT align)
tduffy> +DT_AlignPtr (void * val, int align)
tduffy> {
tduffy> if (align)
tduffy> {
tduffy> @@ -199,8 +199,8 @@ DT_AlignPtr (void * val, DAT_COUNT align
tduffy> return (val);
tduffy> }
tduffy>
tduffy> -DAT_COUNT
tduffy> -DT_RoundSize (DAT_COUNT val, DAT_COUNT align)
tduffy> +int
tduffy> +DT_RoundSize (int val, int align)
tduffy> {
tduffy> if (align)
tduffy> {
tduffy> Index: linux-kernel/test/dapltest/test/dapl_client.c
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/test/dapl_client.c (revision 2321)
tduffy> +++ linux-kernel/test/dapltest/test/dapl_client.c (working copy)
tduffy> @@ -276,7 +276,7 @@ retry:
tduffy> if ( event_num == DAT_CONNECTION_EVENT_PEER_REJECTED )
tduffy> {
tduffy> struct dat_event event;
tduffy> - DAT_COUNT drained = 0;
tduffy> + int drained = 0;
tduffy>
tduffy> DT_Mdep_Sleep (1000);
tduffy> DT_Tdep_PT_Printf (phead,
tduffy> Index: linux-kernel/test/dapltest/include/dapl_tdep.h
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/include/dapl_tdep.h (revision 2321)
tduffy> +++ linux-kernel/test/dapltest/include/dapl_tdep.h (working copy)
tduffy> @@ -46,7 +46,7 @@ DT_Tdep_Execute_Test ( Params_t *params_
tduffy>
tduffy> u32
tduffy> DT_Tdep_evd_create (DAT_IA_HANDLE ia_handle,
tduffy> - DAT_COUNT evd_min_qlen,
tduffy> + int evd_min_qlen,
tduffy> DAT_CNO_HANDLE cno_handle,
tduffy> DAT_EVD_FLAGS evd_flags,
tduffy> DAT_EVD_HANDLE *evd_handle_ptr);
tduffy> Index: linux-kernel/test/dapltest/include/dapl_global.h
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/include/dapl_global.h (revision 2321)
tduffy> +++ linux-kernel/test/dapltest/include/dapl_global.h (working copy)
tduffy> @@ -30,7 +30,7 @@
tduffy>
tduffy> #include "dapl_proto.h"
tduffy>
tduffy> -extern DAT_COUNT DT_dapltest_debug;
tduffy> +extern int DT_dapltest_debug;
tduffy> extern boolean_t DT_local_is_little_endian;
tduffy>
tduffy> #endif
tduffy> Index: linux-kernel/test/dapltest/include/dapl_performance_test.h
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/include/dapl_performance_test.h (revision 2321)
tduffy> +++ linux-kernel/test/dapltest/include/dapl_performance_test.h (working copy)
tduffy> @@ -57,7 +57,7 @@ typedef struct
tduffy> DAT_EP_HANDLE ep_handle;
tduffy> struct dat_ep_attr ep_attr;
tduffy> DAT_CONN_QUAL port;
tduffy> - DAT_COUNT pipeline_len;
tduffy> + int pipeline_len;
tduffy> Bpool *bp;
tduffy> Performance_Test_Op_t op;
tduffy> } Performance_Ep_Context_t;
tduffy> @@ -73,13 +73,13 @@ typedef struct
tduffy> DAT_IA_HANDLE ia_handle;
tduffy> DAT_PZ_HANDLE pz_handle;
tduffy> DAT_CNO_HANDLE cno_handle;
tduffy> - DAT_COUNT reqt_evd_length;
tduffy> + int reqt_evd_length;
tduffy> DAT_EVD_HANDLE reqt_evd_hdl; /* request+rmr */
tduffy> - DAT_COUNT recv_evd_length;
tduffy> + int recv_evd_length;
tduffy> DAT_EVD_HANDLE recv_evd_hdl; /* receive */
tduffy> - DAT_COUNT conn_evd_length;
tduffy> + int conn_evd_length;
tduffy> DAT_EVD_HANDLE conn_evd_hdl; /* connect */
tduffy> - DAT_COUNT creq_evd_length;
tduffy> + int creq_evd_length;
tduffy> DAT_EVD_HANDLE creq_evd_hdl; /* "" request */
tduffy> Performance_Ep_Context_t ep_context;
tduffy> } Performance_Test_t;
tduffy> Index: linux-kernel/test/dapltest/include/dapl_proto.h
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/include/dapl_proto.h (revision 2321)
tduffy> +++ linux-kernel/test/dapltest/include/dapl_proto.h (working copy)
tduffy> @@ -85,9 +85,9 @@ Bpool * DT_BpoolAlloc (Per_Test_
tduffy> DAT_PZ_HANDLE pz_handle,
tduffy> DAT_EP_HANDLE ep_handle,
tduffy> DAT_EVD_HANDLE rmr_evd_handle,
tduffy> - DAT_COUNT seg_size,
tduffy> - DAT_COUNT num_segs,
tduffy> - DAT_COUNT alignment,
tduffy> + int seg_size,
tduffy> + int num_segs,
tduffy> + int alignment,
tduffy> boolean_t enable_rdma_write,
tduffy> boolean_t enable_rdma_read);
tduffy>
tduffy> @@ -97,7 +97,7 @@ boolean_t DT_Bpool_Destroy (P
tduffy>
tduffy> unsigned char *DT_Bpool_GetBuffer (Bpool * bpool_ptr, int index);
tduffy> DAT_VADDR DT_Bpool_GetRegBuff (Bpool * bpool_ptr, int index);
tduffy> -DAT_COUNT DT_Bpool_GetBuffSize (Bpool * bpool_ptr, int index);
tduffy> +int DT_Bpool_GetBuffSize (Bpool * bpool_ptr, int index);
tduffy> struct dat_lmr_triplet *DT_Bpool_GetIOV (Bpool * bpool_ptr, int index);
tduffy> DAT_LMR_CONTEXT DT_Bpool_GetLMR (Bpool * bpool_ptr, int index);
tduffy> DAT_RMR_CONTEXT DT_Bpool_GetRMR (Bpool * bpool_ptr, int index);
tduffy> @@ -398,7 +398,7 @@ boolean_t DT_rmr_event_wait (
tduffy> boolean_t DT_dto_check ( DT_Tdep_Print_Head* phead,
tduffy> struct dat_dto_completion_event_data *dto_p,
tduffy> DAT_EP_HANDLE ep_expected,
tduffy> - DAT_COUNT len_expected,
tduffy> + int len_expected,
tduffy> DAT_DTO_COOKIE cookie_expected,
tduffy> char *message);
tduffy>
tduffy> @@ -537,9 +537,9 @@ DAT_QOS DT_ParseQoS (char *arg);
tduffy>
tduffy> DAT_MEM_TYPE DT_ParseMemType (char *arg);
tduffy>
tduffy> -unsigned char *DT_AlignPtr (void * val, DAT_COUNT align);
tduffy> +unsigned char *DT_AlignPtr (void * val, int align);
tduffy>
tduffy> -DAT_COUNT DT_RoundSize (DAT_COUNT val, DAT_COUNT align);
tduffy> +int DT_RoundSize (int val, int align);
tduffy>
tduffy> /* dapl_limit_cmd.c */
tduffy> void DT_Limit_Cmd_Init ( Limit_Cmd_t * cmd);
tduffy> Index: linux-kernel/test/dapltest/include/dapl_bpool.h
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/include/dapl_bpool.h (revision 2321)
tduffy> +++ linux-kernel/test/dapltest/include/dapl_bpool.h (working copy)
tduffy> @@ -39,8 +39,8 @@ struct Bpool_tag {
tduffy> unsigned char *alloc_ptr;
tduffy> uint32_t alloc_size;
tduffy> DAT_PZ_HANDLE pz_handle;
tduffy> - DAT_COUNT seg_size;
tduffy> - DAT_COUNT num_segs; /* num segments */
tduffy> + int seg_size;
tduffy> + int num_segs; /* num segments */
tduffy> unsigned char *buffer_start; /* Start of buffer area */
tduffy> DAT_VLEN buffer_size; /* Size of data buffer (rounded) */
tduffy> DAT_VADDR reg_addr; /* start of registered area */
tduffy> Index: linux-kernel/test/dapltest/include/dapl_fft_util.h
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/include/dapl_fft_util.h (revision 2321)
tduffy> +++ linux-kernel/test/dapltest/include/dapl_fft_util.h (working copy)
tduffy> @@ -61,7 +61,7 @@ typedef struct
tduffy> DAT_EP_HANDLE ep_handle;
tduffy> DAT_EVD_HANDLE cr_evd, conn_evd, send_evd, recv_evd;
tduffy> struct dat_event event;
tduffy> - DAT_COUNT count;
tduffy> + int count;
tduffy> DAT_CR_HANDLE cr_handle;
tduffy> Bpool *bpool;
tduffy> struct dat_cr_arrival_event_data cr_stat;
tduffy> Index: linux-kernel/test/dapltest/include/dapl_performance_stats.h
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/include/dapl_performance_stats.h (revision 2321)
tduffy> +++ linux-kernel/test/dapltest/include/dapl_performance_stats.h (working copy)
tduffy> @@ -58,7 +58,7 @@ typedef struct
tduffy> Performance_Stats_Data_t latency;
tduffy> DT_CpuStat pre_cpu_stat;
tduffy> DT_CpuStat post_cpu_stat;
tduffy> - DAT_COUNT pipeline_len;
tduffy> + int pipeline_len;
tduffy> } Performance_Stats_t;
tduffy>
tduffy> #endif
tduffy> Index: linux-kernel/test/dapltest/include/dapl_transaction_test.h
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/include/dapl_transaction_test.h (revision 2321)
tduffy> +++ linux-kernel/test/dapltest/include/dapl_transaction_test.h (working copy)
tduffy> @@ -80,7 +80,7 @@ typedef struct
tduffy> DAT_IA_ADDRESS_PTR remote_ia_addr;
tduffy> DAT_CONN_QUAL base_port;
tduffy> DAT_TIMEOUT time_out;
tduffy> - DAT_COUNT evd_length;
tduffy> + int evd_length;
tduffy> Thread *thread;
tduffy>
tduffy> /* This group set up by each thread in DT_Transaction_Main() */
tduffy> Index: linux-kernel/test/dapltest/cmd/dapl_test_data.c
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/cmd/dapl_test_data.c (revision 2321)
tduffy> +++ linux-kernel/test/dapltest/cmd/dapl_test_data.c (working copy)
tduffy> @@ -27,7 +27,7 @@
tduffy>
tduffy> #include "dapl_proto.h"
tduffy>
tduffy> -DAT_COUNT DT_dapltest_debug = 0;
tduffy> +int DT_dapltest_debug = 0;
tduffy> /*
tduffy> * check memory leaking int alloc_count; DT_Mdep_LockType
tduffy> * Alloc_Count_Lock;
tduffy> Index: linux-kernel/test/dapltest/common/dapl_global.c
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/common/dapl_global.c (revision 2321)
tduffy> +++ linux-kernel/test/dapltest/common/dapl_global.c (working copy)
tduffy> @@ -28,6 +28,6 @@
tduffy> #include "dapl_proto.h"
tduffy>
tduffy> boolean_t DT_local_is_little_endian;
tduffy> -DAT_COUNT DT_dapltest_debug = 0;
tduffy> +int DT_dapltest_debug = 0;
tduffy>
tduffy>
tduffy> Index: linux-kernel/test/dapltest/kdapl/kdapl_tdep_evd.c
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/kdapl/kdapl_tdep_evd.c (revision 2321)
tduffy> +++ linux-kernel/test/dapltest/kdapl/kdapl_tdep_evd.c (working copy)
tduffy> @@ -96,7 +96,7 @@ KDT_Evd_Destroy(void)
tduffy>
tduffy> u32
tduffy> DT_Tdep_evd_create (DAT_IA_HANDLE ia_handle,
tduffy> - DAT_COUNT evd_min_qlen,
tduffy> + int evd_min_qlen,
tduffy> DAT_CNO_HANDLE cno_handle,
tduffy> DAT_EVD_FLAGS evd_flags,
tduffy> DAT_EVD_HANDLE *evd_handle_ptr)
tduffy> Index: linux-kernel/dat-provider/dapl_cookie.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_cookie.c (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_cookie.c (working copy)
tduffy> @@ -113,9 +113,9 @@ u32 dapl_cb_put(DAPL_COOKIE_BUFFER *buff
tduffy> * DAT_INSUFFICIENT_RESOURCES
tduffy> *
tduffy> */
tduffy> -u32 dapl_cb_create(DAPL_COOKIE_BUFFER *buffer, DAPL_EP *ep, DAT_COUNT size)
tduffy> +u32 dapl_cb_create(DAPL_COOKIE_BUFFER *buffer, DAPL_EP *ep, int size)
tduffy> {
tduffy> - DAT_COUNT i;
tduffy> + int i;
tduffy>
tduffy> /*
tduffy> * allocate one additional entry so that the tail
tduffy> @@ -181,7 +181,7 @@ void dapl_cb_free(DAPL_COOKIE_BUFFER * b
tduffy> u32 dapl_cb_get(DAPL_COOKIE_BUFFER *buffer, DAPL_COOKIE **cookie_ptr)
tduffy> {
tduffy> u32 dat_status;
tduffy> - DAT_COUNT new_head;
tduffy> + int new_head;
tduffy>
tduffy> dapl_os_assert(NULL != cookie_ptr);
tduffy>
tduffy> Index: linux-kernel/dat-provider/dapl_ep_connect.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_ep_connect.c (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_ep_connect.c (working copy)
tduffy> @@ -45,7 +45,7 @@
tduffy> u32 dapl_ep_connect(DAT_EP_HANDLE ep_handle,
tduffy> DAT_IA_ADDRESS_PTR remote_ia_address,
tduffy> DAT_CONN_QUAL remote_conn_qual, DAT_TIMEOUT timeout,
tduffy> - DAT_COUNT private_data_size, const void *private_data,
tduffy> + int private_data_size, const void *private_data,
tduffy> DAT_QOS qos, DAT_CONNECT_FLAGS connect_flags)
tduffy> {
tduffy> DAPL_EP *ep_ptr;
tduffy> Index: linux-kernel/dat-provider/dapl_cookie.h
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_cookie.h (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_cookie.h (working copy)
tduffy> @@ -37,7 +37,7 @@
tduffy> #include "dapl.h"
tduffy>
tduffy> extern u32 dapl_cb_create(DAPL_COOKIE_BUFFER *buffer, DAPL_EP *ep,
tduffy> - DAT_COUNT size);
tduffy> + int size);
tduffy>
tduffy> extern void dapl_cb_free(DAPL_COOKIE_BUFFER *buffer);
tduffy>
tduffy> Index: linux-kernel/dat-provider/dapl_module.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_module.c (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_module.c (working copy)
tduffy> @@ -174,7 +174,7 @@ void DAT_PROVIDER_INIT_FUNC_NAME(const s
tduffy> }
tduffy> printk("KDAPL : Added device %s to the registry\n",
tduffy> provider_info->ia_name);
tduffy> - bail:
tduffy> +bail:
tduffy> if (DAT_SUCCESS != dat_status) {
tduffy> if (NULL != provider) {
tduffy> (void)dapl_provider_list_remove(provider_info->ia_name);
tduffy> @@ -220,7 +220,7 @@ void DAT_PROVIDER_FINI_FUNC_NAME(const s
tduffy> */
tduffy> dapl_hca_free(provider->extension);
tduffy>
tduffy> - (void)dapl_provider_list_remove(provider_info->ia_name);
tduffy> + dapl_provider_list_remove(provider_info->ia_name);
tduffy> }
tduffy>
tduffy> static struct ib_client dapl_client = {
tduffy> @@ -237,9 +237,8 @@ static char *dev_name_suffix_table[3] =
tduffy>
tduffy> void dapl_add_one(struct ib_device *device)
tduffy> {
tduffy> - DAT_COUNT i;
tduffy> + int i, length;
tduffy> struct dat_provider_info provider_info;
tduffy> - int length;
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_UTIL,
tduffy> "Inside dapl_add_one called by %s\n", device->name);
tduffy>
tduffy> @@ -254,14 +253,12 @@ void dapl_add_one(struct ib_device *devi
tduffy> provider_info.is_thread_safe = FALSE;
tduffy> DAT_PROVIDER_INIT_FUNC_NAME(&provider_info, device, i);
tduffy> }
tduffy> - return;
tduffy> }
tduffy>
tduffy> void dapl_remove_one(struct ib_device *device)
tduffy> {
tduffy> - DAT_COUNT i;
tduffy> + int i, length;
tduffy> struct dat_provider_info provider_info;
tduffy> - int length;
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_UTIL,
tduffy> "Inside dapl_remove_one called by %s\n", device->name);
tduffy>
tduffy> @@ -269,14 +266,12 @@ void dapl_remove_one(struct ib_device *d
tduffy> length = strlen(device->name);
tduffy> for (i = 0; i < device->phys_port_cnt; i++) {
tduffy> strncpy(provider_info.ia_name, device->name, length + 1);
tduffy> - (void)strcat(provider_info.ia_name,
tduffy> - dev_name_suffix_table[i + 1]);
tduffy> + strcat(provider_info.ia_name, dev_name_suffix_table[i + 1]);
tduffy> provider_info.dat_version_major = DAT_VERSION_MAJOR;
tduffy> provider_info.dat_version_minor = DAT_VERSION_MINOR;
tduffy> provider_info.is_thread_safe = FALSE;
tduffy> DAT_PROVIDER_FINI_FUNC_NAME(&provider_info);
tduffy> }
tduffy> - return;
tduffy> }
tduffy>
tduffy> /*
tduffy> @@ -289,11 +284,9 @@ static void dapl_register_providers(void
tduffy> status = ib_register_client(&dapl_client);
tduffy> if (status < 0)
tduffy> printk("ib_register_client () failed: %x\n", status);
tduffy> - return;
tduffy> };
tduffy>
tduffy> static void dapl_unregister_providers(void)
tduffy> {
tduffy> - (void)ib_unregister_client(&dapl_client);
tduffy> - return;
tduffy> + ib_unregister_client(&dapl_client);
tduffy> }
tduffy> Index: linux-kernel/dat-provider/dapl_ring_buffer_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_ring_buffer_util.c (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_ring_buffer_util.c (working copy)
tduffy> @@ -56,7 +56,7 @@
tduffy> * DAT_INSUFFICIENT_RESOURCES
tduffy> *
tduffy> */
tduffy> -u32 dapl_rbuf_alloc(DAPL_RING_BUFFER *rbuf, DAT_COUNT size)
tduffy> +u32 dapl_rbuf_alloc(DAPL_RING_BUFFER *rbuf, int size)
tduffy> {
tduffy> unsigned int rsize; /* real size */
tduffy>
tduffy> @@ -68,7 +68,7 @@ u32 dapl_rbuf_alloc(DAPL_RING_BUFFER *rb
tduffy>
tduffy> /* Put size on a power of 2 boundary */
tduffy> rsize = 1;
tduffy> - while ((DAT_COUNT) rsize < size) {
tduffy> + while ((int) rsize < size) {
tduffy> rsize <<= 1;
tduffy> }
tduffy>
tduffy> @@ -104,7 +104,7 @@ u32 dapl_rbuf_alloc(DAPL_RING_BUFFER *rb
tduffy> * DAT_INSUFFICIENT_RESOURCES
tduffy> *
tduffy> */
tduffy> -u32 dapl_rbuf_realloc(DAPL_RING_BUFFER *rbuf, DAT_COUNT size)
tduffy> +u32 dapl_rbuf_realloc(DAPL_RING_BUFFER *rbuf, int size)
tduffy> {
tduffy> DAPL_RING_BUFFER new_rbuf;
tduffy> void *entry;
tduffy> @@ -261,11 +261,9 @@ void *dapl_rbuf_remove(DAPL_RING_BUFFER
tduffy> * count of entries
tduffy> *
tduffy> */
tduffy> -DAT_COUNT dapl_rbuf_count(DAPL_RING_BUFFER * rbuf)
tduffy> +int dapl_rbuf_count(DAPL_RING_BUFFER * rbuf)
tduffy> {
tduffy> - DAT_COUNT count;
tduffy> - int head;
tduffy> - int tail;
tduffy> + int count, head, tail;
tduffy>
tduffy> head = atomic_read(&rbuf->head) & rbuf->lim;
tduffy> tail = atomic_read(&rbuf->tail) & rbuf->lim;
tduffy> Index: linux-kernel/dat-provider/dapl_srq_resize.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_srq_resize.c (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_srq_resize.c (working copy)
tduffy> @@ -63,7 +63,7 @@
tduffy> * DAT_INVALID_STATE
tduffy> */
tduffy>
tduffy> -u32 dapl_srq_resize(DAT_SRQ_HANDLE srq_handle, DAT_COUNT srq_max_recv_dto)
tduffy> +u32 dapl_srq_resize(DAT_SRQ_HANDLE srq_handle, int srq_max_recv_dto)
tduffy> {
tduffy> DAPL_IA *ia_ptr;
tduffy> DAPL_SRQ *srq_ptr;
tduffy> Index: linux-kernel/dat-provider/dapl_ep_post_rdma_write.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_ep_post_rdma_write.c (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_ep_post_rdma_write.c (working copy)
tduffy> @@ -66,7 +66,7 @@
tduffy> * DAT_PROTECTION_VIOLATION
tduffy> * DAT_PRIVILEGES_VIOLATION
tduffy> */
tduffy> -u32 dapl_ep_post_rdma_write(DAT_EP_HANDLE ep_handle, DAT_COUNT num_segments,
tduffy> +u32 dapl_ep_post_rdma_write(DAT_EP_HANDLE ep_handle, int num_segments,
tduffy> struct dat_lmr_triplet *local_iov,
tduffy> DAT_DTO_COOKIE user_cookie,
tduffy> const struct dat_rmr_triplet *remote_iov,
tduffy> Index: linux-kernel/dat-provider/dapl_openib_dto.h
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_openib_dto.h (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_openib_dto.h (working copy)
tduffy> @@ -51,7 +51,7 @@
tduffy> * Provider specific Post RECV function
tduffy> */
tduffy> static __inline__ u32 dapl_ib_post_recv(DAPL_EP *ep_ptr, DAPL_COOKIE *cookie,
tduffy> - DAT_COUNT num_segments,
tduffy> + int num_segments,
tduffy> struct dat_lmr_triplet *local_iov)
tduffy> {
tduffy> struct ib_recv_wr rr_desc = { NULL };
tduffy> @@ -101,7 +101,7 @@ static __inline__ u32 dapl_ib_post_recv(
tduffy> */
tduffy> static __inline__ u32 dapl_ib_post_send(DAPL_EP *ep_ptr, int op_type,
tduffy> DAPL_COOKIE *cookie,
tduffy> - DAT_COUNT num_segments,
tduffy> + int num_segments,
tduffy> struct dat_lmr_triplet *local_iov,
tduffy> const struct dat_rmr_triplet *remote_iov,
tduffy> DAT_COMPLETION_FLAGS completion_flags)
tduffy> Index: linux-kernel/dat-provider/dapl_ring_buffer_util.h
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_ring_buffer_util.h (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_ring_buffer_util.h (working copy)
tduffy> @@ -42,9 +42,9 @@
tduffy> /*
tduffy> * Prototypes
tduffy> */
tduffy> -u32 dapl_rbuf_alloc(DAPL_RING_BUFFER *rbuf, DAT_COUNT size);
tduffy> +u32 dapl_rbuf_alloc(DAPL_RING_BUFFER *rbuf, int size);
tduffy>
tduffy> -u32 dapl_rbuf_realloc(DAPL_RING_BUFFER *rbuf, DAT_COUNT size);
tduffy> +u32 dapl_rbuf_realloc(DAPL_RING_BUFFER *rbuf, int size);
tduffy>
tduffy> void dapl_rbuf_destroy(DAPL_RING_BUFFER * rbuf);
tduffy>
tduffy> @@ -52,7 +52,7 @@ u32 dapl_rbuf_add(DAPL_RING_BUFFER *rbuf
tduffy>
tduffy> void *dapl_rbuf_remove(DAPL_RING_BUFFER * rbuf);
tduffy>
tduffy> -DAT_COUNT dapl_rbuf_count(DAPL_RING_BUFFER * rbuf);
tduffy> +int dapl_rbuf_count(DAPL_RING_BUFFER *rbuf);
tduffy>
tduffy> void dapl_rbuf_adjust(DAPL_RING_BUFFER * rbuf, intptr_t offset);
tduffy>
tduffy> Index: linux-kernel/dat-provider/dapl_evd_resize.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_evd_resize.c (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_evd_resize.c (working copy)
tduffy> @@ -63,11 +63,11 @@
tduffy> * DAT_INVALID_STATE
tduffy> */
tduffy>
tduffy> -u32 dapl_evd_resize(DAT_EVD_HANDLE evd_handle, DAT_COUNT evd_qlen)
tduffy> +u32 dapl_evd_resize(DAT_EVD_HANDLE evd_handle, int evd_qlen)
tduffy> {
tduffy> DAPL_IA *ia_ptr;
tduffy> DAPL_EVD *evd_ptr;
tduffy> - DAT_COUNT pend_cnt;
tduffy> + int pend_cnt;
tduffy> u32 dat_status;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API, "dapl_evd_resize (%p, %d)\n",
tduffy> Index: linux-kernel/dat-provider/dapl_adapter_util.h
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_adapter_util.h (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_adapter_util.h (working copy)
tduffy> @@ -51,7 +51,7 @@ typedef enum async_handler_type {
tduffy>
tduffy> u32 dapl_ib_enum_hcas(const char *vendor,
tduffy> DAPL_HCA_NAME **hca_names,
tduffy> - DAT_COUNT *total_hca_count);
tduffy> + int *total_hca_count);
tduffy>
tduffy> u32 dapl_ib_get_instance_data(DAPL_HCA_NAME hca_name, char *instance);
tduffy>
tduffy> @@ -69,7 +69,7 @@ u32 dapl_ib_qp_modify(DAPL_IA *ia_ptr, D
tduffy> u32 dapl_ib_connect(DAT_EP_HANDLE ep_handle,
tduffy> DAT_IA_ADDRESS_PTR remote_ia_address,
tduffy> DAT_CONN_QUAL remote_conn_qual,
tduffy> - DAT_COUNT private_data_size, void *private_data);
tduffy> + int private_data_size, void *private_data);
tduffy>
tduffy> u32 dapl_ib_disconnect(DAPL_EP *ep_ptr, DAT_CLOSE_FLAGS close_flags);
tduffy>
tduffy> @@ -80,7 +80,7 @@ u32 dapl_ib_remove_conn_listener(DAPL_IA
tduffy>
tduffy> u32 dapl_ib_accept_connection(DAT_CR_HANDLE cr_handle,
tduffy> DAT_EP_HANDLE ep_handle,
tduffy> - DAT_COUNT private_data_size,
tduffy> + int private_data_size,
tduffy> const void *private_data);
tduffy>
tduffy> u32 dapl_ib_reject_connection(ib_cm_handle_t cm_handle, int reject_reason);
tduffy> @@ -89,14 +89,14 @@ u32 dapl_ib_setup_async_callback(DAPL_IA
tduffy> DAPL_ASYNC_HANDLER_TYPE handler_type,
tduffy> ib_async_handler_t callback, void *context);
tduffy>
tduffy> -u32 dapl_ib_cq_alloc(DAPL_IA *ia_ptr, DAPL_EVD *evd_ptr, DAT_COUNT *cqlen,
tduffy> +u32 dapl_ib_cq_alloc(DAPL_IA *ia_ptr, DAPL_EVD *evd_ptr, int *cqlen,
tduffy> ib_comp_handle_t callback);
tduffy>
tduffy> u32 dapl_ib_cq_free(DAPL_IA *ia_ptr, DAPL_EVD *evd_ptr);
tduffy>
tduffy> u32 dapl_set_cq_notify(DAPL_IA *ia_ptr, DAPL_EVD *evd_ptr);
tduffy>
tduffy> -u32 dapl_ib_cq_resize(DAPL_IA *ia_ptr, DAPL_EVD *evd_ptr, DAT_COUNT *cqlen);
tduffy> +u32 dapl_ib_cq_resize(DAPL_IA *ia_ptr, DAPL_EVD *evd_ptr, int *cqlen);
tduffy>
tduffy> u32 dapl_ib_pd_alloc(DAPL_IA *ia_ptr, DAPL_PZ *pz);
tduffy>
tduffy> Index: linux-kernel/dat-provider/dapl_ep_post_send.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_ep_post_send.c (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_ep_post_send.c (working copy)
tduffy> @@ -63,7 +63,7 @@
tduffy> * DAT_PROTECTION_VIOLATION
tduffy> * DAT_PRIVILEGES_VIOLATION
tduffy> */
tduffy> -u32 dapl_ep_post_send(DAT_EP_HANDLE ep_handle, DAT_COUNT num_segments,
tduffy> +u32 dapl_ep_post_send(DAT_EP_HANDLE ep_handle, int num_segments,
tduffy> struct dat_lmr_triplet *local_iov,
tduffy> DAT_DTO_COOKIE user_cookie,
tduffy> DAT_COMPLETION_FLAGS completion_flags)
tduffy> Index: linux-kernel/dat-provider/dapl_provider.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_provider.c (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_provider.c (working copy)
tduffy> @@ -204,7 +204,7 @@ u32 dapl_provider_list_destroy(void)
tduffy> return DAT_SUCCESS;
tduffy> }
tduffy>
tduffy> -DAT_COUNT dapl_provider_list_size(void)
tduffy> +int dapl_provider_list_size(void)
tduffy> {
tduffy> return g_dapl_provider_list.size;
tduffy> }
tduffy> Index: linux-kernel/dat-provider/dapl_openib_cm.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_openib_cm.c (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_openib_cm.c (working copy)
tduffy> @@ -396,7 +396,7 @@ error:
tduffy> u32 dapl_ib_connect(DAT_EP_HANDLE ep_handle,
tduffy> DAT_IA_ADDRESS_PTR remote_ia_address,
tduffy> DAT_CONN_QUAL remote_conn_qual,
tduffy> - DAT_COUNT private_data_size, void *private_data)
tduffy> + int private_data_size, void *private_data)
tduffy> {
tduffy> DAPL_IA *ia_ptr;
tduffy> DAPL_EP *ep_ptr;
tduffy> @@ -732,7 +732,7 @@ u32 dapl_ib_reject_connection(struct dap
tduffy> *
tduffy> */
tduffy> u32 dapl_ib_accept_connection(DAT_CR_HANDLE cr_handle, DAT_EP_HANDLE ep_handle,
tduffy> - DAT_COUNT private_data_size,
tduffy> + int private_data_size,
tduffy> const void *prd_ptr)
tduffy> {
tduffy> DAPL_CR *cr_ptr;
tduffy> Index: linux-kernel/dat-provider/dapl_provider.h
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_provider.h (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_provider.h (working copy)
tduffy> @@ -56,7 +56,7 @@ typedef struct DAPL_PROVIDER_LIST_NODE {
tduffy> typedef struct DAPL_PROVIDER_LIST {
tduffy> DAPL_PROVIDER_LIST_NODE *head;
tduffy> DAPL_PROVIDER_LIST_NODE *tail;
tduffy> - DAT_COUNT size;
tduffy> + int size;
tduffy> } DAPL_PROVIDER_LIST;
tduffy>
tduffy> /*********************************************************************
tduffy> @@ -78,7 +78,7 @@ extern u32 dapl_provider_list_create(voi
tduffy>
tduffy> extern u32 dapl_provider_list_destroy(void);
tduffy>
tduffy> -extern DAT_COUNT dapl_provider_list_size(void);
tduffy> +extern int dapl_provider_list_size(void);
tduffy>
tduffy> extern u32 dapl_provider_list_insert(const char *name,
tduffy> struct dat_provider **p_data);
tduffy> Index: linux-kernel/dat-provider/dapl_ep_recv_query.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_ep_recv_query.c (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_ep_recv_query.c (working copy)
tduffy> @@ -55,7 +55,7 @@
tduffy> * DAT_MODEL_NOT_SUPPORTED
tduffy> */
tduffy> u32 dapl_ep_recv_query(DAT_EP_HANDLE ep_handle,
tduffy> - DAT_COUNT *nbufs_allocate, DAT_COUNT *bufs_alloc_span)
tduffy> + int *nbufs_allocate, int *bufs_alloc_span)
tduffy> {
tduffy> DAPL_EP *ep_ptr;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy> Index: linux-kernel/dat-provider/dapl_openib_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_openib_util.c (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_openib_util.c (working copy)
tduffy> @@ -221,7 +221,7 @@ u32 dapl_ib_close_hca(DAPL_HCA *hca_ptr)
tduffy> * DAT_INSUFFICIENT_RESOURCES
tduffy> *
tduffy> */
tduffy> -u32 dapl_ib_cq_alloc(DAPL_IA *ia_ptr, DAPL_EVD *evd_ptr, DAT_COUNT *cqlen,
tduffy> +u32 dapl_ib_cq_alloc(DAPL_IA *ia_ptr, DAPL_EVD *evd_ptr, int *cqlen,
tduffy> ib_comp_handle_t callback)
tduffy> {
tduffy> int ib_status;
tduffy> @@ -263,7 +263,7 @@ u32 dapl_ib_cq_free(DAPL_IA *ia_ptr, DAP
tduffy> return dapl_ib_status_convert(ib_status);
tduffy> }
tduffy>
tduffy> -u32 dapl_ib_cq_resize(DAPL_IA *ia_ptr, DAPL_EVD *evd_ptr, DAT_COUNT *cqlen)
tduffy> +u32 dapl_ib_cq_resize(DAPL_IA *ia_ptr, DAPL_EVD *evd_ptr, int *cqlen)
tduffy> {
tduffy> int ib_status;
tduffy>
tduffy> Index: linux-kernel/dat-provider/dapl_evd_kcreate.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_evd_kcreate.c (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_evd_kcreate.c (working copy)
tduffy> @@ -48,7 +48,7 @@
tduffy> * even if it is not required. However, it will not be armed.
tduffy> */
tduffy>
tduffy> -u32 dapl_evd_kcreate(DAT_IA_HANDLE ia_handle, DAT_COUNT evd_min_qlen,
tduffy> +u32 dapl_evd_kcreate(DAT_IA_HANDLE ia_handle, int evd_min_qlen,
tduffy> DAT_UPCALL_POLICY upcall_policy, /* ignore */
tduffy> const struct dat_upcall_object *upcall,
tduffy> DAT_EVD_FLAGS evd_flags, DAT_EVD_HANDLE *evd_handle)
tduffy> Index: linux-kernel/dat-provider/dapl_srq_set_lw.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_srq_set_lw.c (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_srq_set_lw.c (working copy)
tduffy> @@ -63,7 +63,7 @@
tduffy> * DAT_MODEL_NOT_SUPPORTED
tduffy> */
tduffy>
tduffy> -u32 dapl_srq_set_lw(DAT_SRQ_HANDLE srq_handle, DAT_COUNT low_watermark)
tduffy> +u32 dapl_srq_set_lw(DAT_SRQ_HANDLE srq_handle, int low_watermark)
tduffy> {
tduffy> DAPL_SRQ *srq_ptr;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy> Index: linux-kernel/dat-provider/dapl_cr_accept.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_cr_accept.c (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_cr_accept.c (working copy)
tduffy> @@ -40,7 +40,7 @@
tduffy> * and passive side (local endpoint).
tduffy> */
tduffy> u32 dapl_cr_accept(DAT_CR_HANDLE cr_handle, DAT_EP_HANDLE ep_handle,
tduffy> - DAT_COUNT private_data_size, const void *private_data)
tduffy> + int private_data_size, const void *private_data)
tduffy> {
tduffy> DAPL_EP *ep_ptr;
tduffy> u32 dat_status;
tduffy> Index: linux-kernel/dat-provider/dapl_srq_post_recv.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_srq_post_recv.c (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_srq_post_recv.c (working copy)
tduffy> @@ -67,7 +67,7 @@
tduffy> * DAT_PROTECTION_VIOLATION
tduffy> * DAT_PROVILEGES_VIOLATION
tduffy> */
tduffy> -u32 dapl_srq_post_recv(DAT_SRQ_HANDLE srq_handle, DAT_COUNT num_segments,
tduffy> +u32 dapl_srq_post_recv(DAT_SRQ_HANDLE srq_handle, int num_segments,
tduffy> struct dat_lmr_triplet *local_iov,
tduffy> DAT_DTO_COOKIE user_cookie)
tduffy> {
tduffy> Index: linux-kernel/dat-provider/dapl_ep_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_ep_util.c (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_ep_util.c (working copy)
tduffy> @@ -281,7 +281,7 @@ u32 dapl_ep_check_request_completion_fla
tduffy> return DAT_SUCCESS;
tduffy> }
tduffy>
tduffy> -u32 dapl_ep_post_send_req(DAT_EP_HANDLE ep_handle, DAT_COUNT num_segments,
tduffy> +u32 dapl_ep_post_send_req(DAT_EP_HANDLE ep_handle, int num_segments,
tduffy> struct dat_lmr_triplet *local_iov,
tduffy> DAT_DTO_COOKIE user_cookie,
tduffy> const struct dat_rmr_triplet *remote_iov,
tduffy> Index: linux-kernel/dat-provider/dapl_ep_util.h
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_ep_util.h (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_ep_util.h (working copy)
tduffy> @@ -50,8 +50,7 @@ extern u32 dapl_ep_check_recv_completion
tduffy>
tduffy> extern u32 dapl_ep_check_request_completion_flags(DAT_COMPLETION_FLAGS flags);
tduffy>
tduffy> -extern u32 dapl_ep_post_send_req(DAT_EP_HANDLE ep_handle,
tduffy> - DAT_COUNT num_segments,
tduffy> +extern u32 dapl_ep_post_send_req(DAT_EP_HANDLE ep_handle, int num_segments,
tduffy> struct dat_lmr_triplet *local_iov,
tduffy> DAT_DTO_COOKIE user_cookie,
tduffy> const struct dat_rmr_triplet *remote_iov,
tduffy> Index: linux-kernel/dat-provider/dapl_ep_post_rdma_read.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_ep_post_rdma_read.c (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_ep_post_rdma_read.c (working copy)
tduffy> @@ -66,7 +66,7 @@
tduffy> * DAT_PROTECTION_VIOLATION
tduffy> * DAT_PRIVILEGES_VIOLATION
tduffy> */
tduffy> -u32 dapl_ep_post_rdma_read(DAT_EP_HANDLE ep_handle, DAT_COUNT num_segments,
tduffy> +u32 dapl_ep_post_rdma_read(DAT_EP_HANDLE ep_handle, int num_segments,
tduffy> struct dat_lmr_triplet *local_iov,
tduffy> DAT_DTO_COOKIE user_cookie,
tduffy> const struct dat_rmr_triplet *remote_iov,
tduffy> Index: linux-kernel/dat-provider/dapl_ia_open.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_ia_open.c (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_ia_open.c (working copy)
tduffy> @@ -51,7 +51,7 @@
tduffy> * That function maps the DAT_NAME parameter of dat_ia_open to a DAT_PROVIDER,
tduffy> * and calls this function.
tduffy> */
tduffy> -u32 dapl_ia_open(const DAT_NAME_PTR name, DAT_COUNT async_evd_qlen,
tduffy> +u32 dapl_ia_open(const DAT_NAME_PTR name, int async_evd_qlen,
tduffy> DAT_EVD_HANDLE *async_evd_handle_ptr,
tduffy> DAT_IA_HANDLE *ia_handle_ptr)
tduffy> {
tduffy> Index: linux-kernel/dat-provider/dapl_evd_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_evd_util.c (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_evd_util.c (working copy)
tduffy> @@ -41,7 +41,7 @@
tduffy>
tduffy> static __inline__ void dapl_evd_eh_print_cqe(ib_work_completion_t * cqe);
tduffy>
tduffy> -u32 dapl_evd_event_alloc(DAPL_EVD *evd_ptr, DAT_COUNT qlen);
tduffy> +u32 dapl_evd_event_alloc(DAPL_EVD *evd_ptr, int qlen);
tduffy>
tduffy> /*
tduffy> * actually create the evd. this is called after all parameter checking
tduffy> @@ -50,11 +50,11 @@ u32 dapl_evd_event_alloc(DAPL_EVD *evd_p
tduffy> */
tduffy>
tduffy> u32 dapl_evd_internal_create(DAPL_IA *ia_ptr, DAPL_CNO *cno_ptr,
tduffy> - DAT_COUNT min_qlen, DAT_EVD_FLAGS evd_flags,
tduffy> + int min_qlen, DAT_EVD_FLAGS evd_flags,
tduffy> DAPL_EVD **evd_ptr_ptr)
tduffy> {
tduffy> DAPL_EVD *evd_ptr;
tduffy> - DAT_COUNT cq_len;
tduffy> + int cq_len;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> *evd_ptr_ptr = NULL;
tduffy> @@ -113,7 +113,7 @@ u32 dapl_evd_internal_create(DAPL_IA *ia
tduffy> dapl_ia_link_evd(ia_ptr, evd_ptr);
tduffy> *evd_ptr_ptr = evd_ptr;
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> if (dat_status != DAT_SUCCESS) {
tduffy> if (evd_ptr) {
tduffy> dapl_evd_dealloc(evd_ptr);
tduffy> @@ -127,7 +127,7 @@ u32 dapl_evd_internal_create(DAPL_IA *ia
tduffy> * alloc and initialize an EVD struct
tduffy> */
tduffy> DAPL_EVD *dapl_evd_alloc(DAPL_IA * ia_ptr, DAPL_CNO * cno_ptr,
tduffy> - DAT_EVD_FLAGS evd_flags, DAT_COUNT qlen)
tduffy> + DAT_EVD_FLAGS evd_flags, int qlen)
tduffy> {
tduffy> DAPL_EVD *evd_ptr;
tduffy>
tduffy> @@ -164,17 +164,17 @@ DAPL_EVD *dapl_evd_alloc(DAPL_IA * ia_pt
tduffy> evd_ptr->qlen = qlen;
tduffy> evd_ptr->cno_ptr = cno_ptr;
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> return evd_ptr;
tduffy> }
tduffy>
tduffy> /*
tduffy> * alloc events into an EVD.
tduffy> */
tduffy> -u32 dapl_evd_event_alloc(DAPL_EVD *evd_ptr, DAT_COUNT qlen)
tduffy> +u32 dapl_evd_event_alloc(DAPL_EVD *evd_ptr, int qlen)
tduffy> {
tduffy> struct dat_event *event_ptr;
tduffy> - DAT_COUNT i;
tduffy> + int i;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> /* Allocate EVENTs */
tduffy> @@ -206,62 +206,56 @@ u32 dapl_evd_event_alloc(DAPL_EVD *evd_p
tduffy> event_ptr++;
tduffy> }
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> return dat_status;
tduffy> }
tduffy>
tduffy> /*
tduffy> * realloc events into an EVD.
tduffy> */
tduffy> -u32 dapl_evd_event_realloc(DAPL_EVD *evd_ptr, DAT_COUNT qlen)
tduffy> +u32 dapl_evd_event_realloc(DAPL_EVD *evd_ptr, int qlen)
tduffy> {
tduffy> - struct dat_event *events;
tduffy> - DAT_COUNT old_qlen;
tduffy> - DAT_COUNT i;
tduffy> - intptr_t diff;
tduffy> + struct dat_event *events;
tduffy> + int i, old_qlen, diff;
tduffy> u32 dat_status;
tduffy>
tduffy> - /* Allocate EVENTs */
tduffy> - events = (struct dat_event *)dapl_os_realloc(evd_ptr->events,
tduffy> - qlen * sizeof *events);
tduffy> - if ( NULL == events )
tduffy> - {
tduffy> - dat_status = DAT_ERROR(DAT_INSUFFICIENT_RESOURCES, DAT_RESOURCE_MEMORY);
tduffy> - goto bail;
tduffy> - }
tduffy> + /* Allocate EVENTs */
tduffy> + events = (struct dat_event *)dapl_os_realloc(evd_ptr->events,
tduffy> + qlen * sizeof *events);
tduffy> + if (!events) {
tduffy> + dat_status = DAT_ERROR(DAT_INSUFFICIENT_RESOURCES,
tduffy> + DAT_RESOURCE_MEMORY);
tduffy> + goto bail;
tduffy> + }
tduffy>
tduffy> - diff = events - evd_ptr->events;
tduffy> - evd_ptr->events = events;
tduffy> + diff = events - evd_ptr->events;
tduffy> + evd_ptr->events = events;
tduffy>
tduffy> - old_qlen = evd_ptr->qlen;
tduffy> - evd_ptr->qlen = qlen;
tduffy> + old_qlen = evd_ptr->qlen;
tduffy> + evd_ptr->qlen = qlen;
tduffy>
tduffy> - /* reallocate free event queue */
tduffy> - dat_status = dapl_rbuf_realloc(&evd_ptr->free_event_queue, qlen);
tduffy> - if (dat_status != DAT_SUCCESS)
tduffy> - {
tduffy> - goto bail;
tduffy> - }
tduffy> - dapl_rbuf_adjust(&evd_ptr->free_event_queue, diff);
tduffy> + /* reallocate free event queue */
tduffy> + dat_status = dapl_rbuf_realloc(&evd_ptr->free_event_queue, qlen);
tduffy> + if (dat_status != DAT_SUCCESS)
tduffy> + goto bail;
tduffy>
tduffy> - /* reallocate pending event queue */
tduffy> - dat_status = dapl_rbuf_realloc(&evd_ptr->pending_event_queue, qlen);
tduffy> - if (dat_status != DAT_SUCCESS)
tduffy> - {
tduffy> - goto bail;
tduffy> - }
tduffy> - dapl_rbuf_adjust(&evd_ptr->pending_event_queue, diff);
tduffy> + dapl_rbuf_adjust(&evd_ptr->free_event_queue, diff);
tduffy>
tduffy> - /*
tduffy> - * add new events to free event queue.
tduffy> - */
tduffy> - for (i = old_qlen; i < qlen; i++)
tduffy> - {
tduffy> - dapl_rbuf_add(&evd_ptr->free_event_queue, (void *) &events[i]);
tduffy> - }
tduffy> + /* reallocate pending event queue */
tduffy> + dat_status = dapl_rbuf_realloc(&evd_ptr->pending_event_queue, qlen);
tduffy> + if (dat_status != DAT_SUCCESS)
tduffy> + goto bail;
tduffy> +
tduffy> + dapl_rbuf_adjust(&evd_ptr->pending_event_queue, diff);
tduffy> +
tduffy> + /*
tduffy> + * add new events to free event queue.
tduffy> + */
tduffy> + for (i = old_qlen; i < qlen; i++)
tduffy> + dapl_rbuf_add(&evd_ptr->free_event_queue, (void *) &events[i]);
tduffy>
tduffy> bail:
tduffy> - return dat_status;
tduffy> + return dat_status;
tduffy> }
tduffy>
tduffy> /*
tduffy> @@ -297,10 +291,8 @@ u32 dapl_evd_dealloc(DAPL_EVD *evd_ptr)
tduffy> evd_ptr->header.magic = DAPL_MAGIC_INVALID;
tduffy>
tduffy> /* Release reference on the CNO if it exists */
tduffy> - if ( evd_ptr->cno_ptr != NULL )
tduffy> - {
tduffy> + if (evd_ptr->cno_ptr != NULL)
tduffy> evd_ptr->cno_ptr = NULL;
tduffy> - }
tduffy>
tduffy> /* If the ring buffer allocation failed, then the dapl_rbuf_destroy */
tduffy> /* function will detect that the ring buffer's internal data (ex. base */
tduffy> @@ -314,7 +306,7 @@ u32 dapl_evd_dealloc(DAPL_EVD *evd_ptr)
tduffy>
tduffy> kfree(evd_ptr);
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> return dat_status;
tduffy> }
tduffy>
tduffy> @@ -539,7 +531,7 @@ u32 dapl_evd_post_cr_arrival_event(DAPL_
tduffy> u32 dapl_evd_post_connection_event(DAPL_EVD *evd_ptr,
tduffy> DAT_EVENT_NUMBER event_number,
tduffy> DAT_EP_HANDLE ep_handle,
tduffy> - DAT_COUNT private_data_size,
tduffy> + int private_data_size,
tduffy> void *private_data)
tduffy> {
tduffy> struct dat_event *event_ptr;
tduffy> Index: linux-kernel/dat-provider/dapl_evd_util.h
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_evd_util.h (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_evd_util.h (working copy)
tduffy> @@ -41,15 +41,15 @@
tduffy> #include "dapl.h"
tduffy>
tduffy> u32 dapl_evd_internal_create(DAPL_IA *ia_ptr, DAPL_CNO *cno_ptr,
tduffy> - DAT_COUNT min_qlen, DAT_EVD_FLAGS evd_flags,
tduffy> + int min_qlen, DAT_EVD_FLAGS evd_flags,
tduffy> DAPL_EVD **evd_ptr_ptr);
tduffy>
tduffy> DAPL_EVD *dapl_evd_alloc(DAPL_IA * ia_ptr, DAPL_CNO * cno_ptr,
tduffy> - DAT_EVD_FLAGS evd_flags, DAT_COUNT qlen);
tduffy> + DAT_EVD_FLAGS evd_flags, int qlen);
tduffy>
tduffy> u32 dapl_evd_dealloc(DAPL_EVD *evd_ptr);
tduffy>
tduffy> -u32 dapl_evd_event_realloc(DAPL_EVD *evd_ptr, DAT_COUNT qlen);
tduffy> +u32 dapl_evd_event_realloc(DAPL_EVD *evd_ptr, int qlen);
tduffy>
tduffy> /*
tduffy> * Each of these functions will retrieve a free event from
tduffy> @@ -72,7 +72,7 @@ u32 dapl_evd_post_cr_arrival_event(DAPL_
tduffy> u32 dapl_evd_post_connection_event(DAPL_EVD *evd_ptr,
tduffy> DAT_EVENT_NUMBER event_number,
tduffy> DAT_EP_HANDLE ep_handle,
tduffy> - DAT_COUNT private_data_size,
tduffy> + int private_data_size,
tduffy> void *private_data);
tduffy>
tduffy> u32 dapl_evd_post_async_error_event(DAPL_EVD *evd_ptr,
tduffy> Index: linux-kernel/dat-provider/dapl_util.h
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_util.h (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_util.h (working copy)
tduffy> @@ -73,13 +73,6 @@ typedef long intptr_t;
tduffy>
tduffy> #define dapl_ip_addr6(sockaddr) (((struct sockaddr_in6 *)sockaddr)->sin6_addr.s6_addr32)
tduffy>
tduffy> -/*
tduffy> - * Atomic operations
tduffy> - */
tduffy> -
tduffy> -static __inline__ DAT_COUNT
tduffy> -dapl_os_atomic_assign(atomic_t * v, DAT_COUNT match_value, DAT_COUNT new_value);
tduffy> -
tduffy> /* dapl_os_atomic_assign
tduffy> *
tduffy> * assign 'new_value' to '*v' if the current value
tduffy> @@ -90,14 +83,14 @@ dapl_os_atomic_assign(atomic_t * v, DAT_
tduffy> * Return the current value in any case.
tduffy> *
tduffy> * This matches the IBTA atomic operation compare & swap
tduffy> - * except that it is for local memory and a DAT_COUNT may
tduffy> + * except that it is for local memory and a int may
tduffy> * be only 32 bits, rather than 64.
tduffy> */
tduffy>
tduffy> -static __inline__ DAT_COUNT
tduffy> -dapl_os_atomic_assign(atomic_t * v, DAT_COUNT match_value, DAT_COUNT new_value)
tduffy> +static inline int dapl_os_atomic_assign(atomic_t * v, int match_value,
tduffy> + int new_value)
tduffy> {
tduffy> - DAT_COUNT current_value;
tduffy> + int current_value;
tduffy>
tduffy> /*
tduffy> * Use the Pentium compare and exchange instruction
tduffy> Index: linux-kernel/dat-provider/dapl_hash.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_hash.c (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_hash.c (working copy)
tduffy> @@ -320,12 +320,12 @@ dapl_hash_delete_element(DAPL_HASH_ELEM
tduffy> /*
tduffy> * Create a new hash table with at least 'table_size' hash buckets.
tduffy> */
tduffy> -u32 dapl_hash_create(DAT_COUNT table_size, DAPL_HASH_TABLE **pp_table)
tduffy> +u32 dapl_hash_create(int table_size, DAPL_HASH_TABLE **pp_table)
tduffy> {
tduffy> DAPL_HASH_TABLE *p_table;
tduffy> - DAT_COUNT table_length = table_size * sizeof(DAPL_HASH_ELEM);
tduffy> + int table_length = table_size * sizeof(DAPL_HASH_ELEM);
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy> - DAT_COUNT i;
tduffy> + int i;
tduffy>
tduffy> dapl_os_assert(pp_table);
tduffy>
tduffy> @@ -379,7 +379,7 @@ u32 dapl_hash_free(DAPL_HASH_TABLE *p_ta
tduffy> * Returns the number of elements stored in the table
tduffy> */
tduffy>
tduffy> -u32 dapl_hash_size(DAPL_HASH_TABLE *p_table, DAT_COUNT *p_size)
tduffy> +u32 dapl_hash_size(DAPL_HASH_TABLE *p_table, int *p_size)
tduffy> {
tduffy> dapl_os_assert(p_table && p_size);
tduffy>
tduffy> Index: linux-kernel/dat-provider/dapl_ep_dup_connect.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_ep_dup_connect.c (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_ep_dup_connect.c (working copy)
tduffy> @@ -70,7 +70,7 @@
tduffy> * DAT_MODEL_NOT_SUPPORTED
tduffy> */
tduffy> u32 dapl_ep_dup_connect(DAT_EP_HANDLE ep_handle, DAT_EP_HANDLE ep_dup_handle,
tduffy> - DAT_TIMEOUT timeout, DAT_COUNT private_data_size,
tduffy> + DAT_TIMEOUT timeout, int private_data_size,
tduffy> const void *private_data, DAT_QOS qos)
tduffy> {
tduffy> DAPL_EP *ep_dup_ptr;
tduffy> Index: linux-kernel/dat-provider/dapl.h
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl.h (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl.h (working copy)
tduffy> @@ -193,14 +193,14 @@ struct dapl_llist_entry {
tduffy>
tduffy> struct dapl_ring_buffer {
tduffy> void **base; /* base of element array */
tduffy> - DAT_COUNT lim; /* mask, number of entries - 1 */
tduffy> + int lim; /* mask, number of entries - 1 */
tduffy> atomic_t head; /* head pointer index */
tduffy> atomic_t tail; /* tail pointer index */
tduffy> };
tduffy>
tduffy> struct dapl_cookie_buffer {
tduffy> DAPL_COOKIE *pool;
tduffy> - DAT_COUNT pool_size;
tduffy> + int pool_size;
tduffy> atomic_t head;
tduffy> atomic_t tail;
tduffy> };
tduffy> @@ -257,33 +257,32 @@ struct dapl_cno {
tduffy> };
tduffy>
tduffy> /* DAPL_EVD maps to DAT_EVD_HANDLE */
tduffy> -struct dapl_evd
tduffy> -{
tduffy> - DAPL_HEADER header;
tduffy> -
tduffy> - DAPL_EVD_STATE evd_state;
tduffy> - DAT_EVD_FLAGS evd_flags;
tduffy> -
tduffy> - /* Derived from evd_flags; see dapls_evd_internal_create. */
tduffy> - boolean_t evd_producer_locking_needed;
tduffy> -
tduffy> - /* Every EVD has a CQ unless it is a SOFTWARE_EVENT only EVD */
tduffy> - ib_cq_handle_t ib_cq_handle;
tduffy> -
tduffy> - /* An Event Dispatcher cannot be freed while
tduffy> - * it is referenced elsewhere.
tduffy> - */
tduffy> - atomic_t evd_ref_count;
tduffy> -
tduffy> - /* Set if there has been a catastrophic overflow */
tduffy> - boolean_t catastrophic_overflow;
tduffy> -
tduffy> - /* the actual events */
tduffy> - DAT_COUNT qlen;
tduffy> - struct dat_event *events;
tduffy> - DAPL_RING_BUFFER free_event_queue;
tduffy> - DAPL_RING_BUFFER pending_event_queue;
tduffy> - DAPL_CNO *cno_ptr;
tduffy> +struct dapl_evd {
tduffy> + DAPL_HEADER header;
tduffy> + DAPL_EVD_STATE evd_state;
tduffy> + DAT_EVD_FLAGS evd_flags;
tduffy> +
tduffy> + /* Derived from evd_flags; see dapls_evd_internal_create. */
tduffy> + boolean_t evd_producer_locking_needed;
tduffy> +
tduffy> + /* Every EVD has a CQ unless it is a SOFTWARE_EVENT only EVD */
tduffy> + ib_cq_handle_t ib_cq_handle;
tduffy> +
tduffy> + /*
tduffy> + * An Event Dispatcher cannot be freed while
tduffy> + * it is referenced elsewhere.
tduffy> + */
tduffy> + atomic_t evd_ref_count;
tduffy> +
tduffy> + /* Set if there has been a catastrophic overflow */
tduffy> + boolean_t catastrophic_overflow;
tduffy> +
tduffy> + /* the actual events */
tduffy> + int qlen;
tduffy> + struct dat_event *events;
tduffy> + DAPL_RING_BUFFER free_event_queue;
tduffy> + DAPL_RING_BUFFER pending_event_queue;
tduffy> + DAPL_CNO *cno_ptr;
tduffy> };
tduffy>
tduffy> /* uDAPL timer entry, used to queue timeouts */
tduffy> @@ -329,10 +328,10 @@ struct dapl_ep {
tduffy> DAPL_COOKIE_BUFFER recv_buffer;
tduffy>
tduffy> ib_data_segment_t *recv_iov;
tduffy> - DAT_COUNT recv_iov_num;
tduffy> + int recv_iov_num;
tduffy>
tduffy> ib_data_segment_t *send_iov;
tduffy> - DAT_COUNT send_iov_num;
tduffy> + int send_iov_num;
tduffy> };
tduffy>
tduffy> /* DAPL_SRQ maps to DAT_SRQ_HANDLE */
tduffy> @@ -394,7 +393,7 @@ struct dapl_sp {
tduffy> boolean_t listening; /* PSP is registered & active */
tduffy> ib_cm_srvc_handle_t cm_srvc_handle; /* Used by CM */
tduffy> DAPL_LLIST_HEAD cr_list_head; /* CR pending queue */
tduffy> - DAT_COUNT cr_list_count; /* count of CRs on queue */
tduffy> + int cr_list_count; /* count of CRs on queue */
tduffy> };
tduffy>
tduffy> /* DAPL_CR maps to DAT_CR_HANDLE */
tduffy> @@ -439,7 +438,7 @@ typedef enum dapl_cookie_type {
tduffy> struct dapl_dto_cookie {
tduffy> DAPL_DTO_TYPE type;
tduffy> DAT_DTO_COOKIE cookie;
tduffy> - DAT_COUNT size; /* used for SEND and RDMA write */
tduffy> + int size; /* used for SEND and RDMA write */
tduffy> };
tduffy>
tduffy> /* DAPL_RMR_COOKIE used as context for bind WQEs */
tduffy> @@ -452,7 +451,7 @@ struct dapl_rmr_cookie {
tduffy> struct dapl_cookie {
tduffy> DAPL_COOKIE_TYPE type; /* Must be first, to define struct. */
tduffy> DAPL_EP *ep;
tduffy> - DAT_COUNT index;
tduffy> + int index;
tduffy> union {
tduffy> DAPL_DTO_COOKIE dto;
tduffy> DAPL_RMR_COOKIE rmr;
tduffy> @@ -475,8 +474,9 @@ typedef char DAPL_HCA_NAME[DAPL_HCA_NAME
tduffy> * DAT API functions
tduffy> */
tduffy>
tduffy> -extern u32 dapl_ia_open(const DAT_NAME_PTR, DAT_COUNT, DAT_EVD_HANDLE *,
tduffy> - DAT_IA_HANDLE *);
tduffy> +extern u32 dapl_ia_open(const DAT_NAME_PTR name, int async_evd_qlen,
tduffy> + DAT_EVD_HANDLE *async_evd_handle_ptr,
tduffy> + DAT_IA_HANDLE *ia_handle_ptr);
tduffy>
tduffy> extern u32 dapl_ia_close(DAT_IA_HANDLE, DAT_CLOSE_FLAGS);
tduffy>
tduffy> @@ -496,7 +496,7 @@ extern u32 dapl_get_handle_type(DAT_HAND
tduffy> extern u32 dapl_cr_query(DAT_CR_HANDLE, struct dat_cr_param *);
tduffy>
tduffy> extern u32 dapl_cr_accept(DAT_CR_HANDLE cr_handle, DAT_EP_HANDLE ep_handle,
tduffy> - DAT_COUNT private_data_size,
tduffy> + int private_data_size,
tduffy> const void *private_data);
tduffy>
tduffy> extern u32 dapl_cr_reject(DAT_CR_HANDLE cr_handle);
tduffy> @@ -509,7 +509,7 @@ extern u32 dapl_ia_memtype_hint(DAT_IA_H
tduffy> DAT_VLEN *suggested_length,
tduffy> DAT_VADDR *suggested_alignment);
tduffy>
tduffy> -extern u32 dapl_evd_kcreate(DAT_IA_HANDLE ia_handle, DAT_COUNT evd_min_qlen,
tduffy> +extern u32 dapl_evd_kcreate(DAT_IA_HANDLE ia_handle, int evd_min_qlen,
tduffy> DAT_UPCALL_POLICY upcall_policy,
tduffy> const struct dat_upcall_object * upcall,
tduffy> DAT_EVD_FLAGS evd_flags,
tduffy> @@ -526,7 +526,7 @@ extern u32 dapl_evd_enable(DAT_EVD_HANDL
tduffy>
tduffy> extern u32 dapl_evd_disable(DAT_EVD_HANDLE evd_handle);
tduffy>
tduffy> -extern u32 dapl_evd_resize(DAT_EVD_HANDLE evd_handle, DAT_COUNT evd_qlen);
tduffy> +extern u32 dapl_evd_resize(DAT_EVD_HANDLE evd_handle, int evd_qlen);
tduffy>
tduffy> extern u32 dapl_evd_post_se(DAT_EVD_HANDLE evd_handle,
tduffy> const struct dat_event *event);
tduffy> @@ -558,39 +558,39 @@ extern u32 dapl_ep_connect(DAT_EP_HANDLE
tduffy> DAT_IA_ADDRESS_PTR remote_ia_address,
tduffy> DAT_CONN_QUAL remote_conn_qual,
tduffy> DAT_TIMEOUT timeout,
tduffy> - DAT_COUNT private_data_size,
tduffy> + int private_data_size,
tduffy> const void *private_data,
tduffy> DAT_QOS quality_of_service,
tduffy> DAT_CONNECT_FLAGS connect_flags);
tduffy>
tduffy> extern u32 dapl_ep_dup_connect(DAT_EP_HANDLE ep_handle,
tduffy> DAT_EP_HANDLE ep_dup_handle, DAT_TIMEOUT timeout,
tduffy> - DAT_COUNT private_data_size,
tduffy> + int private_data_size,
tduffy> const void *private_data,
tduffy> DAT_QOS quality_of_service);
tduffy>
tduffy> extern u32 dapl_ep_disconnect(DAT_EP_HANDLE ep_handle,
tduffy> DAT_CLOSE_FLAGS close_flags);
tduffy>
tduffy> -extern u32 dapl_ep_post_send(DAT_EP_HANDLE ep_handle, DAT_COUNT num_segments,
tduffy> +extern u32 dapl_ep_post_send(DAT_EP_HANDLE ep_handle, int num_segments,
tduffy> struct dat_lmr_triplet *local_iov,
tduffy> DAT_DTO_COOKIE user_cookie,
tduffy> DAT_COMPLETION_FLAGS completion_flags);
tduffy>
tduffy> -extern u32 dapl_ep_post_recv(DAT_EP_HANDLE ep_handle, DAT_COUNT num_segments,
tduffy> +extern u32 dapl_ep_post_recv(DAT_EP_HANDLE ep_handle, int num_segments,
tduffy> struct dat_lmr_triplet *local_iov,
tduffy> DAT_DTO_COOKIE user_cookie,
tduffy> DAT_COMPLETION_FLAGS completion_flags);
tduffy>
tduffy> extern u32 dapl_ep_post_rdma_read(DAT_EP_HANDLE ep_handle,
tduffy> - DAT_COUNT num_segments,
tduffy> + int num_segments,
tduffy> struct dat_lmr_triplet *local_iov,
tduffy> DAT_DTO_COOKIE user_cookie,
tduffy> const struct dat_rmr_triplet *remote_iov,
tduffy> DAT_COMPLETION_FLAGS completion_flags);
tduffy>
tduffy> extern u32 dapl_ep_post_rdma_write(DAT_EP_HANDLE ep_handle,
tduffy> - DAT_COUNT num_segments,
tduffy> + int num_segments,
tduffy> struct dat_lmr_triplet *local_iov,
tduffy> DAT_DTO_COOKIE user_cookie,
tduffy> const struct dat_rmr_triplet *remote_iov,
tduffy> @@ -613,12 +613,12 @@ extern u32 dapl_ep_create_with_srq(DAT_I
tduffy> DAT_EP_HANDLE *ep_handle);
tduffy>
tduffy> extern u32 dapl_ep_recv_query(DAT_EP_HANDLE ep_handle,
tduffy> - DAT_COUNT *nbufs_allocated,
tduffy> - DAT_COUNT *bufs_alloc_span);
tduffy> + int *nbufs_allocated,
tduffy> + int *bufs_alloc_span);
tduffy>
tduffy> extern u32 dapl_ep_set_watermark(DAT_EP_HANDLE ep_handle,
tduffy> - DAT_COUNT soft_high_watermark,
tduffy> - DAT_COUNT hard_high_watermark);
tduffy> + int soft_high_watermark,
tduffy> + int hard_high_watermark);
tduffy>
tduffy> /* LMR functions */
tduffy>
tduffy> @@ -703,7 +703,7 @@ extern u32 dapl_srq_create(DAT_IA_HANDLE
tduffy>
tduffy> extern u32 dapl_srq_free(DAT_SRQ_HANDLE srq_handle);
tduffy>
tduffy> -extern u32 dapl_srq_post_recv(DAT_SRQ_HANDLE srq_handle, DAT_COUNT num_segments,
tduffy> +extern u32 dapl_srq_post_recv(DAT_SRQ_HANDLE srq_handle, int num_segments,
tduffy> struct dat_lmr_triplet *local_iov,
tduffy> DAT_DTO_COOKIE user_cookie);
tduffy>
tduffy> @@ -711,9 +711,9 @@ extern u32 dapl_srq_query(DAT_SRQ_HANDLE
tduffy> struct dat_srq_param *srq_param);
tduffy>
tduffy> extern u32 dapl_srq_resize(DAT_SRQ_HANDLE srq_handle,
tduffy> - DAT_COUNT srq_max_recv_dto);
tduffy> + int srq_max_recv_dto);
tduffy>
tduffy> -extern u32 dapl_srq_set_lw(DAT_SRQ_HANDLE srq_handle, DAT_COUNT low_watermark);
tduffy> +extern u32 dapl_srq_set_lw(DAT_SRQ_HANDLE srq_handle, int low_watermark);
tduffy>
tduffy> /*
tduffy> * DAPL internal utility function prototpyes
tduffy> Index: linux-kernel/dat-provider/dapl_hash.h
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_hash.h (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_hash.h (working copy)
tduffy> @@ -67,11 +67,11 @@
tduffy> * *
tduffy> *********************************************************************/
tduffy>
tduffy> -extern u32 dapl_hash_create(DAT_COUNT capacity, DAPL_HASH_TABLE **pp_table);
tduffy> +extern u32 dapl_hash_create(int capacity, DAPL_HASH_TABLE **pp_table);
tduffy>
tduffy> extern u32 dapl_hash_free(DAPL_HASH_TABLE *p_table);
tduffy>
tduffy> -extern u32 dapl_hash_size(DAPL_HASH_TABLE *p_table, DAT_COUNT *p_size);
tduffy> +extern u32 dapl_hash_size(DAPL_HASH_TABLE *p_table, int *p_size);
tduffy>
tduffy> extern u32 dapl_hash_insert(DAPL_HASH_TABLE *p_table, DAPL_HASH_KEY key,
tduffy> DAPL_HASH_DATA data);
tduffy> Index: linux-kernel/dat-provider/dapl_ep_post_recv.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_ep_post_recv.c (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_ep_post_recv.c (working copy)
tduffy> @@ -66,7 +66,7 @@
tduffy> * DAT_PROTECTION_VIOLATION
tduffy> * DAT_PROVILEGES_VIOLATION
tduffy> */
tduffy> -u32 dapl_ep_post_recv(DAT_EP_HANDLE ep_handle, DAT_COUNT num_segments,
tduffy> +u32 dapl_ep_post_recv(DAT_EP_HANDLE ep_handle, int num_segments,
tduffy> struct dat_lmr_triplet *local_iov,
tduffy> DAT_DTO_COOKIE user_cookie,
tduffy> DAT_COMPLETION_FLAGS completion_flags)
tduffy> Index: linux-kernel/dat-provider/dapl_ep_set_watermark.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_ep_set_watermark.c (revision 2321)
tduffy> +++ linux-kernel/dat-provider/dapl_ep_set_watermark.c (working copy)
tduffy> @@ -60,8 +60,8 @@
tduffy> * DAT_MODEL_NOT_SUPPORTED
tduffy> */
tduffy> u32 dapl_ep_set_watermark(DAT_EP_HANDLE ep_handle,
tduffy> - DAT_COUNT soft_high_watermark,
tduffy> - DAT_COUNT hard_high_watermark)
tduffy> + int soft_high_watermark,
tduffy> + int hard_high_watermark)
tduffy> {
tduffy> DAPL_EP *ep_ptr;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy> Index: linux-kernel/dat/dictionary.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat/dictionary.c (revision 2321)
tduffy> +++ linux-kernel/dat/dictionary.c (working copy)
tduffy> @@ -75,8 +75,7 @@ void dat_dictionary_destroy(struct dat_d
tduffy> * Function: dat_dictionary_size
tduffy> ***********************************************************************/
tduffy>
tduffy> -u32 dat_dictionary_size(const struct dat_dictionary *dictionary,
tduffy> - DAT_COUNT *size)
tduffy> +u32 dat_dictionary_size(const struct dat_dictionary *dictionary, int *size)
tduffy> {
tduffy> BUG_ON(NULL == dictionary);
tduffy> BUG_ON(NULL == size);
tduffy> @@ -190,11 +189,11 @@ u32 dat_dictionary_search(struct dat_dic
tduffy> ***********************************************************************/
tduffy>
tduffy> u32 dat_dictionary_enumerate(struct dat_dictionary *dictionary, void *array[],
tduffy> - DAT_COUNT array_size)
tduffy> + int array_size)
tduffy> {
tduffy> struct list_head *cur_list;
tduffy> struct dat_dictionary_entry *cur_entry;
tduffy> - DAT_COUNT i;
tduffy> + int i;
tduffy> u32 status;
tduffy>
tduffy> BUG_ON(NULL == dictionary);
tduffy> Index: linux-kernel/dat/dr.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat/dr.c (revision 2321)
tduffy> +++ linux-kernel/dat/dr.c (working copy)
tduffy> @@ -42,7 +42,7 @@
tduffy> *********************************************************************/
tduffy>
tduffy> struct dat_dr_entry {
tduffy> - DAT_COUNT ref_count;
tduffy> + int ref_count;
tduffy> struct dat_provider_info info;
tduffy> DAT_IA_OPEN_FUNC ia_open_func;
tduffy> };
tduffy> @@ -206,7 +206,7 @@ u32 dat_dr_provider_close(const struct d
tduffy> * Function: dat_dr_size
tduffy> ************************************************************************/
tduffy>
tduffy> -u32 dat_dr_size(DAT_COUNT *size)
tduffy> +u32 dat_dr_size(int *size)
tduffy> {
tduffy> return dat_dictionary_size(&g_dr_dictionary, size);
tduffy> }
tduffy> @@ -215,17 +215,13 @@ u32 dat_dr_size(DAT_COUNT *size)
tduffy> * Function: dat_dr_list
tduffy> ***********************************************************************/
tduffy>
tduffy> -u32 dat_dr_list(DAT_COUNT max_to_return,
tduffy> - DAT_COUNT *entries_returned,
tduffy> +u32 dat_dr_list(int max_to_return, int *entries_returned,
tduffy> struct dat_provider_info *(dat_provider_list[]))
tduffy> {
tduffy> - struct dat_dr_entry **array;
tduffy> - DAT_COUNT array_size;
tduffy> - DAT_COUNT i;
tduffy> + struct dat_dr_entry **array = NULL;
tduffy> + int i, array_size;
tduffy> u32 status = DAT_SUCCESS;
tduffy>
tduffy> - array = NULL;
tduffy> -
tduffy> /* The dictionary size may increase between the call to */
tduffy> /* dat_dictionary_size() and dat_dictionary_enumerate(). */
tduffy> /* Therefore we loop until a successful enumeration is made. */
tduffy> Index: linux-kernel/dat/api.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat/api.c (revision 2321)
tduffy> +++ linux-kernel/dat/api.c (working copy)
tduffy> @@ -575,7 +575,7 @@ static u32 dat_strerror_minor(u32 value,
tduffy> * Function: dat_ia_openv
tduffy> ***********************************************************************/
tduffy>
tduffy> -u32 dat_ia_openv(const DAT_NAME_PTR name, DAT_COUNT async_event_qlen,
tduffy> +u32 dat_ia_openv(const DAT_NAME_PTR name, int async_event_qlen,
tduffy> DAT_EVD_HANDLE *async_event_handle, DAT_IA_HANDLE *ia_handle,
tduffy> u32 dat_major, u32 dat_minor, boolean_t thread_safety)
tduffy> {
tduffy> @@ -756,8 +756,7 @@ EXPORT_SYMBOL(dat_registry_add_provider)
tduffy> * Function: dat_registry_list_providers
tduffy> ***********************************************************************/
tduffy>
tduffy> -u32 dat_registry_list_providers(DAT_COUNT max_to_return,
tduffy> - DAT_COUNT *entries_returned,
tduffy> +u32 dat_registry_list_providers(int max_to_return, int *entries_returned,
tduffy> struct dat_provider_info *(dat_provider_list[]))
tduffy> {
tduffy> u32 status = DAT_SUCCESS;
tduffy> Index: linux-kernel/dat/dr.h
tduffy> ===================================================================
tduffy> --- linux-kernel/dat/dr.h (revision 2321)
tduffy> +++ linux-kernel/dat/dr.h (working copy)
tduffy> @@ -54,10 +54,9 @@ extern u32 dat_dr_provider_open(const st
tduffy>
tduffy> extern u32 dat_dr_provider_close(const struct dat_provider_info *info);
tduffy>
tduffy> -extern u32 dat_dr_size(DAT_COUNT *size);
tduffy> +extern u32 dat_dr_size(int *size);
tduffy>
tduffy> -extern u32 dat_dr_list(DAT_COUNT max_to_return,
tduffy> - DAT_COUNT *entries_returned,
tduffy> +extern u32 dat_dr_list(int max_to_return, int *entries_returned,
tduffy> struct dat_provider_info *(dat_provider_list[]));
tduffy>
tduffy> #endif /* DR_H */
tduffy> Index: linux-kernel/dat/dictionary.h
tduffy> ===================================================================
tduffy> --- linux-kernel/dat/dictionary.h (revision 2321)
tduffy> +++ linux-kernel/dat/dictionary.h (working copy)
tduffy> @@ -50,7 +50,7 @@ struct dat_dictionary_entry {
tduffy>
tduffy> struct dat_dictionary {
tduffy> struct list_head list;
tduffy> - DAT_COUNT size;
tduffy> + int size;
tduffy> };
tduffy>
tduffy> /*********************************************************************
tduffy> @@ -70,7 +70,7 @@ struct dat_dictionary {
tduffy> extern void dat_dictionary_destroy(struct dat_dictionary *dictionary);
tduffy>
tduffy> extern u32 dat_dictionary_size(const struct dat_dictionary *dictionary,
tduffy> - DAT_COUNT *size);
tduffy> + int *size);
tduffy>
tduffy> extern u32 dat_dictionary_entry_create(struct dat_dictionary_entry **p_entry);
tduffy>
tduffy> @@ -87,8 +87,7 @@ extern u32 dat_dictionary_search(struct
tduffy> void **p_data);
tduffy>
tduffy> extern u32 dat_dictionary_enumerate(struct dat_dictionary *dictionary,
tduffy> - void *array[],
tduffy> - const DAT_COUNT array_size);
tduffy> + void *array[], const int array_size);
tduffy>
tduffy> extern u32 dat_dictionary_remove(struct dat_dictionary *dictionary,
tduffy> const struct dat_provider_info *key,
tduffy> Index: linux-kernel/dat/dat.h
tduffy> ===================================================================
tduffy> --- linux-kernel/dat/dat.h (revision 2321)
tduffy> +++ linux-kernel/dat/dat.h (working copy)
tduffy> @@ -40,7 +40,6 @@
tduffy> /* unsigned longest native to compiler */
tduffy> typedef unsigned long long DAT_UVERYLONG;
tduffy>
tduffy> -typedef int DAT_COUNT;
tduffy> typedef u64 DAT_PADDR;
tduffy>
tduffy> /*
tduffy> @@ -575,18 +574,18 @@ struct dat_ep_attr {
tduffy> DAT_QOS qos;
tduffy> DAT_COMPLETION_FLAGS recv_completion_flags;
tduffy> DAT_COMPLETION_FLAGS request_completion_flags;
tduffy> - DAT_COUNT max_recv_dtos;
tduffy> - DAT_COUNT max_request_dtos;
tduffy> - DAT_COUNT max_recv_iov;
tduffy> - DAT_COUNT max_request_iov;
tduffy> - DAT_COUNT max_rdma_read_in;
tduffy> - DAT_COUNT max_rdma_read_out;
tduffy> - DAT_COUNT srq_soft_hw;
tduffy> - DAT_COUNT max_rdma_read_iov;
tduffy> - DAT_COUNT max_rdma_write_iov;
tduffy> - DAT_COUNT ep_transport_specific_count;
tduffy> + int max_recv_dtos;
tduffy> + int max_request_dtos;
tduffy> + int max_recv_iov;
tduffy> + int max_request_iov;
tduffy> + int max_rdma_read_in;
tduffy> + int max_rdma_read_out;
tduffy> + int srq_soft_hw;
tduffy> + int max_rdma_read_iov;
tduffy> + int max_rdma_write_iov;
tduffy> + int ep_transport_specific_count;
tduffy> struct dat_named_attr *ep_transport_specific;
tduffy> - DAT_COUNT ep_provider_specific_count;
tduffy> + int ep_provider_specific_count;
tduffy> struct dat_named_attr *ep_provider_specific;
tduffy> };
tduffy>
tduffy> @@ -656,7 +655,7 @@ typedef enum dat_ep_param_mask {
tduffy> DAT_EP_FIELD_ALL = 0x3FFFF7FF
tduffy> } DAT_EP_PARAM_MASK;
tduffy>
tduffy> -#define DAT_WATERMARK_INFINITE ((DAT_COUNT)~0)
tduffy> +#define DAT_WATERMARK_INFINITE ((int)~0)
tduffy> #define DAT_HW_DEFAULT DAT_WATERMARK_INFINITE
tduffy> #define DAT_SRQ_LW_DEFAULT 0x0
tduffy>
tduffy> @@ -665,23 +664,23 @@ typedef enum dat_srq_state {
tduffy> DAT_SRQ_STATE_ERROR
tduffy> } DAT_SRQ_STATE;
tduffy>
tduffy> -#define DAT_VALUE_UNKNOWN (((DAT_COUNT) ~0)-1)
tduffy> +#define DAT_VALUE_UNKNOWN (((int) ~0)-1)
tduffy>
tduffy> struct dat_srq_attr {
tduffy> - DAT_COUNT max_recv_dtos;
tduffy> - DAT_COUNT max_recv_iov;
tduffy> - DAT_COUNT low_watermark;
tduffy> + int max_recv_dtos;
tduffy> + int max_recv_iov;
tduffy> + int low_watermark;
tduffy> };
tduffy>
tduffy> struct dat_srq_param {
tduffy> DAT_IA_HANDLE ia_handle;
tduffy> DAT_SRQ_STATE srq_state;
tduffy> DAT_PZ_HANDLE pz_handle;
tduffy> - DAT_COUNT max_recv_dtos;
tduffy> - DAT_COUNT max_recv_iov;
tduffy> - DAT_COUNT low_watermark;
tduffy> - DAT_COUNT available_dto_count;
tduffy> - DAT_COUNT outstanding_dto_count;
tduffy> + int max_recv_dtos;
tduffy> + int max_recv_iov;
tduffy> + int low_watermark;
tduffy> + int available_dto_count;
tduffy> + int outstanding_dto_count;
tduffy> };
tduffy>
tduffy> /* PZ Parameters */
tduffy> @@ -723,7 +722,7 @@ struct dat_cr_param {
tduffy> DAT_PORT_QUAL remote_port_qual;
tduffy>
tduffy> /* Size of the Private Data. */
tduffy> - DAT_COUNT private_data_size;
tduffy> + int private_data_size;
tduffy>
tduffy> /* Pointer to the Private Data passed by remote side in the Connection
tduffy> * Request.
tduffy> @@ -820,7 +819,7 @@ struct dat_cr_arrival_event_data {
tduffy> /* Connection event data */
tduffy> struct dat_connection_event_data {
tduffy> DAT_EP_HANDLE ep_handle;
tduffy> - DAT_COUNT private_data_size;
tduffy> + int private_data_size;
tduffy> void *private_data;
tduffy> };
tduffy>
tduffy> @@ -836,7 +835,7 @@ struct dat_connection_event_data {
tduffy> struct dat_asynch_error_event_data {
tduffy> DAT_HANDLE dat_handle; /* either IA, EP, EVD, SRQ, */
tduffy> /* LMR, RMR, or PZ handle */
tduffy> - DAT_COUNT reason; /* object specific */
tduffy> + int reason; /* object specific */
tduffy> };
tduffy>
tduffy> /* The reason is object type specific and its values are defined below. */
tduffy> @@ -954,7 +953,7 @@ struct dat_provider_info {
tduffy>
tduffy> struct dat_evd_param {
tduffy> DAT_IA_HANDLE ia_handle;
tduffy> - DAT_COUNT evd_qlen;
tduffy> + int evd_qlen;
tduffy> DAT_UPCALL_POLICY upcall_policy;
tduffy> struct dat_upcall_object upcall;
tduffy> DAT_EVD_FLAGS evd_flags;
tduffy> @@ -1010,33 +1009,33 @@ struct dat_ia_attr {
tduffy> u32 firmware_version_major;
tduffy> u32 firmware_version_minor;
tduffy> DAT_IA_ADDRESS_PTR ia_address_ptr;
tduffy> - DAT_COUNT max_eps;
tduffy> - DAT_COUNT max_dto_per_ep;
tduffy> - DAT_COUNT max_rdma_read_per_ep_in;
tduffy> - DAT_COUNT max_rdma_read_per_ep_out;
tduffy> - DAT_COUNT max_evds;
tduffy> - DAT_COUNT max_evd_qlen;
tduffy> - DAT_COUNT max_iov_segments_per_dto;
tduffy> - DAT_COUNT max_lmrs;
tduffy> + int max_eps;
tduffy> + int max_dto_per_ep;
tduffy> + int max_rdma_read_per_ep_in;
tduffy> + int max_rdma_read_per_ep_out;
tduffy> + int max_evds;
tduffy> + int max_evd_qlen;
tduffy> + int max_iov_segments_per_dto;
tduffy> + int max_lmrs;
tduffy> DAT_VLEN max_lmr_block_size;
tduffy> DAT_VADDR max_lmr_virtual_address;
tduffy> - DAT_COUNT max_pzs;
tduffy> + int max_pzs;
tduffy> DAT_VLEN max_message_size;
tduffy> DAT_VLEN max_rdma_size;
tduffy> - DAT_COUNT max_rmrs;
tduffy> + int max_rmrs;
tduffy> DAT_VADDR max_rmr_target_address;
tduffy> - DAT_COUNT max_srqs;
tduffy> - DAT_COUNT max_ep_per_srq;
tduffy> - DAT_COUNT max_recv_per_srq;
tduffy> - DAT_COUNT max_iov_segments_per_rdma_read;
tduffy> - DAT_COUNT max_iov_segments_per_rdma_write;
tduffy> - DAT_COUNT max_rdma_read_in;
tduffy> - DAT_COUNT max_rdma_read_out;
tduffy> + int max_srqs;
tduffy> + int max_ep_per_srq;
tduffy> + int max_recv_per_srq;
tduffy> + int max_iov_segments_per_rdma_read;
tduffy> + int max_iov_segments_per_rdma_write;
tduffy> + int max_rdma_read_in;
tduffy> + int max_rdma_read_out;
tduffy> boolean_t max_rdma_read_per_ep_in_guaranteed;
tduffy> boolean_t max_rdma_read_per_ep_out_guaranteed;
tduffy> - DAT_COUNT num_transport_attr;
tduffy> + int num_transport_attr;
tduffy> struct dat_named_attr *transport_attr;
tduffy> - DAT_COUNT num_vendor_attr;
tduffy> + int num_vendor_attr;
tduffy> struct dat_named_attr *vendor_attr;
tduffy> };
tduffy>
tduffy> @@ -1079,21 +1078,21 @@ struct dat_provider_attr {
tduffy> DAT_QOS dat_qos_supported;
tduffy> DAT_COMPLETION_FLAGS completion_flags_supported;
tduffy> boolean_t is_thread_safe;
tduffy> - DAT_COUNT max_private_data_size;
tduffy> + int max_private_data_size;
tduffy> boolean_t supports_multipath;
tduffy> DAT_EP_CREATOR_FOR_PSP ep_creator;
tduffy> DAT_UPCALL_POLICY upcall_policy;
tduffy> u32 optimal_buffer_alignment;
tduffy> const boolean_t evd_stream_merging_supported[6][6];
tduffy> boolean_t srq_supported;
tduffy> - DAT_COUNT srq_watermarks_supported;
tduffy> + int srq_watermarks_supported;
tduffy> boolean_t srq_ep_pz_difference_supported;
tduffy> - DAT_COUNT srq_info_supported;
tduffy> - DAT_COUNT ep_recv_info_supported;
tduffy> + int srq_info_supported;
tduffy> + int ep_recv_info_supported;
tduffy> boolean_t lmr_sync_req;
tduffy> boolean_t dto_async_return_guaranteed;
tduffy> boolean_t rdma_write_for_rdma_read_req;
tduffy> - DAT_COUNT num_provider_specific_attr;
tduffy> + int num_provider_specific_attr;
tduffy> struct dat_named_attr *provider_specific_attr;
tduffy> };
tduffy>
tduffy> @@ -1105,10 +1104,10 @@ struct dat_provider_attr {
tduffy> ****************************************************************/
tduffy>
tduffy> typedef u32 (*DAT_IA_OPEN_FUNC) (
tduffy> - const DAT_NAME_PTR, DAT_COUNT, DAT_EVD_HANDLE *, DAT_IA_HANDLE *);
tduffy> + const DAT_NAME_PTR, int, DAT_EVD_HANDLE *, DAT_IA_HANDLE *);
tduffy>
tduffy> typedef u32 (*DAT_IA_OPENV_FUNC) (
tduffy> - const DAT_NAME_PTR, DAT_COUNT, DAT_EVD_HANDLE *, DAT_IA_HANDLE *,
tduffy> + const DAT_NAME_PTR, int, DAT_EVD_HANDLE *, DAT_IA_HANDLE *,
tduffy> u32, u32, boolean_t);
tduffy>
tduffy> typedef u32 (*DAT_IA_CLOSE_FUNC) (DAT_IA_HANDLE, DAT_CLOSE_FLAGS);
tduffy> @@ -1125,14 +1124,14 @@ typedef u32 (*DAT_GET_HANDLE_TYPE_FUNC)
tduffy>
tduffy> typedef u32 (*DAT_CR_QUERY_FUNC) (DAT_CR_HANDLE, struct dat_cr_param *);
tduffy>
tduffy> -typedef u32 (*DAT_CR_ACCEPT_FUNC) (DAT_CR_HANDLE, DAT_EP_HANDLE, DAT_COUNT,
tduffy> +typedef u32 (*DAT_CR_ACCEPT_FUNC) (DAT_CR_HANDLE, DAT_EP_HANDLE, int,
tduffy> const void*);
tduffy>
tduffy> typedef u32 (*DAT_CR_REJECT_FUNC) (DAT_CR_HANDLE);
tduffy>
tduffy> typedef u32 (*DAT_CR_HANDOFF_FUNC) (DAT_CR_HANDLE, DAT_CONN_QUAL);
tduffy>
tduffy> -typedef u32 (*DAT_EVD_RESIZE_FUNC) (DAT_EVD_HANDLE, DAT_COUNT);
tduffy> +typedef u32 (*DAT_EVD_RESIZE_FUNC) (DAT_EVD_HANDLE, int);
tduffy>
tduffy> typedef u32 (*DAT_EVD_POST_SE_FUNC) (DAT_EVD_HANDLE,
tduffy> const struct dat_event *);
tduffy> @@ -1158,29 +1157,29 @@ typedef u32 (*DAT_EP_MODIFY_FUNC) (
tduffy> DAT_EP_HANDLE, DAT_EP_PARAM_MASK, const struct dat_ep_param *);
tduffy>
tduffy> typedef u32 (*DAT_EP_CONNECT_FUNC) (DAT_EP_HANDLE, DAT_IA_ADDRESS_PTR,
tduffy> - DAT_CONN_QUAL, DAT_TIMEOUT, DAT_COUNT,
tduffy> + DAT_CONN_QUAL, DAT_TIMEOUT, int,
tduffy> const void *, DAT_QOS, DAT_CONNECT_FLAGS);
tduffy>
tduffy> typedef u32 (*DAT_EP_DUP_CONNECT_FUNC) (DAT_EP_HANDLE, DAT_EP_HANDLE,
tduffy> - DAT_TIMEOUT, DAT_COUNT, const void *,
tduffy> + DAT_TIMEOUT, int, const void *,
tduffy> DAT_QOS);
tduffy>
tduffy> typedef u32 (*DAT_EP_DISCONNECT_FUNC) (DAT_EP_HANDLE, DAT_CLOSE_FLAGS);
tduffy>
tduffy> typedef u32 (*DAT_EP_POST_SEND_FUNC) (
tduffy> - DAT_EP_HANDLE, DAT_COUNT, struct dat_lmr_triplet *, DAT_DTO_COOKIE,
tduffy> + DAT_EP_HANDLE, int, struct dat_lmr_triplet *, DAT_DTO_COOKIE,
tduffy> DAT_COMPLETION_FLAGS);
tduffy>
tduffy> typedef u32 (*DAT_EP_POST_RECV_FUNC) (
tduffy> - DAT_EP_HANDLE, DAT_COUNT, struct dat_lmr_triplet *, DAT_DTO_COOKIE,
tduffy> + DAT_EP_HANDLE, int, struct dat_lmr_triplet *, DAT_DTO_COOKIE,
tduffy> DAT_COMPLETION_FLAGS);
tduffy>
tduffy> typedef u32 (*DAT_EP_POST_RDMA_READ_FUNC) (
tduffy> - DAT_EP_HANDLE, DAT_COUNT, struct dat_lmr_triplet *, DAT_DTO_COOKIE,
tduffy> + DAT_EP_HANDLE, int, struct dat_lmr_triplet *, DAT_DTO_COOKIE,
tduffy> const struct dat_rmr_triplet *, DAT_COMPLETION_FLAGS);
tduffy>
tduffy> typedef u32 (*DAT_EP_POST_RDMA_WRITE_FUNC) (
tduffy> - DAT_EP_HANDLE, DAT_COUNT, struct dat_lmr_triplet *, DAT_DTO_COOKIE,
tduffy> + DAT_EP_HANDLE, int, struct dat_lmr_triplet *, DAT_DTO_COOKIE,
tduffy> const struct dat_rmr_triplet *, DAT_COMPLETION_FLAGS);
tduffy>
tduffy> typedef u32 (*DAT_EP_GET_STATUS_FUNC) (
tduffy> @@ -1191,10 +1190,10 @@ typedef u32 (*DAT_EP_FREE_FUNC) (DAT_EP_
tduffy> typedef u32 (*DAT_EP_RESET_FUNC) (DAT_EP_HANDLE);
tduffy>
tduffy> typedef u32 (*DAT_EP_RECV_QUERY_FUNC) (
tduffy> - DAT_EP_HANDLE, DAT_COUNT *, DAT_COUNT *);
tduffy> + DAT_EP_HANDLE, int *, int *);
tduffy>
tduffy> typedef u32 (*DAT_EP_SET_WATERMARK_FUNC) (
tduffy> - DAT_EP_HANDLE, DAT_COUNT, DAT_COUNT);
tduffy> + DAT_EP_HANDLE, int, int);
tduffy>
tduffy> typedef u32 (*DAT_LMR_FREE_FUNC) (DAT_LMR_HANDLE);
tduffy>
tduffy> @@ -1248,17 +1247,17 @@ typedef u32 (*DAT_PZ_FREE_FUNC) (DAT_PZ_
tduffy> typedef u32 (*DAT_SRQ_CREATE_FUNC) (
tduffy> DAT_IA_HANDLE, DAT_PZ_HANDLE, struct dat_srq_attr *, DAT_SRQ_HANDLE *);
tduffy>
tduffy> -typedef u32 (*DAT_SRQ_SET_LW_FUNC) (DAT_SRQ_HANDLE, DAT_COUNT);
tduffy> +typedef u32 (*DAT_SRQ_SET_LW_FUNC) (DAT_SRQ_HANDLE, int);
tduffy>
tduffy> typedef u32 (*DAT_SRQ_FREE_FUNC) (DAT_SRQ_HANDLE);
tduffy>
tduffy> typedef u32 (*DAT_SRQ_QUERY_FUNC) (DAT_SRQ_HANDLE,
tduffy> struct dat_srq_param *);
tduffy>
tduffy> -typedef u32 (*DAT_SRQ_RESIZE_FUNC) (DAT_SRQ_HANDLE, DAT_COUNT);
tduffy> +typedef u32 (*DAT_SRQ_RESIZE_FUNC) (DAT_SRQ_HANDLE, int);
tduffy>
tduffy> typedef u32 (*DAT_SRQ_POST_RECV_FUNC) (
tduffy> - DAT_SRQ_HANDLE, DAT_COUNT, struct dat_lmr_triplet *, DAT_DTO_COOKIE);
tduffy> + DAT_SRQ_HANDLE, int, struct dat_lmr_triplet *, DAT_DTO_COOKIE);
tduffy>
tduffy> typedef u32 (*DAT_LMR_KCREATE_FUNC) (
tduffy> DAT_IA_HANDLE, DAT_MEM_TYPE, DAT_REGION_DESCRIPTION, DAT_VLEN,
tduffy> @@ -1271,7 +1270,7 @@ typedef u32 (*DAT_IA_MEMTYPE_HINT_FUNC)
tduffy> DAT_VLEN *, DAT_VADDR *);
tduffy>
tduffy> typedef u32 (*DAT_EVD_KCREATE_FUNC) (
tduffy> - DAT_IA_HANDLE, DAT_COUNT, DAT_UPCALL_POLICY,
tduffy> + DAT_IA_HANDLE, int, DAT_UPCALL_POLICY,
tduffy> const struct dat_upcall_object *,
tduffy> DAT_EVD_FLAGS, DAT_EVD_HANDLE *);
tduffy>
tduffy> @@ -1378,9 +1377,10 @@ extern u32 dat_registry_remove_provider(
tduffy> /*
tduffy> * DAT registry functions for consumers
tduffy> */
tduffy> -extern u32 dat_ia_openv(const DAT_NAME_PTR, DAT_COUNT,
tduffy> - DAT_EVD_HANDLE *, DAT_IA_HANDLE *,
tduffy> - u32, u32, boolean_t);
tduffy> +extern u32 dat_ia_openv(const DAT_NAME_PTR name, int async_event_qlen,
tduffy> + DAT_EVD_HANDLE *async_event_handle,
tduffy> + DAT_IA_HANDLE *ia_handle, u32 dat_major, u32 dat_minor,
tduffy> + boolean_t thread_safety);
tduffy>
tduffy> #define dat_ia_open(name, qlen, async_evd, ia) \
tduffy> dat_ia_openv((name), (qlen), (async_evd), (ia), \
tduffy> @@ -1391,8 +1391,8 @@ extern u32 dat_ia_close(DAT_IA_HANDLE, D
tduffy>
tduffy> extern u32 dat_strerror(u32, const char **, const char **);
tduffy>
tduffy> -extern u32 dat_registry_list_providers(
tduffy> - DAT_COUNT, DAT_COUNT *, struct dat_provider_info *dat_provider_list[]);
tduffy> +extern u32 dat_registry_list_providers(int max_to_return, int *entries_returned,
tduffy> + struct dat_provider_info *dat_provider_list[]);
tduffy>
tduffy> /*
tduffy> * inline functions for consumers
tduffy> @@ -1402,64 +1402,57 @@ extern u32 dat_registry_list_providers(
tduffy> #define DAT_CALL_PROVIDER_FUNC(func, handle, ...) \
tduffy> DAT_HANDLE_TO_PROVIDER(handle)->func(handle, ##__VA_ARGS__)
tduffy>
tduffy> -static inline u32 dat_set_consumer_context(DAT_HANDLE handle,
tduffy> - DAT_CONTEXT context)
tduffy> +static inline u32 dat_set_consumer_context(DAT_HANDLE handle,
tduffy> + DAT_CONTEXT context)
tduffy> {
tduffy> - return DAT_CALL_PROVIDER_FUNC(
tduffy> - set_consumer_context_func, handle, context);
tduffy> + return DAT_CALL_PROVIDER_FUNC(set_consumer_context_func, handle,
tduffy> + context);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_get_consumer_context(DAT_HANDLE handle,
tduffy> - DAT_CONTEXT *context)
tduffy> +static inline u32 dat_get_consumer_context(DAT_HANDLE handle,
tduffy> + DAT_CONTEXT *context)
tduffy> {
tduffy> - return DAT_CALL_PROVIDER_FUNC(
tduffy> - get_consumer_context_func, handle, context);
tduffy> + return DAT_CALL_PROVIDER_FUNC(get_consumer_context_func, handle,
tduffy> + context);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_get_handle_type(DAT_HANDLE handle,
tduffy> - DAT_HANDLE_TYPE *type)
tduffy> +static inline u32 dat_get_handle_type(DAT_HANDLE handle, DAT_HANDLE_TYPE *type)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(get_handle_type_func, handle, type);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_ia_memtype_hint(DAT_IA_HANDLE ia,
tduffy> - DAT_MEM_TYPE mem_type,
tduffy> - DAT_VLEN length,
tduffy> - DAT_MEM_OPTIMIZE_FLAGS mem_optimize,
tduffy> - DAT_VLEN * preferred_length,
tduffy> - DAT_VADDR * preferred_alignment)
tduffy> -{
tduffy> - return DAT_CALL_PROVIDER_FUNC(
tduffy> - ia_memtype_hint_func, ia, mem_type, length, mem_optimize,
tduffy> - preferred_length, preferred_alignment);
tduffy> +static inline u32 dat_ia_memtype_hint(DAT_IA_HANDLE ia, DAT_MEM_TYPE mem_type,
tduffy> + DAT_VLEN length,
tduffy> + DAT_MEM_OPTIMIZE_FLAGS mem_optimize,
tduffy> + DAT_VLEN *preferred_length,
tduffy> + DAT_VADDR *preferred_alignment)
tduffy> +{
tduffy> + return DAT_CALL_PROVIDER_FUNC(ia_memtype_hint_func, ia, mem_type,
tduffy> + length, mem_optimize, preferred_length,
tduffy> + preferred_alignment);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_ia_query(DAT_IA_HANDLE ia,
tduffy> - DAT_EVD_HANDLE * async_evd,
tduffy> - struct dat_ia_attr *ia_attr,
tduffy> - struct dat_provider_attr *provider_attr)
tduffy> +static inline u32 dat_ia_query(DAT_IA_HANDLE ia, DAT_EVD_HANDLE *async_evd,
tduffy> + struct dat_ia_attr *ia_attr,
tduffy> + struct dat_provider_attr *provider_attr)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(
tduffy> ia_query_func, ia, async_evd, ia_attr, provider_attr);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_cr_accept(DAT_CR_HANDLE cr,
tduffy> - DAT_EP_HANDLE ep,
tduffy> - DAT_COUNT private_data_size,
tduffy> - const void *private_data)
tduffy> +static inline u32 dat_cr_accept(DAT_CR_HANDLE cr, DAT_EP_HANDLE ep,
tduffy> + int private_data_size, const void *private_data)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(
tduffy> cr_accept_func, cr, ep, private_data_size, private_data);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_cr_handoff(DAT_CR_HANDLE cr,
tduffy> - DAT_CONN_QUAL handoff)
tduffy> +static inline u32 dat_cr_handoff(DAT_CR_HANDLE cr, DAT_CONN_QUAL handoff)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(cr_handoff_func, cr, handoff);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_cr_query(DAT_CR_HANDLE cr,
tduffy> - struct dat_cr_param *param)
tduffy> +static inline u32 dat_cr_query(DAT_CR_HANDLE cr, struct dat_cr_param *param)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(cr_query_func, cr, param);
tduffy> }
tduffy> @@ -1469,8 +1462,7 @@ static inline u32 dat_cr_reject(DAT_CR_H
tduffy> return DAT_CALL_PROVIDER_FUNC(cr_reject_func, cr);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_evd_dequeue(DAT_EVD_HANDLE evd,
tduffy> - struct dat_event *event)
tduffy> +static inline u32 dat_evd_dequeue(DAT_EVD_HANDLE evd, struct dat_event *event)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(evd_dequeue_func, evd, event);
tduffy> }
tduffy> @@ -1480,94 +1472,81 @@ static inline u32 dat_evd_free(DAT_EVD_H
tduffy> return DAT_CALL_PROVIDER_FUNC(evd_free_func, evd);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_evd_kcreate(DAT_IA_HANDLE ia,
tduffy> - DAT_COUNT qlen,
tduffy> - DAT_UPCALL_POLICY policy,
tduffy> - const struct dat_upcall_object *upcall,
tduffy> - DAT_EVD_FLAGS flags,
tduffy> - DAT_EVD_HANDLE * evd)
tduffy> +static inline u32 dat_evd_kcreate(DAT_IA_HANDLE ia, int qlen,
tduffy> + DAT_UPCALL_POLICY policy,
tduffy> + const struct dat_upcall_object *upcall,
tduffy> + DAT_EVD_FLAGS flags, DAT_EVD_HANDLE * evd)
tduffy> {
tduffy> - return DAT_CALL_PROVIDER_FUNC(
tduffy> - evd_kcreate_func, ia, qlen, policy, upcall, flags, evd);
tduffy> + return DAT_CALL_PROVIDER_FUNC(evd_kcreate_func, ia, qlen, policy,
tduffy> + upcall, flags, evd);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_evd_modify_upcall(DAT_EVD_HANDLE evd,
tduffy> - DAT_UPCALL_POLICY policy,
tduffy> - const struct dat_upcall_object *upcall)
tduffy> +static inline u32 dat_evd_modify_upcall(DAT_EVD_HANDLE evd,
tduffy> + DAT_UPCALL_POLICY policy,
tduffy> + const struct dat_upcall_object *upcall)
tduffy> {
tduffy> - return DAT_CALL_PROVIDER_FUNC(
tduffy> - evd_modify_upcall_func, evd, policy, upcall);
tduffy> + return DAT_CALL_PROVIDER_FUNC(evd_modify_upcall_func, evd, policy,
tduffy> + upcall);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_evd_post_se(DAT_EVD_HANDLE evd,
tduffy> - const struct dat_event *event)
tduffy> +static inline u32 dat_evd_post_se(DAT_EVD_HANDLE evd,
tduffy> + const struct dat_event *event)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(evd_post_se_func, evd, event);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_evd_query(DAT_EVD_HANDLE evd,
tduffy> - struct dat_evd_param *param)
tduffy> +static inline u32 dat_evd_query(DAT_EVD_HANDLE evd, struct dat_evd_param *param)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(evd_query_func, evd, param);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_evd_resize(DAT_EVD_HANDLE evd, DAT_COUNT qlen)
tduffy> +static inline u32 dat_evd_resize(DAT_EVD_HANDLE evd, int qlen)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(evd_resize_func, evd, qlen);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_ep_connect(DAT_EP_HANDLE ep,
tduffy> - DAT_IA_ADDRESS_PTR ia_addr,
tduffy> - DAT_CONN_QUAL conn_qual,
tduffy> - DAT_TIMEOUT timeout,
tduffy> - DAT_COUNT private_data_size,
tduffy> - const void *private_data,
tduffy> - DAT_QOS qos,
tduffy> - DAT_CONNECT_FLAGS flags)
tduffy> -{
tduffy> - return DAT_CALL_PROVIDER_FUNC(
tduffy> - ep_connect_func, ep, ia_addr, conn_qual, timeout,
tduffy> - private_data_size, private_data, qos, flags);
tduffy> -}
tduffy> -
tduffy> -static inline u32 dat_ep_create(DAT_IA_HANDLE ia,
tduffy> - DAT_PZ_HANDLE pz,
tduffy> - DAT_EVD_HANDLE in_evd,
tduffy> - DAT_EVD_HANDLE out_evd,
tduffy> - DAT_EVD_HANDLE connect_evd,
tduffy> - const struct dat_ep_attr *attr,
tduffy> - DAT_EP_HANDLE * ep)
tduffy> -{
tduffy> - return DAT_CALL_PROVIDER_FUNC(
tduffy> - ep_create_func, ia, pz, in_evd, out_evd, connect_evd, attr, ep);
tduffy> +static inline u32 dat_ep_connect(DAT_EP_HANDLE ep, DAT_IA_ADDRESS_PTR ia_addr,
tduffy> + DAT_CONN_QUAL conn_qual, DAT_TIMEOUT timeout,
tduffy> + int private_data_size,
tduffy> + const void *private_data, DAT_QOS qos,
tduffy> + DAT_CONNECT_FLAGS flags)
tduffy> +{
tduffy> + return DAT_CALL_PROVIDER_FUNC(ep_connect_func, ep, ia_addr, conn_qual,
tduffy> + timeout, private_data_size, private_data,
tduffy> + qos, flags);
tduffy> +}
tduffy> +
tduffy> +static inline u32 dat_ep_create(DAT_IA_HANDLE ia, DAT_PZ_HANDLE pz,
tduffy> + DAT_EVD_HANDLE in_evd, DAT_EVD_HANDLE out_evd,
tduffy> + DAT_EVD_HANDLE connect_evd,
tduffy> + const struct dat_ep_attr *attr,
tduffy> + DAT_EP_HANDLE *ep)
tduffy> +{
tduffy> + return DAT_CALL_PROVIDER_FUNC(ep_create_func, ia, pz, in_evd, out_evd,
tduffy> + connect_evd, attr, ep);
tduffy> }
tduffy>
tduffy>
tduffy> -static inline u32 dat_ep_create_with_srq(DAT_IA_HANDLE ia,
tduffy> - DAT_PZ_HANDLE pz,
tduffy> - DAT_EVD_HANDLE in_evd,
tduffy> - DAT_EVD_HANDLE out_evd,
tduffy> - DAT_EVD_HANDLE connect_evd,
tduffy> - DAT_SRQ_HANDLE srq,
tduffy> - const struct dat_ep_attr *attr,
tduffy> - DAT_EP_HANDLE * ep)
tduffy> +static inline u32 dat_ep_create_with_srq(DAT_IA_HANDLE ia, DAT_PZ_HANDLE pz,
tduffy> + DAT_EVD_HANDLE in_evd,
tduffy> + DAT_EVD_HANDLE out_evd,
tduffy> + DAT_EVD_HANDLE connect_evd,
tduffy> + DAT_SRQ_HANDLE srq,
tduffy> + const struct dat_ep_attr *attr,
tduffy> + DAT_EP_HANDLE *ep)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(ep_create_with_srq_func, ia, pz, in_evd,
tduffy> out_evd, connect_evd, srq, attr, ep);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_ep_disconnect(DAT_EP_HANDLE ep,
tduffy> - DAT_CLOSE_FLAGS flags)
tduffy> +static inline u32 dat_ep_disconnect(DAT_EP_HANDLE ep, DAT_CLOSE_FLAGS flags)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(ep_disconnect_func, ep, flags);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_ep_dup_connect(DAT_EP_HANDLE ep,
tduffy> - DAT_EP_HANDLE dup_ep,
tduffy> - DAT_TIMEOUT timeout,
tduffy> - DAT_COUNT private_data_size,
tduffy> - const void *private_data,
tduffy> - DAT_QOS qos)
tduffy> +static inline u32 dat_ep_dup_connect(DAT_EP_HANDLE ep, DAT_EP_HANDLE dup_ep,
tduffy> + DAT_TIMEOUT timeout, int private_data_size,
tduffy> + const void *private_data, DAT_QOS qos)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(ep_dup_connect_func, ep, dup_ep, timeout,
tduffy> private_data_size, private_data, qos);
tduffy> @@ -1578,56 +1557,50 @@ static inline u32 dat_ep_free(DAT_EP_HAN
tduffy> return DAT_CALL_PROVIDER_FUNC(ep_free_func, ep);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_ep_get_status(DAT_EP_HANDLE ep,
tduffy> - DAT_EP_STATE * state,
tduffy> - boolean_t *recv_idle,
tduffy> - boolean_t *req_idle)
tduffy> +static inline u32 dat_ep_get_status(DAT_EP_HANDLE ep, DAT_EP_STATE *state,
tduffy> + boolean_t *recv_idle, boolean_t *req_idle)
tduffy> {
tduffy> - return DAT_CALL_PROVIDER_FUNC(
tduffy> - ep_get_status_func, ep, state, recv_idle, req_idle);
tduffy> + return DAT_CALL_PROVIDER_FUNC(ep_get_status_func, ep, state, recv_idle,
tduffy> + req_idle);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_ep_modify(DAT_EP_HANDLE ep,
tduffy> - DAT_EP_PARAM_MASK mask,
tduffy> - const struct dat_ep_param *param)
tduffy> +static inline u32 dat_ep_modify(DAT_EP_HANDLE ep, DAT_EP_PARAM_MASK mask,
tduffy> + const struct dat_ep_param *param)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(ep_modify_func, ep, mask, param);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_ep_post_rdma_read(DAT_EP_HANDLE ep,
tduffy> - DAT_COUNT size,
tduffy> - struct dat_lmr_triplet *local_iov,
tduffy> - DAT_DTO_COOKIE cookie,
tduffy> - const struct dat_rmr_triplet *remote_iov,
tduffy> - DAT_COMPLETION_FLAGS flags)
tduffy> +static inline u32 dat_ep_post_rdma_read(DAT_EP_HANDLE ep, int size,
tduffy> + struct dat_lmr_triplet *local_iov,
tduffy> + DAT_DTO_COOKIE cookie,
tduffy> + const struct dat_rmr_triplet *remote_iov,
tduffy> + DAT_COMPLETION_FLAGS flags)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(ep_post_rdma_read_func, ep, size,
tduffy> local_iov, cookie, remote_iov, flags);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_ep_post_rdma_write(DAT_EP_HANDLE ep,
tduffy> - DAT_COUNT size,
tduffy> - struct dat_lmr_triplet *local_iov,
tduffy> - DAT_DTO_COOKIE cookie,
tduffy> - const struct dat_rmr_triplet *remote_iov,
tduffy> - DAT_COMPLETION_FLAGS flags)
tduffy> +static inline u32 dat_ep_post_rdma_write(DAT_EP_HANDLE ep, int size,
tduffy> + struct dat_lmr_triplet *local_iov,
tduffy> + DAT_DTO_COOKIE cookie,
tduffy> + const struct dat_rmr_triplet *remote_iov,
tduffy> + DAT_COMPLETION_FLAGS flags)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(ep_post_rdma_write_func, ep, size,
tduffy> local_iov, cookie, remote_iov, flags);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_ep_post_recv(DAT_EP_HANDLE ep,
tduffy> - DAT_COUNT size,
tduffy> - struct dat_lmr_triplet *local_iov,
tduffy> - DAT_DTO_COOKIE cookie,
tduffy> - DAT_COMPLETION_FLAGS flags)
tduffy> +static inline u32 dat_ep_post_recv(DAT_EP_HANDLE ep, int size,
tduffy> + struct dat_lmr_triplet *local_iov,
tduffy> + DAT_DTO_COOKIE cookie,
tduffy> + DAT_COMPLETION_FLAGS flags)
tduffy> {
tduffy> - return DAT_CALL_PROVIDER_FUNC(
tduffy> - ep_post_recv_func, ep, size, local_iov, cookie, flags);
tduffy> + return DAT_CALL_PROVIDER_FUNC(ep_post_recv_func, ep, size, local_iov,
tduffy> + cookie, flags);
tduffy> }
tduffy>
tduffy> static inline u32 dat_ep_post_send(DAT_EP_HANDLE ep,
tduffy> - DAT_COUNT size,
tduffy> + int size,
tduffy> struct dat_lmr_triplet *local_iov,
tduffy> DAT_DTO_COOKIE cookie,
tduffy> DAT_COMPLETION_FLAGS flags)
tduffy> @@ -1641,12 +1614,11 @@ static inline u32 dat_ep_query(DAT_EP_HA
tduffy> return DAT_CALL_PROVIDER_FUNC(ep_query_func, ep, param);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_ep_recv_query(DAT_EP_HANDLE ep,
tduffy> - DAT_COUNT * bufs_alloc,
tduffy> - DAT_COUNT * bufs_avail)
tduffy> +static inline u32 dat_ep_recv_query(DAT_EP_HANDLE ep, int *bufs_alloc,
tduffy> + int *bufs_avail)
tduffy> {
tduffy> - return DAT_CALL_PROVIDER_FUNC(
tduffy> - ep_recv_query_func, ep, bufs_alloc, bufs_avail);
tduffy> + return DAT_CALL_PROVIDER_FUNC(ep_recv_query_func, ep, bufs_alloc,
tduffy> + bufs_avail);
tduffy> }
tduffy>
tduffy> static inline u32 dat_ep_reset(DAT_EP_HANDLE ep)
tduffy> @@ -1654,16 +1626,15 @@ static inline u32 dat_ep_reset(DAT_EP_HA
tduffy> return DAT_CALL_PROVIDER_FUNC(ep_reset_func, ep);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_ep_set_watermark(DAT_EP_HANDLE ep,
tduffy> - DAT_COUNT soft_high_watermark,
tduffy> - DAT_COUNT hard_high_watermark)
tduffy> +static inline u32 dat_ep_set_watermark(DAT_EP_HANDLE ep,
tduffy> + int soft_high_watermark,
tduffy> + int hard_high_watermark)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(ep_set_watermark_func, ep,
tduffy> soft_high_watermark, hard_high_watermark);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_lmr_query(DAT_LMR_HANDLE lmr,
tduffy> - struct dat_lmr_param *param)
tduffy> +static inline u32 dat_lmr_query(DAT_LMR_HANDLE lmr, struct dat_lmr_param *param)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(lmr_query_func, lmr, param);
tduffy> }
tduffy> @@ -1673,23 +1644,23 @@ static inline u32 dat_lmr_free(DAT_LMR_H
tduffy> return DAT_CALL_PROVIDER_FUNC(lmr_free_func, lmr);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_lmr_sync_rdma_read(DAT_IA_HANDLE ia,
tduffy> - const struct dat_lmr_triplet *iovs,
tduffy> - DAT_VLEN num_iovs)
tduffy> +static inline u32 dat_lmr_sync_rdma_read(DAT_IA_HANDLE ia,
tduffy> + const struct dat_lmr_triplet *iovs,
tduffy> + DAT_VLEN num_iovs)
tduffy> {
tduffy> - return DAT_CALL_PROVIDER_FUNC(
tduffy> - lmr_sync_rdma_read_func, ia, iovs, num_iovs);
tduffy> + return DAT_CALL_PROVIDER_FUNC(lmr_sync_rdma_read_func, ia, iovs,
tduffy> + num_iovs);
tduffy> }
tduffy>
tduffy> static inline u32 dat_lmr_sync_rdma_write(DAT_IA_HANDLE ia,
tduffy> - const struct dat_lmr_triplet *iovs,
tduffy> - DAT_VLEN num_iovs)
tduffy> + const struct dat_lmr_triplet *iovs,
tduffy> + DAT_VLEN num_iovs)
tduffy> {
tduffy> - return DAT_CALL_PROVIDER_FUNC(
tduffy> - lmr_sync_rdma_write_func, ia, iovs, num_iovs);
tduffy> + return DAT_CALL_PROVIDER_FUNC(lmr_sync_rdma_write_func, ia, iovs,
tduffy> + num_iovs);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_rmr_create(DAT_PZ_HANDLE pz, DAT_RMR_HANDLE * rmr)
tduffy> +static inline u32 dat_rmr_create(DAT_PZ_HANDLE pz, DAT_RMR_HANDLE *rmr)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(rmr_create_func, pz, rmr);
tduffy> }
tduffy> @@ -1699,13 +1670,12 @@ static inline u32 dat_rmr_query(DAT_RMR_
tduffy> return DAT_CALL_PROVIDER_FUNC(rmr_query_func, rmr, param);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_rmr_bind(DAT_RMR_HANDLE rmr,
tduffy> - const struct dat_lmr_triplet *iov,
tduffy> - DAT_MEM_PRIV_FLAGS mem_flags,
tduffy> - DAT_EP_HANDLE ep,
tduffy> - DAT_RMR_COOKIE cookie,
tduffy> - DAT_COMPLETION_FLAGS comp_flags,
tduffy> - DAT_RMR_CONTEXT * context)
tduffy> +static inline u32 dat_rmr_bind(DAT_RMR_HANDLE rmr,
tduffy> + const struct dat_lmr_triplet *iov,
tduffy> + DAT_MEM_PRIV_FLAGS mem_flags,
tduffy> + DAT_EP_HANDLE ep, DAT_RMR_COOKIE cookie,
tduffy> + DAT_COMPLETION_FLAGS comp_flags,
tduffy> + DAT_RMR_CONTEXT *context)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(rmr_bind_func, rmr, iov, mem_flags, ep,
tduffy> cookie, comp_flags, context);
tduffy> @@ -1716,28 +1686,23 @@ static inline u32 dat_rmr_free(DAT_RMR_H
tduffy> return DAT_CALL_PROVIDER_FUNC(rmr_free_func, rmr);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_psp_create(DAT_IA_HANDLE ia,
tduffy> - DAT_CONN_QUAL conn_qual,
tduffy> - DAT_EVD_HANDLE evd,
tduffy> - DAT_PSP_FLAGS flags,
tduffy> - DAT_PSP_HANDLE * psp)
tduffy> +static inline u32 dat_psp_create(DAT_IA_HANDLE ia, DAT_CONN_QUAL conn_qual,
tduffy> + DAT_EVD_HANDLE evd, DAT_PSP_FLAGS flags,
tduffy> + DAT_PSP_HANDLE *psp)
tduffy> {
tduffy> - return DAT_CALL_PROVIDER_FUNC(
tduffy> - psp_create_func, ia, conn_qual, evd, flags, psp);
tduffy> + return DAT_CALL_PROVIDER_FUNC(psp_create_func, ia, conn_qual, evd,
tduffy> + flags, psp);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_psp_create_any(DAT_IA_HANDLE ia,
tduffy> - DAT_CONN_QUAL * conn_qual,
tduffy> - DAT_EVD_HANDLE evd,
tduffy> - DAT_PSP_FLAGS flags,
tduffy> - DAT_PSP_HANDLE * psp)
tduffy> +static inline u32 dat_psp_create_any(DAT_IA_HANDLE ia, DAT_CONN_QUAL *conn_qual,
tduffy> + DAT_EVD_HANDLE evd, DAT_PSP_FLAGS flags,
tduffy> + DAT_PSP_HANDLE *psp)
tduffy> {
tduffy> - return DAT_CALL_PROVIDER_FUNC(
tduffy> - psp_create_any_func, ia, conn_qual, evd, flags, psp);
tduffy> + return DAT_CALL_PROVIDER_FUNC(psp_create_any_func, ia, conn_qual, evd,
tduffy> + flags, psp);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_psp_query(DAT_PSP_HANDLE psp,
tduffy> - struct dat_psp_param *param)
tduffy> +static inline u32 dat_psp_query(DAT_PSP_HANDLE psp, struct dat_psp_param *param)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(psp_query_func, psp, param);
tduffy> }
tduffy> @@ -1747,18 +1712,15 @@ static inline u32 dat_psp_free(DAT_PSP_H
tduffy> return DAT_CALL_PROVIDER_FUNC(psp_free_func, psp);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_rsp_create(DAT_IA_HANDLE ia,
tduffy> - DAT_CONN_QUAL conn_qual,
tduffy> - DAT_EP_HANDLE ep,
tduffy> - DAT_EVD_HANDLE evd,
tduffy> - DAT_RSP_HANDLE * rsp)
tduffy> +static inline u32 dat_rsp_create(DAT_IA_HANDLE ia, DAT_CONN_QUAL conn_qual,
tduffy> + DAT_EP_HANDLE ep, DAT_EVD_HANDLE evd,
tduffy> + DAT_RSP_HANDLE *rsp)
tduffy> {
tduffy> - return DAT_CALL_PROVIDER_FUNC(
tduffy> - rsp_create_func, ia, conn_qual, ep, evd, rsp);
tduffy> + return DAT_CALL_PROVIDER_FUNC(rsp_create_func, ia, conn_qual, ep, evd,
tduffy> + rsp);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_rsp_query(DAT_RSP_HANDLE rsp,
tduffy> - struct dat_rsp_param *param)
tduffy> +static inline u32 dat_rsp_query(DAT_RSP_HANDLE rsp, struct dat_rsp_param *param)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(rsp_query_func, rsp, param);
tduffy> }
tduffy> @@ -1768,13 +1730,12 @@ static inline u32 dat_rsp_free(DAT_RSP_H
tduffy> return DAT_CALL_PROVIDER_FUNC(rsp_free_func, rsp);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_pz_create(DAT_IA_HANDLE ia, DAT_PZ_HANDLE * pz)
tduffy> +static inline u32 dat_pz_create(DAT_IA_HANDLE ia, DAT_PZ_HANDLE *pz)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(pz_create_func, ia, pz);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_pz_query(DAT_PZ_HANDLE pz,
tduffy> - struct dat_pz_param *param)
tduffy> +static inline u32 dat_pz_query(DAT_PZ_HANDLE pz, struct dat_pz_param *param)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(pz_query_func, pz, param);
tduffy> }
tduffy> @@ -1784,10 +1745,9 @@ static inline u32 dat_pz_free(DAT_PZ_HAN
tduffy> return DAT_CALL_PROVIDER_FUNC(pz_free_func, pz);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_srq_create(DAT_IA_HANDLE ia,
tduffy> - DAT_PZ_HANDLE pz,
tduffy> - struct dat_srq_attr *attr,
tduffy> - DAT_SRQ_HANDLE * srq)
tduffy> +static inline u32 dat_srq_create(DAT_IA_HANDLE ia, DAT_PZ_HANDLE pz,
tduffy> + struct dat_srq_attr *attr,
tduffy> + DAT_SRQ_HANDLE *srq)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(srq_create_func, ia, pz, attr, srq);
tduffy> }
tduffy> @@ -1797,50 +1757,44 @@ static inline u32 dat_srq_free(DAT_SRQ_H
tduffy> return DAT_CALL_PROVIDER_FUNC(srq_free_func, srq);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_srq_post_recv(DAT_SRQ_HANDLE srq,
tduffy> - DAT_COUNT num_iovs,
tduffy> - struct dat_lmr_triplet *iovs,
tduffy> - DAT_DTO_COOKIE cookie)
tduffy> +static inline u32 dat_srq_post_recv(DAT_SRQ_HANDLE srq, int num_iovs,
tduffy> + struct dat_lmr_triplet *iovs,
tduffy> + DAT_DTO_COOKIE cookie)
tduffy> {
tduffy> - return DAT_CALL_PROVIDER_FUNC(
tduffy> - srq_post_recv_func, srq, num_iovs, iovs, cookie);
tduffy> + return DAT_CALL_PROVIDER_FUNC(srq_post_recv_func, srq, num_iovs, iovs,
tduffy> + cookie);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_srq_query(DAT_SRQ_HANDLE srq,
tduffy> - struct dat_srq_param *param)
tduffy> +static inline u32 dat_srq_query(DAT_SRQ_HANDLE srq, struct dat_srq_param *param)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(srq_query_func, srq, param);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_srq_resize(DAT_SRQ_HANDLE srq,
tduffy> - DAT_COUNT max_recv_dtos)
tduffy> +static inline u32 dat_srq_resize(DAT_SRQ_HANDLE srq, int max_recv_dtos)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(srq_resize_func, srq, max_recv_dtos);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_srq_set_lw(DAT_SRQ_HANDLE srq,
tduffy> - DAT_COUNT low_watermark)
tduffy> +static inline u32 dat_srq_set_lw(DAT_SRQ_HANDLE srq, int low_watermark)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(srq_set_lw_func, srq, low_watermark);
tduffy> }
tduffy>
tduffy> -static inline u32 dat_lmr_kcreate(DAT_IA_HANDLE ia,
tduffy> - DAT_MEM_TYPE type,
tduffy> - DAT_REGION_DESCRIPTION region,
tduffy> - DAT_VLEN len,
tduffy> - DAT_PZ_HANDLE pz,
tduffy> - DAT_MEM_PRIV_FLAGS privileges,
tduffy> - DAT_MEM_OPTIMIZE_FLAGS optimization,
tduffy> - DAT_LMR_HANDLE * lmr_handle,
tduffy> - DAT_LMR_CONTEXT * lmr_context,
tduffy> - DAT_RMR_CONTEXT * rmr_context,
tduffy> - DAT_VLEN * registered_length,
tduffy> - DAT_VADDR *registered_address)
tduffy> -{
tduffy> - return DAT_CALL_PROVIDER_FUNC(
tduffy> - lmr_kcreate_func, ia, type, region, len, pz, privileges,
tduffy> - optimization, lmr_handle, lmr_context, rmr_context,
tduffy> - registered_length, registered_address);
tduffy> +static inline u32 dat_lmr_kcreate(DAT_IA_HANDLE ia, DAT_MEM_TYPE type,
tduffy> + DAT_REGION_DESCRIPTION region, DAT_VLEN len,
tduffy> + DAT_PZ_HANDLE pz,
tduffy> + DAT_MEM_PRIV_FLAGS privileges,
tduffy> + DAT_MEM_OPTIMIZE_FLAGS optimization,
tduffy> + DAT_LMR_HANDLE *lmr_handle,
tduffy> + DAT_LMR_CONTEXT *lmr_context,
tduffy> + DAT_RMR_CONTEXT *rmr_context,
tduffy> + DAT_VLEN *registered_length,
tduffy> + DAT_VADDR *registered_address)
tduffy> +{
tduffy> + return DAT_CALL_PROVIDER_FUNC(lmr_kcreate_func, ia, type, region, len,
tduffy> + pz, privileges, optimization, lmr_handle,
tduffy> + lmr_context, rmr_context,
tduffy> + registered_length, registered_address);
tduffy> }
tduffy>
tduffy> #endif /* DAT_H */
tduffy>
More information about the general
mailing list