[openib-general] Re: [PATCH] kDAPL: remove DAT_BOOLEAN
James Lentini
jlentini at netapp.com
Wed May 11 08:21:45 PDT 2005
tduffy> I am sending this as a separate patch because I am not sure what the
tduffy> "right" thing to do is. Looking around the kernel, it seems booleans
tduffy> are handled in different ways. Some places, they are enums, others just
tduffy> #defines.
tduffy>
tduffy> In e1000, ixgb, compaq fc, DAT960, and xfs, they are enums. In jfs and
tduffy> arch parisc, a bool is an int and TRUE and FALSE are #define'd. TRUE
tduffy> and FALSE are defined so many times in the kernel, it seems rather
tduffy> ridiculous.
I agree.
tduffy> Maybe the right thing to do is fix the whole kernel in a
tduffy> consistent way and submit an upstream patch, but this will
tduffy> require quite a bit of janitorial work.
That would be a noble act.
tduffy> I don't mind using either way in kDAPL (or some third -- getting rid of
tduffy> bool's all together?), but this patch uses the enum method. At least we
tduffy> need to get rid of the DAT_ prefix.
I like enums. I've commited this in revision 2303.
tduffy>
tduffy> Singed-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 2295)
tduffy> +++ linux-kernel/test/dapltest/test/dapl_performance_util.c (working copy)
tduffy> @@ -35,8 +35,8 @@ DT_Performance_Test_Create (
tduffy> Per_Test_Data_t *pt_ptr,
tduffy> DAT_IA_HANDLE *ia_handle,
tduffy> DAT_IA_ADDRESS_PTR remote_ia_addr,
tduffy> - DAT_BOOLEAN is_server,
tduffy> - DAT_BOOLEAN is_remote_little_endian,
tduffy> + boolean_t is_server,
tduffy> + boolean_t is_remote_little_endian,
tduffy> Performance_Test_t **perf_test)
tduffy> {
tduffy> Performance_Test_t *test_ptr;
tduffy> @@ -266,7 +266,7 @@ int
tduffy> DT_Performance_Test_Destroy (
tduffy> Per_Test_Data_t *pt_ptr,
tduffy> Performance_Test_t *test_ptr,
tduffy> - DAT_BOOLEAN is_server)
tduffy> + boolean_t is_server)
tduffy> {
tduffy> DAT_RETURN ret;
tduffy> DAT_EP_HANDLE ep_handle;
tduffy> Index: linux-kernel/test/dapltest/test/dapl_cnxn.c
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/test/dapl_cnxn.c (revision 2295)
tduffy> +++ linux-kernel/test/dapltest/test/dapl_cnxn.c (working copy)
tduffy> @@ -32,8 +32,8 @@ int
tduffy> get_ep_connection_state (DT_Tdep_Print_Head *phead, DAT_EP_HANDLE ep_handle)
tduffy> {
tduffy> DAT_EP_STATE ep_state;
tduffy> - DAT_BOOLEAN in_dto_idle;
tduffy> - DAT_BOOLEAN out_dto_idle;
tduffy> + boolean_t in_dto_idle;
tduffy> + boolean_t out_dto_idle;
tduffy> DAT_RETURN ret;
tduffy> char *recv_status = "Idle";
tduffy> char *req_status = "Idle";
tduffy> Index: linux-kernel/test/dapltest/test/dapl_transaction_test.c
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/test/dapl_transaction_test.c (revision 2295)
tduffy> +++ linux-kernel/test/dapltest/test/dapl_transaction_test.c (working copy)
tduffy> @@ -159,9 +159,9 @@ DT_Transaction_Test_Server (void *params
tduffy> bool
tduffy> DT_Transaction_Create_Test (Per_Test_Data_t * pt_ptr,
tduffy> DAT_IA_HANDLE *ia_handle,
tduffy> - DAT_BOOLEAN is_server,
tduffy> + boolean_t is_server,
tduffy> unsigned int port_num,
tduffy> - DAT_BOOLEAN remote_is_little_endian,
tduffy> + boolean_t remote_is_little_endian,
tduffy> DAT_IA_ADDRESS_PTR remote_ia_addr)
tduffy> {
tduffy> Transaction_Test_t *test_ptr;
tduffy> @@ -820,7 +820,7 @@ retry:
tduffy> */
tduffy> for (j = 0; j < test_ptr->cmd->num_ops; j++)
tduffy> {
tduffy> - DAT_BOOLEAN us;
tduffy> + boolean_t us;
tduffy>
tduffy> us = (pt_ptr->local_is_server &&
tduffy> test_ptr->ep_context[i].op[j].server_initiated) ||
tduffy> @@ -1039,7 +1039,7 @@ retry:
tduffy> RMI_RECV_BUFFER_ID);
tduffy> for (j = 0; j < test_ptr->cmd->num_ops; j++)
tduffy> {
tduffy> - DAT_BOOLEAN us;
tduffy> + boolean_t us;
tduffy>
tduffy> us = (pt_ptr->local_is_server &&
tduffy> test_ptr->ep_context[i].op[j].server_initiated) ||
tduffy> Index: linux-kernel/test/dapltest/test/dapl_bpool.c
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/test/dapl_bpool.c (revision 2295)
tduffy> +++ linux-kernel/test/dapltest/test/dapl_bpool.c (working copy)
tduffy> @@ -93,8 +93,8 @@ DT_BpoolAlloc (
tduffy> DAT_COUNT seg_size,
tduffy> DAT_COUNT num_segs,
tduffy> DAT_COUNT alignment,
tduffy> - DAT_BOOLEAN enable_rdma_write,
tduffy> - DAT_BOOLEAN enable_rdma_read)
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> Index: linux-kernel/test/dapltest/test/dapl_test_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/test/dapl_test_util.c (revision 2295)
tduffy> +++ linux-kernel/test/dapltest/test/dapl_test_util.c (working copy)
tduffy> @@ -30,7 +30,7 @@
tduffy> /* -----------------------------------------------------------
tduffy> * Gather info about default attributes
tduffy> */
tduffy> -DAT_BOOLEAN
tduffy> +boolean_t
tduffy> DT_query ( Per_Test_Data_t *pt_ptr,
tduffy> DAT_IA_HANDLE ia_handle,
tduffy> DAT_EP_HANDLE ep_handle)
tduffy> @@ -158,7 +158,7 @@ DT_query ( Per_Test_Data_t *pt_ptr,
tduffy> /* -----------------------------------------------------------
tduffy> * Post a recv buffer
tduffy> */
tduffy> -DAT_BOOLEAN
tduffy> +boolean_t
tduffy> DT_post_recv_buffer (DT_Tdep_Print_Head *phead,
tduffy> DAT_EP_HANDLE ep_handle,
tduffy> Bpool * bp,
tduffy> @@ -203,7 +203,7 @@ DT_post_recv_buffer (DT_Tdep_Print_Head
tduffy> /* -----------------------------------------------------------
tduffy> * Post a send buffer
tduffy> */
tduffy> -DAT_BOOLEAN
tduffy> +boolean_t
tduffy> DT_post_send_buffer (DT_Tdep_Print_Head *phead,
tduffy> DAT_EP_HANDLE ep_handle,
tduffy> Bpool * bp,
tduffy> Index: linux-kernel/test/dapltest/include/dapl_performance_test.h
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/include/dapl_performance_test.h (revision 2295)
tduffy> +++ linux-kernel/test/dapltest/include/dapl_performance_test.h (working copy)
tduffy> @@ -67,7 +67,7 @@ typedef struct
tduffy> Per_Test_Data_t *pt_ptr;
tduffy> Performance_Cmd_t *cmd;
tduffy> DAT_IA_ADDRESS_PTR remote_ia_addr;
tduffy> - DAT_BOOLEAN is_remote_little_endian;
tduffy> + boolean_t is_remote_little_endian;
tduffy> DAT_CONN_QUAL base_port;
tduffy> struct dat_ia_attr ia_attr;
tduffy> DAT_IA_HANDLE ia_handle;
tduffy> Index: linux-kernel/test/dapltest/include/dapl_proto.h
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/include/dapl_proto.h (revision 2295)
tduffy> +++ linux-kernel/test/dapltest/include/dapl_proto.h (working copy)
tduffy> @@ -88,8 +88,8 @@ Bpool * DT_BpoolAlloc (Per_Test_
tduffy> DAT_COUNT seg_size,
tduffy> DAT_COUNT num_segs,
tduffy> DAT_COUNT alignment,
tduffy> - DAT_BOOLEAN enable_rdma_write,
tduffy> - DAT_BOOLEAN enable_rdma_read);
tduffy> + boolean_t enable_rdma_write,
tduffy> + boolean_t enable_rdma_read);
tduffy>
tduffy> bool DT_Bpool_Destroy (Per_Test_Data_t * pt_ptr,
tduffy> DT_Tdep_Print_Head *phead,
tduffy> @@ -267,13 +267,13 @@ bool DT_Performance_Test_Serv
tduffy> bool DT_Performance_Test_Create (Per_Test_Data_t * pt_ptr,
tduffy> DAT_IA_HANDLE * ia_handle,
tduffy> DAT_IA_ADDRESS_PTR remote_ia_addr,
tduffy> - DAT_BOOLEAN is_server,
tduffy> - DAT_BOOLEAN is_remote_little_endian,
tduffy> + boolean_t is_server,
tduffy> + boolean_t is_remote_little_endian,
tduffy> Performance_Test_t **perf_test);
tduffy>
tduffy> int DT_Performance_Test_Destroy (Per_Test_Data_t * pt_ptr,
tduffy> Performance_Test_t *test_ptr,
tduffy> - DAT_BOOLEAN is_server);
tduffy> + boolean_t is_server);
tduffy>
tduffy> bool DT_performance_post_rdma_op (Performance_Ep_Context_t *ep_context,
tduffy> DAT_EVD_HANDLE reqt_evd_hdl,
tduffy> @@ -349,17 +349,17 @@ Per_Test_Data_t *DT_Alloc_Per_Test_Data
tduffy> void DT_Free_Per_Test_Data (Per_Test_Data_t * pt_ptr);
tduffy>
tduffy> /* dapl_test_util.c */
tduffy> -DAT_BOOLEAN DT_query (Per_Test_Data_t *pt_ptr,
tduffy> +boolean_t DT_query (Per_Test_Data_t *pt_ptr,
tduffy> DAT_IA_HANDLE ia_handle,
tduffy> DAT_EP_HANDLE ep_handle);
tduffy>
tduffy> -DAT_BOOLEAN DT_post_recv_buffer (DT_Tdep_Print_Head* phead,
tduffy> +boolean_t DT_post_recv_buffer (DT_Tdep_Print_Head* phead,
tduffy> DAT_EP_HANDLE ep_handle,
tduffy> Bpool * bp,
tduffy> int index,
tduffy> int size);
tduffy>
tduffy> -DAT_BOOLEAN DT_post_send_buffer (DT_Tdep_Print_Head* phead,
tduffy> +boolean_t DT_post_send_buffer (DT_Tdep_Print_Head* phead,
tduffy> DAT_EP_HANDLE ep_handle,
tduffy> Bpool * bp,
tduffy> int index,
tduffy> @@ -471,9 +471,9 @@ void DT_Transaction_Test_Serv
tduffy>
tduffy> bool DT_Transaction_Create_Test (Per_Test_Data_t * pt_ptr,
tduffy> DAT_IA_HANDLE * ia_handle,
tduffy> - DAT_BOOLEAN is_server,
tduffy> + boolean_t is_server,
tduffy> unsigned int port_num,
tduffy> - DAT_BOOLEAN remote_is_little_endian,
tduffy> + boolean_t remote_is_little_endian,
tduffy> DAT_IA_ADDRESS_PTR remote_ia_addr);
tduffy>
tduffy> void DT_Transaction_Main (void *param);
tduffy> Index: linux-kernel/test/dapltest/include/dapl_bpool.h
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/include/dapl_bpool.h (revision 2295)
tduffy> +++ linux-kernel/test/dapltest/include/dapl_bpool.h (working copy)
tduffy> @@ -49,8 +49,8 @@ struct Bpool_tag {
tduffy> DAT_LMR_HANDLE lmr_handle; /* local access */
tduffy> DAT_LMR_CONTEXT lmr_context;
tduffy> struct dat_lmr_triplet *tripl_start; /* local IOV */
tduffy> - DAT_BOOLEAN enable_rdma_write; /* remote access */
tduffy> - DAT_BOOLEAN enable_rdma_read;
tduffy> + boolean_t enable_rdma_write; /* remote access */
tduffy> + boolean_t enable_rdma_read;
tduffy> DAT_RMR_HANDLE rmr_handle;
tduffy> DAT_RMR_CONTEXT rmr_context;
tduffy> DAT_EVD_HANDLE rmr_evd_handle;
tduffy> Index: linux-kernel/test/dapltest/include/dapl_transaction_test.h
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/include/dapl_transaction_test.h (revision 2295)
tduffy> +++ linux-kernel/test/dapltest/include/dapl_transaction_test.h (working copy)
tduffy> @@ -35,11 +35,11 @@
tduffy>
tduffy> typedef struct
tduffy> {
tduffy> - DAT_BOOLEAN server_initiated;
tduffy> + boolean_t server_initiated;
tduffy> DT_Transfer_Type transfer_type;
tduffy> uint32_t num_segs;
tduffy> uint32_t seg_size;
tduffy> - DAT_BOOLEAN reap_send_on_recv;
tduffy> + boolean_t reap_send_on_recv;
tduffy> Bpool *bp;
tduffy>
tduffy> /* RDMA info */
tduffy> @@ -72,8 +72,8 @@ typedef struct
tduffy> typedef struct
tduffy> {
tduffy> /* This group set up by DT_Transaction_Create_Test() */
tduffy> - DAT_BOOLEAN is_server;
tduffy> - DAT_BOOLEAN remote_is_little_endian;
tduffy> + boolean_t is_server;
tduffy> + boolean_t remote_is_little_endian;
tduffy> Per_Test_Data_t *pt_ptr;
tduffy> DAT_IA_HANDLE ia_handle;
tduffy> Transaction_Cmd_t *cmd;
tduffy> Index: linux-kernel/test/dapltest/cmd/dapl_netaddr.c
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/cmd/dapl_netaddr.c (revision 2295)
tduffy> +++ linux-kernel/test/dapltest/cmd/dapl_netaddr.c (working copy)
tduffy> @@ -125,7 +125,7 @@ DT_NetAddrLookupHostAddress (DAT_IA_ADDR
tduffy>
tduffy> DT_Mdep_printf ("getaddrinfo (%s) failed (%s)\n",
tduffy> hostname, whatzit);
tduffy> - return DAT_FALSE;
tduffy> + return FALSE;
tduffy> }
tduffy>
tduffy> /* Pull out IP address and print it as a sanity check */
tduffy> @@ -139,6 +139,6 @@ DT_NetAddrLookupHostAddress (DAT_IA_ADDR
tduffy>
tduffy> *to_netaddr = * ((DAT_IA_ADDRESS_PTR) target->ai_addr);
tduffy>
tduffy> - return ( DAT_TRUE );
tduffy> + return ( TRUE );
tduffy> }
tduffy>
tduffy> Index: linux-kernel/test/dapltest/mdep/linux/dapl_mdep_user.c
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/mdep/linux/dapl_mdep_user.c (revision 2295)
tduffy> +++ linux-kernel/test/dapltest/mdep/linux/dapl_mdep_user.c (working copy)
tduffy> @@ -431,7 +431,7 @@ DT_Mdep_wait_object_init (
tduffy> DT_WAIT_OBJECT *wait_obj)
tduffy> {
tduffy>
tduffy> - wait_obj->signaled = DAT_FALSE;
tduffy> + wait_obj->signaled = FALSE;
tduffy> if ( 0 != pthread_cond_init ( &wait_obj->cv, NULL ) )
tduffy> {
tduffy> return (-1);
tduffy> @@ -492,7 +492,7 @@ DT_Mdep_wait_object_wait (
tduffy> future.tv_nsec = now.tv_usec * 1000;
tduffy>
tduffy> pthread_mutex_lock (&wait_obj->lock);
tduffy> - while ( wait_obj->signaled == DAT_FALSE && pthread_status == 0)
tduffy> + while ( wait_obj->signaled == FALSE && pthread_status == 0)
tduffy> {
tduffy> pthread_status = pthread_cond_timedwait (
tduffy> &wait_obj->cv, &wait_obj->lock, &future );
tduffy> @@ -512,7 +512,7 @@ DT_Mdep_wait_object_wait (
tduffy> else
tduffy> {
tduffy> pthread_mutex_lock (&wait_obj->lock);
tduffy> - while ( wait_obj->signaled == DAT_FALSE && pthread_status == 0)
tduffy> + while ( wait_obj->signaled == FALSE && pthread_status == 0)
tduffy> {
tduffy> pthread_status = pthread_cond_wait (
tduffy> &wait_obj->cv, &wait_obj->lock );
tduffy> Index: linux-kernel/test/dapltest/kdapl/kdapl_tdep_evd.c
tduffy> ===================================================================
tduffy> --- linux-kernel/test/dapltest/kdapl/kdapl_tdep_evd.c (revision 2295)
tduffy> +++ linux-kernel/test/dapltest/kdapl/kdapl_tdep_evd.c (working copy)
tduffy> @@ -47,7 +47,7 @@ typedef struct Tdep_Evd_Tag
tduffy> static void DT_Tdep_Event_Callback (
tduffy> DAT_PVOID instance_data,
tduffy> const struct dat_event *dat_event,
tduffy> - DAT_BOOLEAN bool_arg);
tduffy> + boolean_t bool_arg);
tduffy>
tduffy> /* static data */
tduffy>
tduffy> @@ -324,7 +324,7 @@ DT_Tdep_evd_free (DAT_EVD_HANDLE evd_han
tduffy> static void DT_Tdep_Event_Callback (
tduffy> DAT_PVOID instance_data,
tduffy> const struct dat_event * dat_event,
tduffy> - DAT_BOOLEAN bool_arg)
tduffy> + boolean_t bool_arg)
tduffy> {
tduffy> Tdep_Event *event;
tduffy> Tdep_Evd *evd_ptr;
tduffy> Index: linux-kernel/dat-provider/dapl_cr_callback.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_cr_callback.c (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_cr_callback.c (working copy)
tduffy> @@ -87,7 +87,7 @@ void dapl_cr_callback(ib_cm_handle_t ib_
tduffy> sp_ptr->header.magic == DAPL_MAGIC_RSP);
tduffy>
tduffy> /* Obtain the event number from the provider layer */
tduffy> - dat_event_num = dapl_ib_get_dat_event(ib_cm_event, DAT_FALSE);
tduffy> + dat_event_num = dapl_ib_get_dat_event(ib_cm_event, FALSE);
tduffy>
tduffy> /*
tduffy> * CONNECT_REQUEST events create an event on the PSP
tduffy> @@ -128,7 +128,7 @@ void dapl_cr_callback(ib_cm_handle_t ib_
tduffy> */
tduffy>
tduffy> spin_lock(&sp_ptr->header.lock);
tduffy> - if (sp_ptr->listening == DAT_FALSE) {
tduffy> + if (sp_ptr->listening == FALSE) {
tduffy> spin_unlock(&sp_ptr->header.lock);
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_CM,
tduffy> "---> dapl_cr_callback: conn event on down SP\n");
tduffy> @@ -143,7 +143,7 @@ void dapl_cr_callback(ib_cm_handle_t ib_
tduffy> * RSP connections only allow a single connection. Close
tduffy> * it down NOW so we reject any further connections.
tduffy> */
tduffy> - sp_ptr->listening = DAT_FALSE;
tduffy> + sp_ptr->listening = FALSE;
tduffy> }
tduffy> spin_unlock(&sp_ptr->header.lock);
tduffy>
tduffy> @@ -205,7 +205,7 @@ void dapl_cr_callback(ib_cm_handle_t ib_
tduffy> return;
tduffy> }
tduffy> ep_ptr->param.ep_state = DAT_EP_STATE_DISCONNECTED;
tduffy> - dapl_ib_disconnect_clean(ep_ptr, DAT_FALSE,
tduffy> + dapl_ib_disconnect_clean(ep_ptr, FALSE,
tduffy> ib_cm_event);
tduffy> spin_unlock(&ep_ptr->header.lock);
tduffy>
tduffy> @@ -221,7 +221,7 @@ void dapl_cr_callback(ib_cm_handle_t ib_
tduffy> */
tduffy> spin_lock(&ep_ptr->header.lock);
tduffy> ep_ptr->param.ep_state = DAT_EP_STATE_DISCONNECTED;
tduffy> - dapl_ib_disconnect_clean(ep_ptr, DAT_FALSE,
tduffy> + dapl_ib_disconnect_clean(ep_ptr, FALSE,
tduffy> ib_cm_event);
tduffy> spin_unlock(&ep_ptr->header.lock);
tduffy>
tduffy> @@ -231,7 +231,7 @@ void dapl_cr_callback(ib_cm_handle_t ib_
tduffy> {
tduffy> spin_lock(&ep_ptr->header.lock);
tduffy> ep_ptr->param.ep_state = DAT_EP_STATE_DISCONNECTED;
tduffy> - dapl_ib_disconnect_clean(ep_ptr, DAT_FALSE,
tduffy> + dapl_ib_disconnect_clean(ep_ptr, FALSE,
tduffy> ib_cm_event);
tduffy> spin_unlock(&ep_ptr->header.lock);
tduffy>
tduffy> @@ -433,7 +433,7 @@ DAPL_EP *dapl_get_sp_ep(ib_cm_handle_t i
tduffy> * If this SP has been removed from service, free it
tduffy> * up after the last CR is removed
tduffy> */
tduffy> - if (sp_ptr->listening != DAT_TRUE && sp_ptr->cr_list_count == 0
tduffy> + if (sp_ptr->listening != TRUE && sp_ptr->cr_list_count == 0
tduffy> && sp_ptr->state != DAPL_SP_STATE_FREE) {
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_CM,
tduffy> "--> dapl_get_sp_ep! disconnect dump sp: %p \n",
tduffy> Index: linux-kernel/dat-provider/dapl_module.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_module.c (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_module.c (working copy)
tduffy> @@ -236,7 +236,7 @@ void dapl_add_one(struct ib_device *devi
tduffy> 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 = DAT_FALSE;
tduffy> + provider_info.is_thread_safe = FALSE;
tduffy> DAT_PROVIDER_INIT_FUNC_NAME(&provider_info, device, i);
tduffy> }
tduffy> return;
tduffy> @@ -258,7 +258,7 @@ void dapl_remove_one(struct ib_device *d
tduffy> 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 = DAT_FALSE;
tduffy> + provider_info.is_thread_safe = FALSE;
tduffy> DAT_PROVIDER_FINI_FUNC_NAME(&provider_info);
tduffy> }
tduffy> return;
tduffy> Index: linux-kernel/dat-provider/dapl_psp_create.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_psp_create.c (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_psp_create.c (working copy)
tduffy> @@ -76,7 +76,7 @@ dapl_psp_create(DAT_IA_HANDLE ia_handle,
tduffy> DAPL_IA *ia_ptr;
tduffy> DAPL_SP *sp_ptr;
tduffy> DAPL_EVD *evd_ptr;
tduffy> - DAT_BOOLEAN sp_found;
tduffy> + boolean_t sp_found;
tduffy> DAT_RETURN dat_status;
tduffy>
tduffy> ia_ptr = (DAPL_IA *) ia_handle;
tduffy> @@ -115,19 +115,19 @@ dapl_psp_create(DAT_IA_HANDLE ia_handle,
tduffy> * See if we have a quiescent listener to use for this PSP, else
tduffy> * create one and set it listening
tduffy> */
tduffy> - sp_ptr = dapl_ia_sp_search(ia_ptr, conn_qual, DAT_TRUE);
tduffy> - sp_found = DAT_TRUE;
tduffy> + sp_ptr = dapl_ia_sp_search(ia_ptr, conn_qual, TRUE);
tduffy> + sp_found = TRUE;
tduffy> if (sp_ptr == NULL) {
tduffy> /* Allocate PSP */
tduffy> - sp_found = DAT_FALSE;
tduffy> - sp_ptr = dapl_sp_alloc(ia_ptr, DAT_TRUE);
tduffy> + sp_found = FALSE;
tduffy> + sp_ptr = dapl_sp_alloc(ia_ptr, TRUE);
tduffy> if (sp_ptr == NULL) {
tduffy> dat_status =
tduffy> DAT_ERROR(DAT_INSUFFICIENT_RESOURCES,
tduffy> DAT_RESOURCE_MEMORY);
tduffy> goto bail;
tduffy> }
tduffy> - } else if (sp_ptr->listening == DAT_TRUE) {
tduffy> + } else if (sp_ptr->listening == TRUE) {
tduffy> dat_status = DAT_ERROR(DAT_CONN_QUAL_IN_USE, 0);
tduffy> goto bail;
tduffy> }
tduffy> @@ -151,13 +151,13 @@ dapl_psp_create(DAT_IA_HANDLE ia_handle,
tduffy> * even before this call returns!
tduffy> */
tduffy> sp_ptr->state = DAPL_SP_STATE_PSP_LISTENING;
tduffy> - sp_ptr->listening = DAT_TRUE;
tduffy> + sp_ptr->listening = TRUE;
tduffy>
tduffy> /*
tduffy> * If this is a new sp we need to add it to the IA queue, and set up
tduffy> * a conn_listener.
tduffy> */
tduffy> - if (sp_found == DAT_FALSE) {
tduffy> + if (sp_found == FALSE) {
tduffy> /* Link it onto the IA before enabling it to receive conn
tduffy> * requests
tduffy> */
tduffy> Index: linux-kernel/dat-provider/dapl_evd_connection_callb.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_evd_connection_callb.c (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_evd_connection_callb.c (working copy)
tduffy> @@ -109,7 +109,7 @@ dapl_evd_connection_callback(ib_cm_handl
tduffy> }
tduffy>
tduffy> /* Obtain the event number from the provider layer */
tduffy> - dat_event_num = dapl_ib_get_dat_event(ib_cm_event, DAT_FALSE);
tduffy> + dat_event_num = dapl_ib_get_dat_event(ib_cm_event, FALSE);
tduffy>
tduffy> switch (dat_event_num) {
tduffy> case DAT_CONNECTION_EVENT_ESTABLISHED:
tduffy> @@ -148,7 +148,7 @@ dapl_evd_connection_callback(ib_cm_handl
tduffy> * another connection
tduffy> */
tduffy> ep_ptr->param.ep_state = DAT_EP_STATE_DISCONNECTED;
tduffy> - dapl_ib_disconnect_clean(ep_ptr, DAT_TRUE, ib_cm_event);
tduffy> + dapl_ib_disconnect_clean(ep_ptr, TRUE, ib_cm_event);
tduffy> spin_unlock(&ep_ptr->header.lock);
tduffy>
tduffy> break;
tduffy> @@ -156,7 +156,7 @@ dapl_evd_connection_callback(ib_cm_handl
tduffy> case DAT_CONNECTION_EVENT_PEER_REJECTED:
tduffy> {
tduffy> ep_ptr->param.ep_state = DAT_EP_STATE_DISCONNECTED;
tduffy> - dapl_ib_disconnect_clean(ep_ptr, DAT_TRUE, ib_cm_event);
tduffy> + dapl_ib_disconnect_clean(ep_ptr, TRUE, ib_cm_event);
tduffy> spin_unlock(&ep_ptr->header.lock);
tduffy>
tduffy> break;
tduffy> @@ -164,7 +164,7 @@ dapl_evd_connection_callback(ib_cm_handl
tduffy> case DAT_CONNECTION_EVENT_UNREACHABLE:
tduffy> {
tduffy> ep_ptr->param.ep_state = DAT_EP_STATE_DISCONNECTED;
tduffy> - dapl_ib_disconnect_clean(ep_ptr, DAT_TRUE, ib_cm_event);
tduffy> + dapl_ib_disconnect_clean(ep_ptr, TRUE, ib_cm_event);
tduffy> spin_unlock(&ep_ptr->header.lock);
tduffy>
tduffy> break;
tduffy> @@ -172,7 +172,7 @@ dapl_evd_connection_callback(ib_cm_handl
tduffy> case DAT_CONNECTION_EVENT_NON_PEER_REJECTED:
tduffy> {
tduffy> ep_ptr->param.ep_state = DAT_EP_STATE_DISCONNECTED;
tduffy> - dapl_ib_disconnect_clean(ep_ptr, DAT_TRUE, ib_cm_event);
tduffy> + dapl_ib_disconnect_clean(ep_ptr, TRUE, ib_cm_event);
tduffy> spin_unlock(&ep_ptr->header.lock);
tduffy>
tduffy> break;
tduffy> @@ -180,7 +180,7 @@ dapl_evd_connection_callback(ib_cm_handl
tduffy> case DAT_CONNECTION_EVENT_BROKEN:
tduffy> {
tduffy> ep_ptr->param.ep_state = DAT_EP_STATE_DISCONNECTED;
tduffy> - dapl_ib_disconnect_clean(ep_ptr, DAT_FALSE,
tduffy> + dapl_ib_disconnect_clean(ep_ptr, FALSE,
tduffy> ib_cm_event);
tduffy> spin_unlock(&ep_ptr->header.lock);
tduffy>
tduffy> Index: linux-kernel/dat-provider/dapl_psp_create_any.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_psp_create_any.c (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_psp_create_any.c (working copy)
tduffy> @@ -121,7 +121,7 @@ dapl_psp_create_any(DAT_IA_HANDLE ia_han
tduffy> }
tduffy>
tduffy> /* Allocate PSP */
tduffy> - sp_ptr = dapl_sp_alloc(ia_ptr, DAT_TRUE);
tduffy> + sp_ptr = dapl_sp_alloc(ia_ptr, TRUE);
tduffy> if (sp_ptr == NULL) {
tduffy> dat_status =
tduffy> DAT_ERROR(DAT_INSUFFICIENT_RESOURCES, DAT_RESOURCE_MEMORY);
tduffy> @@ -149,7 +149,7 @@ dapl_psp_create_any(DAT_IA_HANDLE ia_han
tduffy> * even before this call returns!
tduffy> */
tduffy> sp_ptr->state = DAPL_SP_STATE_PSP_LISTENING;
tduffy> - sp_ptr->listening = DAT_TRUE;
tduffy> + sp_ptr->listening = TRUE;
tduffy>
tduffy> limit_conn_qual = 0;
tduffy> lcl_conn_qual = hint_conn_qual;
tduffy> Index: linux-kernel/dat-provider/dapl_psp_free.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_psp_free.c (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_psp_free.c (working copy)
tduffy> @@ -89,7 +89,7 @@ DAT_RETURN dapl_psp_free(DAT_PSP_HANDLE
tduffy> */
tduffy> spin_lock(&sp_ptr->header.lock);
tduffy>
tduffy> - sp_ptr->listening = DAT_FALSE;
tduffy> + sp_ptr->listening = FALSE;
tduffy>
tduffy> /* Release reference on EVD. If an error was encountered in a previous
tduffy> * free the evd_handle will be NULL
tduffy> Index: linux-kernel/dat-provider/dapl_ep_get_status.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_ep_get_status.c (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_ep_get_status.c (working copy)
tduffy> @@ -62,7 +62,7 @@
tduffy> DAT_RETURN
tduffy> dapl_ep_get_status(DAT_EP_HANDLE ep_handle,
tduffy> DAT_EP_STATE * ep_state,
tduffy> - DAT_BOOLEAN * in_dto_idle, DAT_BOOLEAN * out_dto_idle)
tduffy> + boolean_t *in_dto_idle, boolean_t *out_dto_idle)
tduffy> {
tduffy> DAPL_EP *ep_ptr;
tduffy> DAT_RETURN dat_status;
tduffy> @@ -92,14 +92,12 @@ dapl_ep_get_status(DAT_EP_HANDLE ep_hand
tduffy>
tduffy> if (in_dto_idle != NULL) {
tduffy> *in_dto_idle =
tduffy> - (atomic_read(&ep_ptr->recv_count)) ? DAT_FALSE :
tduffy> - DAT_TRUE;
tduffy> + (atomic_read(&ep_ptr->recv_count)) ? FALSE : TRUE;
tduffy> }
tduffy>
tduffy> if (out_dto_idle != NULL) {
tduffy> *out_dto_idle =
tduffy> - (atomic_read(&ep_ptr->req_count)) ? DAT_FALSE :
tduffy> - DAT_TRUE;
tduffy> + (atomic_read(&ep_ptr->req_count)) ? FALSE : TRUE;
tduffy> }
tduffy>
tduffy> bail:
tduffy> Index: linux-kernel/dat-provider/dapl_ia_query.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_ia_query.c (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_ia_query.c (working copy)
tduffy> @@ -68,9 +68,9 @@ dapl_ia_query(DAT_IA_HANDLE ia_handle,
tduffy> DAPL_IA *ia_ptr;
tduffy> DAT_RETURN dat_status;
tduffy> struct evd_merge_type {
tduffy> - DAT_BOOLEAN array[6][6];
tduffy> + boolean_t array[6][6];
tduffy> } *evd_merge;
tduffy> - DAT_BOOLEAN val;
tduffy> + boolean_t val;
tduffy> int i;
tduffy> int j;
tduffy>
tduffy> @@ -120,9 +120,9 @@ dapl_ia_query(DAT_IA_HANDLE ia_handle,
tduffy> provider_attr->dat_qos_supported = DAT_QOS_BEST_EFFORT;
tduffy> provider_attr->completion_flags_supported =
tduffy> DAT_COMPLETION_DEFAULT_FLAG;
tduffy> - provider_attr->is_thread_safe = DAT_FALSE;
tduffy> + provider_attr->is_thread_safe = FALSE;
tduffy> provider_attr->max_private_data_size = IB_MAX_REQ_PDATA_SIZE;
tduffy> - provider_attr->supports_multipath = DAT_FALSE;
tduffy> + provider_attr->supports_multipath = FALSE;
tduffy> provider_attr->ep_creator = DAT_PSP_CREATES_EP_NEVER;
tduffy> provider_attr->optimal_buffer_alignment = DAPL_OPTIMAL_ALIGNMENT;
tduffy> /* The value of pz_support may vary by transport */
tduffy> @@ -149,17 +149,17 @@ dapl_ia_query(DAT_IA_HANDLE ia_handle,
tduffy> evd_merge =
tduffy> (struct evd_merge_type *)&provider_attr->
tduffy> evd_stream_merging_supported[0][0];
tduffy> - val = DAT_TRUE;
tduffy> + val = TRUE;
tduffy> for (i = 0; i < 6; i++) {
tduffy> if (i > 4) {
tduffy> /* ASYNC EVD is 5, so entire row will be 0 */
tduffy> - val = DAT_FALSE;
tduffy> + val = FALSE;
tduffy> }
tduffy> for (j = 0; j < 5; j++) {
tduffy> evd_merge->array[i][j] = val;
tduffy> }
tduffy> /* Set the ASYNC_EVD column to FALSE */
tduffy> - evd_merge->array[i][5] = DAT_FALSE;
tduffy> + evd_merge->array[i][5] = FALSE;
tduffy> }
tduffy>
tduffy> #ifndef DAPL_MERGE_CM_DTO
tduffy> @@ -169,9 +169,9 @@ dapl_ia_query(DAT_IA_HANDLE ia_handle,
tduffy> * skip the following code
tduffy> */
tduffy> /* DAT_EVD_DTO_FLAG | DAT_EVD_CONNECTION_FLAG */
tduffy> - evd_merge->array[2][3] = DAT_FALSE;
tduffy> + evd_merge->array[2][3] = FALSE;
tduffy> /* DAT_EVD_CONNECTION_FLAG | DAT_EVD_DTO_FLAG */
tduffy> - evd_merge->array[3][2] = DAT_FALSE;
tduffy> + evd_merge->array[3][2] = FALSE;
tduffy> #endif /* DAPL_MERGE_CM_DTO */
tduffy> }
tduffy>
tduffy> Index: linux-kernel/dat-provider/dapl_mr_util.h
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_mr_util.h (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_mr_util.h (working copy)
tduffy> @@ -49,7 +49,7 @@
tduffy> extern DAT_VADDR
tduffy> dapl_mr_get_address(DAT_REGION_DESCRIPTION desc, DAT_MEM_TYPE type);
tduffy>
tduffy> -static __inline__ DAT_BOOLEAN
tduffy> +static __inline__ boolean_t
tduffy> dapl_mr_bounds_check(DAT_VADDR addr_a,
tduffy> DAT_VLEN length_a, DAT_VADDR addr_b, DAT_VLEN length_b);
tduffy>
tduffy> @@ -67,14 +67,14 @@ dapl_mr_bounds_check(DAT_VADDR addr_a,
tduffy> *
tduffy> */
tduffy>
tduffy> -static __inline__ DAT_BOOLEAN
tduffy> +static __inline__ boolean_t
tduffy> dapl_mr_bounds_check(DAT_VADDR addr_a,
tduffy> DAT_VLEN length_a, DAT_VADDR addr_b, DAT_VLEN length_b)
tduffy> {
tduffy> if ((addr_a <= addr_b) && (addr_b + length_b) <= (addr_a + length_a)) {
tduffy> - return DAT_TRUE;
tduffy> + return TRUE;
tduffy> } else {
tduffy> - return DAT_FALSE;
tduffy> + return FALSE;
tduffy> }
tduffy> }
tduffy>
tduffy> Index: linux-kernel/dat-provider/dapl_adapter_util.h
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_adapter_util.h (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_adapter_util.h (working copy)
tduffy> @@ -139,11 +139,11 @@ DAT_RETURN dapl_ib_mw_bind(DAPL_RMR * rm
tduffy> DAT_VADDR virtual_address,
tduffy> DAT_VLEN length,
tduffy> DAT_MEM_PRIV_FLAGS mem_priv,
tduffy> - DAT_BOOLEAN is_signaled);
tduffy> + boolean_t is_signaled);
tduffy>
tduffy> DAT_RETURN dapl_ib_mw_unbind(DAPL_RMR * rmr,
tduffy> DAPL_EP * ep,
tduffy> - DAPL_COOKIE * cookie, DAT_BOOLEAN is_signaled);
tduffy> + DAPL_COOKIE * cookie, boolean_t is_signaled);
tduffy>
tduffy> DAT_RETURN dapl_ib_query_hca(DAPL_HCA * hca_ptr,
tduffy> struct dat_ia_attr *ia_attr,
tduffy> @@ -163,14 +163,14 @@ DAT_DTO_COMPLETION_STATUS dapl_ib_get_dt
tduffy> void dapl_ib_reinit_ep(DAPL_EP * ep_ptr);
tduffy>
tduffy> void dapl_ib_disconnect_clean(DAPL_EP * ep_ptr,
tduffy> - DAT_BOOLEAN passive,
tduffy> + boolean_t passive,
tduffy> const ib_cm_events_t ib_cm_event);
tduffy>
tduffy> DAT_RETURN dapl_ib_get_async_event(ib_error_record_t * cause_ptr,
tduffy> DAT_EVENT_NUMBER * async_event);
tduffy>
tduffy> DAT_EVENT_NUMBER dapl_ib_get_dat_event(const ib_cm_events_t ib_cm_event,
tduffy> - DAT_BOOLEAN active);
tduffy> + boolean_t active);
tduffy>
tduffy> ib_cm_events_t dapl_ib_get_cm_event(DAT_EVENT_NUMBER dat_event_num);
tduffy>
tduffy> Index: linux-kernel/dat-provider/dapl_ia_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_ia_util.c (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_ia_util.c (working copy)
tduffy> @@ -91,7 +91,7 @@ DAPL_IA *dapl_ia_alloc(struct dat_provid
tduffy> */
tduffy> ia_ptr->hca_ptr = hca_ptr;
tduffy> ia_ptr->async_error_evd = NULL;
tduffy> - ia_ptr->cleanup_async_error_evd = DAT_FALSE;
tduffy> + ia_ptr->cleanup_async_error_evd = FALSE;
tduffy> dapl_llist_init_entry(&ia_ptr->hca_ia_list_entry);
tduffy> dapl_llist_init_head(&ia_ptr->ep_list_head);
tduffy> dapl_llist_init_head(&ia_ptr->lmr_list_head);
tduffy> @@ -316,7 +316,7 @@ DAT_RETURN dapl_ia_abrupt_close(DAPL_IA
tduffy> * Free the async EVD, shutting down callbacks from the HCA.
tduffy> */
tduffy> if (ia_ptr->async_error_evd &&
tduffy> - (DAT_TRUE == ia_ptr->cleanup_async_error_evd)) {
tduffy> + (TRUE == ia_ptr->cleanup_async_error_evd)) {
tduffy> dat_status = dapl_ia_teardown_callbacks(ia_ptr);
tduffy>
tduffy> atomic_dec(&ia_ptr->async_error_evd->evd_ref_count);
tduffy> @@ -382,7 +382,7 @@ DAT_RETURN dapl_ia_graceful_close(DAPL_I
tduffy> /* if the async evd does not need to be cleaned up */
tduffy> /* (ie. it was not created by dapl_ia_open) */
tduffy> /* then the evd list should be empty */
tduffy> - if (DAT_FALSE == ia_ptr->cleanup_async_error_evd) {
tduffy> + if (FALSE == ia_ptr->cleanup_async_error_evd) {
tduffy> if (!dapl_llist_is_empty(&ia_ptr->evd_list_head)) {
tduffy> dat_status =
tduffy> DAT_ERROR(DAT_INVALID_STATE,
tduffy> @@ -437,7 +437,7 @@ DAT_RETURN dapl_ia_graceful_close(DAPL_I
tduffy>
tduffy> /* Tear down the async EVD if needed, first shutting down callbacks. */
tduffy> if (ia_ptr->async_error_evd &&
tduffy> - (DAT_TRUE == ia_ptr->cleanup_async_error_evd)) {
tduffy> + (TRUE == ia_ptr->cleanup_async_error_evd)) {
tduffy> cur_dat_status = dapl_ia_teardown_callbacks(ia_ptr);
tduffy> if (DAT_SUCCESS != cur_dat_status) {
tduffy> dat_status = cur_dat_status;
tduffy> @@ -683,7 +683,7 @@ void dapl_ia_unlink_sp(DAPL_IA * ia_ptr,
tduffy> *
tduffy> */
tduffy> DAPL_SP *dapl_ia_sp_search(DAPL_IA * ia_ptr,
tduffy> - DAT_CONN_QUAL conn_qual, DAT_BOOLEAN is_psp)
tduffy> + DAT_CONN_QUAL conn_qual, boolean_t is_psp)
tduffy> {
tduffy> DAPL_SP *sp_ptr;
tduffy> DAPL_LLIST_HEAD *list_head;
tduffy> Index: linux-kernel/dat-provider/dapl_provider.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_provider.c (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_provider.c (working copy)
tduffy> @@ -135,7 +135,7 @@ struct dat_provider g_dapl_provider_temp
tduffy> * *
tduffy> *********************************************************************/
tduffy>
tduffy> -static DAT_BOOLEAN
tduffy> +static boolean_t
tduffy> dapl_provider_list_key_cmp(const char *name_a, const char *name_b);
tduffy>
tduffy> /*********************************************************************
tduffy> @@ -319,17 +319,17 @@ DAT_RETURN dapl_provider_list_remove(con
tduffy> return status;
tduffy> }
tduffy>
tduffy> -DAT_BOOLEAN dapl_provider_list_key_cmp(const char *name_a, const char *name_b)
tduffy> +boolean_t dapl_provider_list_key_cmp(const char *name_a, const char *name_b)
tduffy> {
tduffy> unsigned int len;
tduffy>
tduffy> len = strlen(name_a);
tduffy>
tduffy> if (strlen(name_b) != len) {
tduffy> - return DAT_FALSE;
tduffy> + return FALSE;
tduffy> } else if (memcmp(name_a, name_b, len)) {
tduffy> - return DAT_FALSE;
tduffy> + return FALSE;
tduffy> } else {
tduffy> - return DAT_TRUE;
tduffy> + return TRUE;
tduffy> }
tduffy> }
tduffy> Index: linux-kernel/dat-provider/dapl_openib_cm.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_openib_cm.c (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_openib_cm.c (working copy)
tduffy> @@ -511,7 +511,7 @@ DAT_RETURN dapl_ib_disconnect(DAPL_EP *
tduffy> */
tduffy> void
tduffy> dapl_ib_disconnect_clean(DAPL_EP * ep_ptr,
tduffy> - DAT_BOOLEAN active,
tduffy> + boolean_t active,
tduffy> const ib_cm_events_t ib_cm_event)
tduffy> {
tduffy> int status;
tduffy> Index: linux-kernel/dat-provider/dapl_ia_util.h
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_ia_util.h (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_ia_util.h (working copy)
tduffy> @@ -78,7 +78,7 @@ void dapl_ia_unlink_sp(DAPL_IA * ia_ptr,
tduffy> void dapl_ia_link_rsp(DAPL_IA * ia_ptr, DAPL_SP * sp_info);
tduffy>
tduffy> DAPL_SP *dapl_ia_sp_search(DAPL_IA * ia_ptr,
tduffy> - DAT_CONN_QUAL conn_qual, DAT_BOOLEAN is_psp);
tduffy> + DAT_CONN_QUAL conn_qual, boolean_t is_psp);
tduffy>
tduffy> DAT_RETURN dapl_ia_setup_callbacks(DAPL_IA * ia_ptr, DAPL_EVD * async_evd_ptr);
tduffy>
tduffy> Index: linux-kernel/dat-provider/dapl_rmr_bind.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_rmr_bind.c (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_rmr_bind.c (working copy)
tduffy> @@ -79,7 +79,7 @@ dapl_rmr_bind_fuse(DAPL_RMR * rmr,
tduffy> DAPL_LMR *lmr;
tduffy> DAPL_COOKIE *cookie;
tduffy> DAT_RETURN dat_status;
tduffy> - DAT_BOOLEAN is_signaled;
tduffy> + boolean_t is_signaled;
tduffy>
tduffy> dat_status =
tduffy> dapl_hash_search(rmr->header.owner_ia->hca_ptr->lmr_hash_table,
tduffy> @@ -104,7 +104,7 @@ dapl_rmr_bind_fuse(DAPL_RMR * rmr,
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - if (DAT_FALSE ==
tduffy> + if (FALSE ==
tduffy> dapl_mr_bounds_check(dapl_mr_get_address
tduffy> (lmr->param.region_desc, lmr->param.mem_type),
tduffy> lmr->param.length,
tduffy> @@ -146,8 +146,8 @@ dapl_rmr_bind_fuse(DAPL_RMR * rmr,
tduffy> }
tduffy>
tduffy> is_signaled =
tduffy> - (completion_flags & DAT_COMPLETION_SUPPRESS_FLAG) ? DAT_FALSE :
tduffy> - DAT_TRUE;
tduffy> + (completion_flags & DAT_COMPLETION_SUPPRESS_FLAG) ? FALSE :
tduffy> + TRUE;
tduffy>
tduffy> /*
tduffy> * Take reference before posting to avoid race conditions with
tduffy> @@ -196,7 +196,7 @@ dapl_rmr_bind_unfuse(DAPL_RMR * rmr,
tduffy> {
tduffy> DAPL_COOKIE *cookie;
tduffy> DAT_RETURN dat_status;
tduffy> - DAT_BOOLEAN is_signaled;
tduffy> + boolean_t is_signaled;
tduffy>
tduffy> dat_status = DAT_SUCCESS;
tduffy> /*
tduffy> @@ -246,8 +246,8 @@ dapl_rmr_bind_unfuse(DAPL_RMR * rmr,
tduffy> }
tduffy>
tduffy> is_signaled =
tduffy> - (completion_flags & DAT_COMPLETION_UNSIGNALLED_FLAG) ? DAT_FALSE :
tduffy> - DAT_TRUE;
tduffy> + (completion_flags & DAT_COMPLETION_UNSIGNALLED_FLAG) ? FALSE :
tduffy> + TRUE;
tduffy>
tduffy> /*
tduffy> * Take reference before posting to avoid race conditions with
tduffy> Index: linux-kernel/dat-provider/dapl_openib_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_openib_util.c (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_openib_util.c (working copy)
tduffy> @@ -623,7 +623,7 @@ dapl_ib_mw_bind(DAPL_RMR * rmr,
tduffy> DAPL_COOKIE * cookie,
tduffy> DAT_VADDR virtual_address,
tduffy> DAT_VLEN length,
tduffy> - DAT_MEM_PRIV_FLAGS mem_priv, DAT_BOOLEAN is_signaled)
tduffy> + DAT_MEM_PRIV_FLAGS mem_priv, boolean_t is_signaled)
tduffy> {
tduffy> int ib_status;
tduffy> struct ib_mw_bind mw_bind_prop;
tduffy> @@ -632,7 +632,7 @@ dapl_ib_mw_bind(DAPL_RMR * rmr,
tduffy> mw_bind_prop.length = length;
tduffy> mw_bind_prop.mw_access_flags = dapl_ib_convert_mem_privileges(mem_priv);
tduffy> mw_bind_prop.send_flags =
tduffy> - (is_signaled == DAT_TRUE) ? IB_SEND_SIGNALED : 0;
tduffy> + (is_signaled == TRUE) ? IB_SEND_SIGNALED : 0;
tduffy> mw_bind_prop.mr = lmr->mr_handle;
tduffy> mw_bind_prop.wr_id = (u64) (uintptr_t) cookie;
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_UTIL,
tduffy> @@ -673,7 +673,7 @@ dapl_ib_mw_bind(DAPL_RMR * rmr,
tduffy> */
tduffy> DAT_RETURN
tduffy> dapl_ib_mw_unbind(DAPL_RMR * rmr,
tduffy> - DAPL_EP * ep, DAPL_COOKIE * cookie, DAT_BOOLEAN is_signaled)
tduffy> + DAPL_EP * ep, DAPL_COOKIE * cookie, boolean_t is_signaled)
tduffy> {
tduffy> int ib_status;
tduffy> struct ib_mw_bind mw_bind_prop;
tduffy> @@ -682,7 +682,7 @@ dapl_ib_mw_unbind(DAPL_RMR * rmr,
tduffy> mw_bind_prop.length = 0;
tduffy> mw_bind_prop.mw_access_flags = 0;
tduffy> mw_bind_prop.send_flags =
tduffy> - (is_signaled == DAT_TRUE) ? IB_SEND_SIGNALED : 0;
tduffy> + (is_signaled == TRUE) ? IB_SEND_SIGNALED : 0;
tduffy> mw_bind_prop.mr = NULL;
tduffy> mw_bind_prop.wr_id = (u64) (uintptr_t) cookie;
tduffy> ib_status = ib_bind_mw(ep->qp_handle, rmr->mw_handle, &mw_bind_prop);
tduffy> @@ -1051,7 +1051,7 @@ static struct ib_cm_event_map {
tduffy> */
tduffy>
tduffy> DAT_EVENT_NUMBER
tduffy> -dapl_ib_get_dat_event(const ib_cm_events_t ib_cm_event, DAT_BOOLEAN active)
tduffy> +dapl_ib_get_dat_event(const ib_cm_events_t ib_cm_event, boolean_t active)
tduffy> {
tduffy> DAT_EVENT_NUMBER dat_event_num;
tduffy> int index;
tduffy> Index: linux-kernel/dat-provider/dapl_ep_modify.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_ep_modify.c (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_ep_modify.c (working copy)
tduffy> @@ -322,18 +322,18 @@ DAT_RETURN dapl_ep_modify(DAT_EP_HANDLE
tduffy> DAT_RETURN dat_status;
tduffy>
tduffy> /* Flag indicating we've allocated a new one of these. */
tduffy> - DAT_BOOLEAN qp_allocated = DAT_FALSE;
tduffy> - DAT_BOOLEAN rqst_cb_allocated = DAT_FALSE;
tduffy> - DAT_BOOLEAN recv_cb_allocated = DAT_FALSE;
tduffy> - DAT_BOOLEAN rqst_iov_allocated = DAT_FALSE;
tduffy> - DAT_BOOLEAN recv_iov_allocated = DAT_FALSE;
tduffy> + boolean_t qp_allocated = FALSE;
tduffy> + boolean_t rqst_cb_allocated = FALSE;
tduffy> + boolean_t recv_cb_allocated = FALSE;
tduffy> + boolean_t rqst_iov_allocated = FALSE;
tduffy> + boolean_t recv_iov_allocated = FALSE;
tduffy>
tduffy> /* Flag indicating we've used (assigned to QP) a new one of these. */
tduffy> - DAT_BOOLEAN qp_used = DAT_FALSE;
tduffy> - DAT_BOOLEAN rqst_cb_used = DAT_FALSE;
tduffy> - DAT_BOOLEAN recv_cb_used = DAT_FALSE;
tduffy> - DAT_BOOLEAN rqst_iov_used = DAT_FALSE;
tduffy> - DAT_BOOLEAN recv_iov_used = DAT_FALSE;
tduffy> + boolean_t qp_used = FALSE;
tduffy> + boolean_t rqst_cb_used = FALSE;
tduffy> + boolean_t recv_cb_used = FALSE;
tduffy> + boolean_t rqst_iov_used = FALSE;
tduffy> + boolean_t recv_iov_used = FALSE;
tduffy>
tduffy> dat_status = dapl_ep_modify_validate_parameters(ep_handle,
tduffy> mask,
tduffy> @@ -381,14 +381,14 @@ DAT_RETURN dapl_ep_modify(DAT_EP_HANDLE
tduffy> if (DAT_SUCCESS != dat_status) {
tduffy> goto bail;
tduffy> }
tduffy> - rqst_cb_allocated = DAT_TRUE;
tduffy> + rqst_cb_allocated = TRUE;
tduffy>
tduffy> dat_status = dapl_cb_create(&alloc_ep.recv_buffer, ep1, /* For pointer in buffer bool. */
tduffy> ep_attr1.max_recv_dtos);
tduffy> if (DAT_SUCCESS != dat_status) {
tduffy> goto bail;
tduffy> }
tduffy> - recv_cb_allocated = DAT_TRUE;
tduffy> + recv_cb_allocated = TRUE;
tduffy>
tduffy> alloc_ep.send_iov_num = ep_attr1.max_request_iov;
tduffy> alloc_ep.send_iov = kmalloc(ep_attr1.max_request_iov
tduffy> @@ -399,7 +399,7 @@ DAT_RETURN dapl_ep_modify(DAT_EP_HANDLE
tduffy> DAT_ERROR(DAT_INSUFFICIENT_RESOURCES, DAT_RESOURCE_MEMORY);
tduffy> goto bail;
tduffy> }
tduffy> - recv_iov_allocated = DAT_TRUE;
tduffy> + recv_iov_allocated = TRUE;
tduffy>
tduffy> alloc_ep.recv_iov_num = ep_attr1.max_recv_iov;
tduffy> alloc_ep.recv_iov = kmalloc(ep_attr1.max_recv_iov
tduffy> @@ -410,13 +410,13 @@ DAT_RETURN dapl_ep_modify(DAT_EP_HANDLE
tduffy> DAT_ERROR(DAT_INSUFFICIENT_RESOURCES, DAT_RESOURCE_MEMORY);
tduffy> goto bail;
tduffy> }
tduffy> - recv_iov_allocated = DAT_TRUE;
tduffy> + recv_iov_allocated = TRUE;
tduffy>
tduffy> dat_status = dapl_ib_qp_alloc(ia, &alloc_ep, ep1);
tduffy> if (dat_status != DAT_SUCCESS) {
tduffy> goto bail;
tduffy> }
tduffy> - qp_allocated = DAT_TRUE;
tduffy> + qp_allocated = TRUE;
tduffy>
tduffy> /*
tduffy> * Now we atomically modify the EP, under lock
tduffy> @@ -473,26 +473,26 @@ DAT_RETURN dapl_ep_modify(DAT_EP_HANDLE
tduffy> && (ep_param->ep_attr.max_recv_dtos
tduffy> != ep2->param.ep_attr.max_recv_dtos)) {
tduffy> new_ep.recv_buffer = alloc_ep.recv_buffer;
tduffy> - recv_cb_used = DAT_TRUE;
tduffy> + recv_cb_used = TRUE;
tduffy> }
tduffy>
tduffy> if (mask & DAT_EP_FIELD_EP_ATTR_MAX_REQUEST_DTOS
tduffy> && (ep_param->ep_attr.max_request_dtos
tduffy> != ep2->param.ep_attr.max_request_dtos)) {
tduffy> new_ep.req_buffer = alloc_ep.req_buffer;
tduffy> - rqst_cb_used = DAT_TRUE;
tduffy> + rqst_cb_used = TRUE;
tduffy> }
tduffy>
tduffy> if (mask & DAT_EP_FIELD_EP_ATTR_MAX_RECV_IOV
tduffy> && new_ep.recv_iov_num != ep2->recv_iov_num) {
tduffy> new_ep.recv_iov = alloc_ep.recv_iov;
tduffy> - recv_iov_used = DAT_TRUE;
tduffy> + recv_iov_used = TRUE;
tduffy> }
tduffy>
tduffy> if (mask & DAT_EP_FIELD_EP_ATTR_MAX_REQUEST_IOV
tduffy> && new_ep.send_iov_num != ep2->send_iov_num) {
tduffy> new_ep.send_iov = alloc_ep.send_iov;
tduffy> - recv_iov_used = DAT_TRUE;
tduffy> + recv_iov_used = TRUE;
tduffy> }
tduffy>
tduffy> /*
tduffy> Index: linux-kernel/dat-provider/dapl_cno_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_cno_util.c (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_cno_util.c (working copy)
tduffy> @@ -131,7 +131,7 @@ dapl_cno_trigger (
tduffy> cno_ptr->cno_upcall.upcall_func (
tduffy> cno_ptr->cno_upcall.instance_data,
tduffy> &event,
tduffy> - DAT_FALSE);
tduffy> + FALSE);
tduffy> }
tduffy> dat_status = dapl_evd_dequeue ( (DAT_EVD_HANDLE)evd_ptr, &event);
tduffy> }
tduffy> Index: linux-kernel/dat-provider/dapl_timer_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_timer_util.c (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_timer_util.c (working copy)
tduffy> @@ -97,7 +97,7 @@ dapl_timer_set(DAPL_OS_TIMER * timer,
tduffy> {
tduffy> DAPL_OS_TIMER *list_ptr;
tduffy> DAPL_OS_TIMEVAL cur_time;
tduffy> - DAT_BOOLEAN wakeup_tmo_thread;
tduffy> + boolean_t wakeup_tmo_thread;
tduffy>
tduffy> /*
tduffy> * Start the timer thread the first time we need a timer
tduffy> @@ -109,7 +109,7 @@ dapl_timer_set(DAPL_OS_TIMER * timer,
tduffy> }
tduffy>
tduffy> dapl_llist_init_entry(&timer->list_entry);
tduffy> - wakeup_tmo_thread = DAT_FALSE;
tduffy> + wakeup_tmo_thread = FALSE;
tduffy> dapl_os_get_time(&cur_time);
tduffy> timer->expires = cur_time + expires; /* calculate future time */
tduffy> timer->function = func;
tduffy> @@ -132,7 +132,7 @@ dapl_timer_set(DAPL_OS_TIMER * timer,
tduffy> dapl_llist_add_head(&g_daplTimerHead.timer_list_head,
tduffy> (DAPL_LLIST_ENTRY *) & timer->list_entry,
tduffy> timer);
tduffy> - wakeup_tmo_thread = DAT_TRUE;
tduffy> + wakeup_tmo_thread = TRUE;
tduffy> } else {
tduffy> list_ptr = (DAPL_OS_TIMER *)
tduffy> dapl_llist_peek_head(&g_daplTimerHead.timer_list_head);
tduffy> @@ -142,7 +142,7 @@ dapl_timer_set(DAPL_OS_TIMER * timer,
tduffy> dapl_llist_add_head(&g_daplTimerHead.timer_list_head,
tduffy> (DAPL_LLIST_ENTRY *) & timer->
tduffy> list_entry, timer);
tduffy> - wakeup_tmo_thread = DAT_TRUE;
tduffy> + wakeup_tmo_thread = TRUE;
tduffy> } else {
tduffy> /* Case 3: figure out where entry goes in sorted list */
tduffy> list_ptr =
tduffy> @@ -182,7 +182,7 @@ dapl_timer_set(DAPL_OS_TIMER * timer,
tduffy> }
tduffy> spin_unlock(&g_daplTimerHead.lock);
tduffy>
tduffy> - if (wakeup_tmo_thread == DAT_TRUE) {
tduffy> + if (wakeup_tmo_thread == TRUE) {
tduffy> dapl_os_wait_object_wakeup(&g_daplTimerHead.wait_object);
tduffy> }
tduffy>
tduffy> Index: linux-kernel/dat-provider/dapl_rsp_create.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_rsp_create.c (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_rsp_create.c (working copy)
tduffy> @@ -78,7 +78,7 @@ dapl_rsp_create(DAT_IA_HANDLE ia_handle,
tduffy> DAPL_SP *sp_ptr;
tduffy> DAPL_EVD *evd_ptr;
tduffy> DAPL_EP *ep_ptr;
tduffy> - DAT_BOOLEAN sp_found;
tduffy> + boolean_t sp_found;
tduffy> DAT_RETURN dat_status;
tduffy>
tduffy> dat_status = DAT_SUCCESS;
tduffy> @@ -123,13 +123,13 @@ dapl_rsp_create(DAT_IA_HANDLE ia_handle,
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - sp_ptr = dapl_ia_sp_search(ia_ptr, conn_qual, DAT_FALSE);
tduffy> - sp_found = DAT_TRUE;
tduffy> + sp_ptr = dapl_ia_sp_search(ia_ptr, conn_qual, FALSE);
tduffy> + sp_found = TRUE;
tduffy> if (sp_ptr == NULL) {
tduffy> - sp_found = DAT_FALSE;
tduffy> + sp_found = FALSE;
tduffy>
tduffy> /* Allocate RSP */
tduffy> - sp_ptr = dapl_sp_alloc(ia_ptr, DAT_FALSE);
tduffy> + sp_ptr = dapl_sp_alloc(ia_ptr, FALSE);
tduffy> if (sp_ptr == NULL) {
tduffy> dat_status =
tduffy> DAT_ERROR(DAT_INSUFFICIENT_RESOURCES,
tduffy> @@ -162,9 +162,9 @@ dapl_rsp_create(DAT_IA_HANDLE ia_handle,
tduffy> * even before this call returns!
tduffy> */
tduffy> sp_ptr->state = DAPL_SP_STATE_RSP_LISTENING;
tduffy> - sp_ptr->listening = DAT_TRUE;
tduffy> + sp_ptr->listening = TRUE;
tduffy>
tduffy> - if (sp_found == DAT_FALSE) {
tduffy> + if (sp_found == FALSE) {
tduffy> /* Link it onto the IA */
tduffy> dapl_ia_link_rsp(ia_ptr, sp_ptr);
tduffy>
tduffy> Index: linux-kernel/dat-provider/dapl_ep_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_ep_util.c (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_ep_util.c (working copy)
tduffy> @@ -359,7 +359,7 @@ void dapl_ep_timeout(uintptr_t arg)
tduffy> *cm event number.
tduffy> */
tduffy> ib_cm_event = dapl_ib_get_cm_event(DAT_CONNECTION_EVENT_DISCONNECTED);
tduffy> - dapl_ib_disconnect_clean(ep_ptr, DAT_TRUE, ib_cm_event);
tduffy> + dapl_ib_disconnect_clean(ep_ptr, TRUE, ib_cm_event);
tduffy>
tduffy> (void)dapl_evd_post_connection_event((DAPL_EVD *) ep_ptr->param.
tduffy> connect_evd_handle,
tduffy> Index: linux-kernel/dat-provider/dapl_rmr_util.h
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_rmr_util.h (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_rmr_util.h (working copy)
tduffy> @@ -49,7 +49,7 @@ extern DAPL_RMR *dapl_rmr_alloc(DAPL_PZ
tduffy>
tduffy> extern void dapl_rmr_dealloc(DAPL_RMR * rmr);
tduffy>
tduffy> -static __inline__ DAT_BOOLEAN
tduffy> +static __inline__ boolean_t
tduffy> dapl_rmr_validate_completion_flag(DAT_COMPLETION_FLAGS mask,
tduffy> DAT_COMPLETION_FLAGS allow,
tduffy> DAT_COMPLETION_FLAGS request);
tduffy> @@ -60,15 +60,15 @@ dapl_rmr_validate_completion_flag(DAT_CO
tduffy> * *
tduffy> *********************************************************************/
tduffy>
tduffy> -static __inline__ DAT_BOOLEAN
tduffy> +static __inline__ boolean_t
tduffy> dapl_rmr_validate_completion_flag(DAT_COMPLETION_FLAGS mask,
tduffy> DAT_COMPLETION_FLAGS allow,
tduffy> DAT_COMPLETION_FLAGS request)
tduffy> {
tduffy> if ((mask & request) && !(mask & allow)) {
tduffy> - return DAT_FALSE;
tduffy> + return FALSE;
tduffy> } else {
tduffy> - return DAT_TRUE;
tduffy> + return TRUE;
tduffy> }
tduffy> }
tduffy>
tduffy> Index: linux-kernel/dat-provider/dapl_rsp_free.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_rsp_free.c (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_rsp_free.c (working copy)
tduffy> @@ -112,13 +112,13 @@ DAT_RETURN dapl_rsp_free(DAT_RSP_HANDLE
tduffy> * else the last disconnect on this RSP will free it up. The RSP
tduffy> * is used to contain CR records for each connection, which
tduffy> * contain information necessary to disconnect.
tduffy> - * sp_ptr->listening will be DAT_TRUE if there has never been a
tduffy> - * connection event, and DAT_FALSE if a connection attempt resulted
tduffy> + * sp_ptr->listening will be TRUE if there has never been a
tduffy> + * connection event, and FALSE if a connection attempt resulted
tduffy> * in a reject.
tduffy> */
tduffy> if (sp_ptr->cr_list_count == 0) {
tduffy> /* This RSP has never been used. Clean it up */
tduffy> - sp_ptr->listening = DAT_FALSE;
tduffy> + sp_ptr->listening = FALSE;
tduffy> sp_ptr->state = DAPL_SP_STATE_FREE;
tduffy> spin_unlock(&sp_ptr->header.lock);
tduffy>
tduffy> Index: linux-kernel/dat-provider/dapl_ia_open.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_ia_open.c (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_ia_open.c (working copy)
tduffy> @@ -47,7 +47,7 @@
tduffy> * LOCAL PROTOTYPES
tduffy> */
tduffy>
tduffy> -void dapl_hca_cleanup(DAPL_HCA * hca_ptr, DAT_BOOLEAN dec_ref);
tduffy> +void dapl_hca_cleanup(DAPL_HCA * hca_ptr, boolean_t dec_ref);
tduffy>
tduffy> /*
tduffy> * Open a provider and return a handle. The handle enables the user
tduffy> @@ -124,7 +124,7 @@ dapl_ia_open(const DAT_NAME_PTR name,
tduffy> &hca_ptr->ia_attr,
tduffy> NULL, &hca_ptr->hca_address);
tduffy> if (dat_status != DAT_SUCCESS) {
tduffy> - dapl_hca_cleanup(hca_ptr, DAT_FALSE);
tduffy> + dapl_hca_cleanup(hca_ptr, FALSE);
tduffy> spin_unlock(&hca_ptr->lock);
tduffy> goto bail;
tduffy> }
tduffy> @@ -137,7 +137,7 @@ dapl_ia_open(const DAT_NAME_PTR name,
tduffy> ia_ptr = dapl_ia_alloc(provider, hca_ptr);
tduffy> if (!ia_ptr) {
tduffy> spin_lock(&hca_ptr->lock);
tduffy> - dapl_hca_cleanup(hca_ptr, DAT_TRUE);
tduffy> + dapl_hca_cleanup(hca_ptr, TRUE);
tduffy> spin_unlock(&hca_ptr->lock);
tduffy> dat_status =
tduffy> DAT_ERROR(DAT_INSUFFICIENT_RESOURCES, DAT_RESOURCE_MEMORY);
tduffy> @@ -173,7 +173,7 @@ dapl_ia_open(const DAT_NAME_PTR name,
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - ia_ptr->cleanup_async_error_evd = DAT_FALSE;
tduffy> + ia_ptr->cleanup_async_error_evd = FALSE;
tduffy> ia_ptr->async_error_evd = evd_ptr;
tduffy> } else {
tduffy> /* Verify we have >0 length, and let the provider check the size */
tduffy> @@ -204,13 +204,13 @@ dapl_ia_open(const DAT_NAME_PTR name,
tduffy> dat_status = dapl_ia_setup_callbacks(ia_ptr, evd_ptr);
tduffy> if (dat_status != DAT_SUCCESS) {
tduffy> /* Assign the EVD so it gets cleaned up */
tduffy> - ia_ptr->cleanup_async_error_evd = DAT_TRUE;
tduffy> + ia_ptr->cleanup_async_error_evd = TRUE;
tduffy> ia_ptr->async_error_evd = evd_ptr;
tduffy> goto bail;
tduffy> }
tduffy> }
tduffy>
tduffy> - ia_ptr->cleanup_async_error_evd = DAT_TRUE;
tduffy> + ia_ptr->cleanup_async_error_evd = TRUE;
tduffy> ia_ptr->async_error_evd = evd_ptr;
tduffy> }
tduffy>
tduffy> @@ -236,10 +236,10 @@ dapl_ia_open(const DAT_NAME_PTR name,
tduffy> * Clean up partially allocated HCA stuff. Strictly to make cleanup
tduffy> * simple.
tduffy> */
tduffy> -void dapl_hca_cleanup(DAPL_HCA * hca_ptr, DAT_BOOLEAN dec_ref)
tduffy> +void dapl_hca_cleanup(DAPL_HCA * hca_ptr, boolean_t dec_ref)
tduffy> {
tduffy> dapl_ib_close_hca(hca_ptr);
tduffy> - if (dec_ref == DAT_TRUE) {
tduffy> + if (dec_ref == TRUE) {
tduffy> atomic_dec(&hca_ptr->handle_ref_count);
tduffy> }
tduffy> }
tduffy> Index: linux-kernel/dat-provider/dapl_evd_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_evd_util.c (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_evd_util.c (working copy)
tduffy> @@ -163,7 +163,7 @@ DAPL_EVD *dapl_evd_alloc(DAPL_IA * ia_pt
tduffy> evd_ptr->evd_producer_locking_needed = 1; /* Conservative value. */
tduffy> evd_ptr->ib_cq_handle = IB_INVALID_HANDLE;
tduffy> atomic_set(&evd_ptr->evd_ref_count, 0);
tduffy> - evd_ptr->catastrophic_overflow = DAT_FALSE;
tduffy> + evd_ptr->catastrophic_overflow = FALSE;
tduffy> evd_ptr->qlen = qlen;
tduffy> evd_ptr->cno_ptr = cno_ptr;
tduffy>
tduffy> @@ -476,7 +476,7 @@ dapl_evd_post_overflow_event(DAPL_EVD *
tduffy> * In that case we've got a catastrophic overflow.
tduffy> */
tduffy> if (async_evd_ptr == overflow_evd_ptr) {
tduffy> - async_evd_ptr->catastrophic_overflow = DAT_TRUE;
tduffy> + async_evd_ptr->catastrophic_overflow = TRUE;
tduffy> async_evd_ptr->evd_state = DAPL_EVD_STATE_DEAD;
tduffy> return;
tduffy> }
tduffy> @@ -484,7 +484,7 @@ dapl_evd_post_overflow_event(DAPL_EVD *
tduffy> overflow_event = dapl_evd_get_event(overflow_evd_ptr);
tduffy> if (!overflow_event) {
tduffy> /* this is not good */
tduffy> - overflow_evd_ptr->catastrophic_overflow = DAT_TRUE;
tduffy> + overflow_evd_ptr->catastrophic_overflow = TRUE;
tduffy> overflow_evd_ptr->evd_state = DAPL_EVD_STATE_DEAD;
tduffy> return;
tduffy> }
tduffy> Index: linux-kernel/dat-provider/dapl_sp_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_sp_util.c (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_sp_util.c (working copy)
tduffy> @@ -59,7 +59,7 @@
tduffy> * pointer to sp info struct
tduffy> *
tduffy> */
tduffy> -DAPL_SP *dapl_sp_alloc(DAPL_IA * ia_ptr, DAT_BOOLEAN is_psp)
tduffy> +DAPL_SP *dapl_sp_alloc(DAPL_IA * ia_ptr, boolean_t is_psp)
tduffy> {
tduffy> DAPL_SP *sp_ptr;
tduffy>
tduffy> Index: linux-kernel/dat-provider/dapl_hash.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_hash.c (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_hash.c (working copy)
tduffy> @@ -153,25 +153,24 @@ dapl_hash_rehash(DAPL_HASH_ELEM * elemen
tduffy> *
tduffy> * Inputs:
tduffy> * table, key and datum to be added
tduffy> - * allow_dup - DAT_TRUE if dups are allowed
tduffy> + * allow_dup - TRUE if dups are allowed
tduffy> * Outputs:
tduffy> * report_dup - should you care to know
tduffy> * Returns:
tduffy> - * DAT_TRUE on success
tduffy> + * TRUE on success
tduffy> */
tduffy> -static DAT_BOOLEAN
tduffy> -dapl_hash_add(DAPL_HASH_TABLEP p_table,
tduffy> - DAPL_HASH_KEY key,
tduffy> - void *datum, DAT_BOOLEAN allow_dup, DAT_BOOLEAN * report_dup)
tduffy> +static boolean_t
tduffy> +dapl_hash_add(DAPL_HASH_TABLEP p_table, DAPL_HASH_KEY key, void *datum,
tduffy> + boolean_t allow_dup, boolean_t *report_dup)
tduffy> {
tduffy> void *olddatum;
tduffy> DAPL_HASH_KEY hashValue, save_key = key;
tduffy> DAPL_HASH_ELEM *found;
tduffy> - DAT_BOOLEAN status = DAT_FALSE;
tduffy> + boolean_t status = FALSE;
tduffy> unsigned int chain_len = 0;
tduffy>
tduffy> if (report_dup) {
tduffy> - (*report_dup) = DAT_FALSE;
tduffy> + (*report_dup) = FALSE;
tduffy> }
tduffy>
tduffy> if (NO_DATUM(datum)) {
tduffy> @@ -181,7 +180,7 @@ dapl_hash_add(DAPL_HASH_TABLEP p_table,
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_ERR,
tduffy> "dapl_hash_add () called with magic NO_DATA value (%p) "
tduffy> "used as datum!\n", datum);
tduffy> - return DAT_FALSE;
tduffy> + return FALSE;
tduffy> }
tduffy>
tduffy> DAPL_HASHLOOKUP(p_table, key, olddatum, found);
tduffy> @@ -190,14 +189,14 @@ dapl_hash_add(DAPL_HASH_TABLEP p_table,
tduffy> * key exists already
tduffy> */
tduffy> if (report_dup) {
tduffy> - *report_dup = DAT_TRUE;
tduffy> + *report_dup = TRUE;
tduffy> }
tduffy>
tduffy> if (!allow_dup) {
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_ERR,
tduffy> "dapl_hash_add () called with duplicate key ("
tduffy> F64x ")\n", key);
tduffy> - return DAT_FALSE;
tduffy> + return FALSE;
tduffy> }
tduffy> }
tduffy>
tduffy> @@ -211,7 +210,7 @@ dapl_hash_add(DAPL_HASH_TABLEP p_table,
tduffy> p_table->table[hashValue].datum = datum;
tduffy> p_table->table[hashValue].next_element = NULL;
tduffy> p_table->num_entries++;
tduffy> - status = DAT_TRUE;
tduffy> + status = TRUE;
tduffy> } else {
tduffy> DAPL_HASH_ELEM *newelement = (DAPL_HASH_ELEM *)
tduffy> kmalloc(sizeof(DAPL_HASH_ELEM), GFP_ATOMIC);
tduffy> @@ -231,10 +230,10 @@ dapl_hash_add(DAPL_HASH_TABLEP p_table,
tduffy> }
tduffy> lastelement->next_element = newelement;
tduffy> p_table->num_entries++;
tduffy> - status = DAT_TRUE;
tduffy> + status = TRUE;
tduffy> } else {
tduffy> /* allocation failed - should not happen */
tduffy> - status = DAT_FALSE;
tduffy> + status = FALSE;
tduffy> }
tduffy> }
tduffy>
tduffy> @@ -262,9 +261,9 @@ dapl_hash_add(DAPL_HASH_TABLEP p_table,
tduffy> * Inputs:
tduffy> * element, key to be deleted
tduffy> * Returns:
tduffy> - * DAT_TRUE on success
tduffy> + * TRUE on success
tduffy> */
tduffy> -static DAT_BOOLEAN
tduffy> +static boolean_t
tduffy> dapl_hash_delete_element(DAPL_HASH_ELEM * element,
tduffy> DAPL_HASH_KEY key, DAPL_HASH_DATA * p_datum)
tduffy> {
tduffy> @@ -309,7 +308,7 @@ dapl_hash_delete_element(DAPL_HASH_ELEM
tduffy> }
tduffy> }
tduffy>
tduffy> - return (curelement != NULL ? DAT_TRUE : DAT_FALSE);
tduffy> + return (curelement != NULL ? TRUE : FALSE);
tduffy> }
tduffy>
tduffy> /*********************************************************************
tduffy> @@ -405,7 +404,7 @@ dapl_hash_insert(DAPL_HASH_TABLE * p_tab
tduffy> dat_status = DAT_SUCCESS;
tduffy>
tduffy> spin_lock(&p_table->lock);
tduffy> - if (!dapl_hash_add(p_table, key, data, DAT_FALSE, NULL)) {
tduffy> + if (!dapl_hash_add(p_table, key, data, FALSE, NULL)) {
tduffy> dat_status =
tduffy> DAT_ERROR(DAT_INSUFFICIENT_RESOURCES, DAT_RESOURCE_MEMORY);
tduffy> }
tduffy> Index: linux-kernel/dat-provider/dapl_sp_util.h
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_sp_util.h (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_sp_util.h (working copy)
tduffy> @@ -37,7 +37,7 @@
tduffy> #ifndef DAPL_PSP_UTIL_H
tduffy> #define DAPL_PSP_UTIL_H
tduffy>
tduffy> -DAPL_SP *dapl_sp_alloc(DAPL_IA * ia_ptr, DAT_BOOLEAN is_psp);
tduffy> +DAPL_SP *dapl_sp_alloc(DAPL_IA * ia_ptr, boolean_t is_psp);
tduffy>
tduffy> void dapl_sp_free_sp(DAPL_SP * sp_ptr);
tduffy>
tduffy> Index: linux-kernel/dat-provider/dapl.h
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl.h (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl.h (working copy)
tduffy> @@ -240,7 +240,7 @@ struct dapl_ia {
tduffy> DAPL_HEADER header;
tduffy> DAPL_HCA *hca_ptr;
tduffy> DAPL_EVD *async_error_evd;
tduffy> - DAT_BOOLEAN cleanup_async_error_evd;
tduffy> + boolean_t cleanup_async_error_evd;
tduffy>
tduffy> DAPL_LLIST_ENTRY hca_ia_list_entry; /* HCAs list of IAs */
tduffy> DAPL_LLIST_HEAD ep_list_head; /* EP queue */
tduffy> @@ -269,7 +269,7 @@ struct dapl_evd
tduffy> DAT_EVD_FLAGS evd_flags;
tduffy>
tduffy> /* Derived from evd_flags; see dapls_evd_internal_create. */
tduffy> - DAT_BOOLEAN evd_producer_locking_needed;
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> @@ -280,7 +280,7 @@ struct dapl_evd
tduffy> atomic_t evd_ref_count;
tduffy>
tduffy> /* Set if there has been a catastrophic overflow */
tduffy> - DAT_BOOLEAN catastrophic_overflow;
tduffy> + boolean_t catastrophic_overflow;
tduffy>
tduffy> /* the actual events */
tduffy> DAT_COUNT qlen;
tduffy> @@ -395,7 +395,7 @@ struct dapl_sp {
tduffy> DAT_EP_HANDLE ep_handle;
tduffy>
tduffy> /* maintenence fields */
tduffy> - DAT_BOOLEAN listening; /* PSP is registered & active */
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> @@ -617,8 +617,8 @@ extern DAT_RETURN dapl_ep_post_rdma_writ
tduffy>
tduffy> extern DAT_RETURN dapl_ep_get_status(DAT_EP_HANDLE, /* ep_handle */
tduffy> DAT_EP_STATE *, /* ep_state */
tduffy> - DAT_BOOLEAN *, /* in_dto_idle */
tduffy> - DAT_BOOLEAN *); /* out_dto_idle */
tduffy> + boolean_t *, /* in_dto_idle */
tduffy> + boolean_t *); /* out_dto_idle */
tduffy>
tduffy> extern DAT_RETURN dapl_ep_free(DAT_EP_HANDLE); /* ep_handle */
tduffy>
tduffy> @@ -757,7 +757,7 @@ extern void dapl_llist_init_head(DAPL_LL
tduffy>
tduffy> extern void dapl_llist_init_entry(DAPL_LLIST_ENTRY * entry);
tduffy>
tduffy> -extern DAT_BOOLEAN dapl_llist_is_empty(DAPL_LLIST_HEAD * head);
tduffy> +extern boolean_t dapl_llist_is_empty(DAPL_LLIST_HEAD * head);
tduffy>
tduffy> extern void dapl_llist_add_head(DAPL_LLIST_HEAD * head,
tduffy> DAPL_LLIST_ENTRY * entry, void *data);
tduffy> Index: linux-kernel/dat-provider/dapl_psp_query.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_psp_query.c (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_psp_query.c (working copy)
tduffy> @@ -45,7 +45,7 @@ DAT_RETURN dapl_psp_query(DAT_PSP_HANDLE
tduffy> DAT_RETURN status;
tduffy>
tduffy> if (DAPL_BAD_HANDLE(psp_handle, DAPL_MAGIC_PSP) ||
tduffy> - ((DAPL_SP *) psp_handle)->listening != DAT_TRUE) {
tduffy> + ((DAPL_SP *) psp_handle)->listening != TRUE) {
tduffy> status =
tduffy> DAT_ERROR(DAT_INVALID_HANDLE, DAT_INVALID_HANDLE_PSP);
tduffy> goto bail;
tduffy> Index: linux-kernel/dat-provider/dapl_llist.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat-provider/dapl_llist.c (revision 2295)
tduffy> +++ linux-kernel/dat-provider/dapl_llist.c (working copy)
tduffy> @@ -80,7 +80,7 @@ void dapl_llist_init_entry(DAPL_LLIST_EN
tduffy> *
tduffy> * Purpose: returns TRUE if the linked list is empty
tduffy> */
tduffy> -DAT_BOOLEAN dapl_llist_is_empty(DAPL_LLIST_HEAD * head)
tduffy> +boolean_t dapl_llist_is_empty(DAPL_LLIST_HEAD * head)
tduffy> {
tduffy> return (*head == NULL);
tduffy> }
tduffy> Index: linux-kernel/dat/dictionary.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat/dictionary.c (revision 2295)
tduffy> +++ linux-kernel/dat/dictionary.c (working copy)
tduffy> @@ -62,7 +62,7 @@ static DAT_RETURN
tduffy> dat_dictionary_key_dup(const struct dat_provider_info *old_key,
tduffy> struct dat_provider_info *new_key);
tduffy>
tduffy> -static DAT_BOOLEAN
tduffy> +static boolean_t
tduffy> dat_dictionary_key_is_equal(const struct dat_provider_info *key_a,
tduffy> const struct dat_provider_info *key_b);
tduffy>
tduffy> @@ -270,7 +270,7 @@ DAT_RETURN dat_dictionary_search(DAT_DIC
tduffy>
tduffy> for (cur_node = p_dictionary->head->next;
tduffy> p_dictionary->tail != cur_node; cur_node = cur_node->next) {
tduffy> - if (DAT_TRUE == dat_dictionary_key_is_equal(&cur_node->key,
tduffy> + if (TRUE == dat_dictionary_key_is_equal(&cur_node->key,
tduffy> key)) {
tduffy> if (NULL != p_data)
tduffy> *p_data = cur_node->data;
tduffy> @@ -335,7 +335,7 @@ DAT_RETURN dat_dictionary_remove(DAT_DIC
tduffy>
tduffy> for (cur_node = p_dictionary->head->next;
tduffy> p_dictionary->tail != cur_node; cur_node = cur_node->next) {
tduffy> - if (DAT_TRUE == dat_dictionary_key_is_equal(&cur_node->key,
tduffy> + if (TRUE == dat_dictionary_key_is_equal(&cur_node->key,
tduffy> key)) {
tduffy> if (NULL != p_data)
tduffy> *p_data = cur_node->data;
tduffy> @@ -387,7 +387,7 @@ DAT_RETURN dat_dictionary_key_dup(const
tduffy> * Function: dat_dictionary_key_is_equal
tduffy> ***********************************************************************/
tduffy>
tduffy> -DAT_BOOLEAN dat_dictionary_key_is_equal(const struct dat_provider_info *key_a,
tduffy> +boolean_t dat_dictionary_key_is_equal(const struct dat_provider_info *key_a,
tduffy> const struct dat_provider_info *key_b)
tduffy> {
tduffy> BUG_ON(NULL == key_a);
tduffy> @@ -398,8 +398,8 @@ DAT_BOOLEAN dat_dictionary_key_is_equal(
tduffy> && (key_a->dat_version_major == key_b->dat_version_major)
tduffy> && (key_a->dat_version_minor == key_b->dat_version_minor)
tduffy> && (key_a->is_thread_safe == key_b->is_thread_safe)) {
tduffy> - return DAT_TRUE;
tduffy> + return TRUE;
tduffy> } else {
tduffy> - return DAT_FALSE;
tduffy> + return FALSE;
tduffy> }
tduffy> }
tduffy> Index: linux-kernel/dat/core.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat/core.c (revision 2295)
tduffy> +++ linux-kernel/dat/core.c (working copy)
tduffy> @@ -133,19 +133,19 @@ module_exit(dat_fini);
tduffy> * of handling DAT API calls and false otherwise.
tduffy> */
tduffy>
tduffy> -DAT_BOOLEAN dat_check_state(void)
tduffy> +boolean_t dat_check_state(void)
tduffy> {
tduffy> - DAT_BOOLEAN status;
tduffy> + boolean_t status;
tduffy>
tduffy> if ( (DAT_MODULE_STATE_UNINITIALIZED == g_state) ||
tduffy> (DAT_MODULE_STATE_INITIALIZING == g_state) ) {
tduffy> dat_init();
tduffy> - status = DAT_TRUE;
tduffy> + status = TRUE;
tduffy> } else if ( (DAT_MODULE_STATE_DEINITIALIZED == g_state) ||
tduffy> (DAT_MODULE_STATE_DEINITIALIZING == g_state) ) {
tduffy> - status = DAT_FALSE;
tduffy> + status = FALSE;
tduffy> } else {
tduffy> - status = DAT_TRUE;
tduffy> + status = TRUE;
tduffy> }
tduffy>
tduffy> return status;
tduffy> Index: linux-kernel/dat/api.c
tduffy> ===================================================================
tduffy> --- linux-kernel/dat/api.c (revision 2295)
tduffy> +++ linux-kernel/dat/api.c (working copy)
tduffy> @@ -580,7 +580,7 @@ DAT_RETURN dat_ia_openv(const DAT_NAME_P
tduffy> DAT_EVD_HANDLE *async_event_handle,
tduffy> DAT_IA_HANDLE *ia_handle,
tduffy> u32 dat_major, u32 dat_minor,
tduffy> - DAT_BOOLEAN thread_safety)
tduffy> + boolean_t thread_safety)
tduffy> {
tduffy> DAT_IA_OPEN_FUNC ia_open_func;
tduffy> struct dat_provider_info info;
tduffy> @@ -602,7 +602,7 @@ DAT_RETURN dat_ia_openv(const DAT_NAME_P
tduffy> return DAT_ERROR(DAT_INVALID_PARAMETER, DAT_INVALID_ARG1);
tduffy> }
tduffy>
tduffy> - if (DAT_FALSE == dat_check_state()) {
tduffy> + if (FALSE == dat_check_state()) {
tduffy> return DAT_ERROR(DAT_INVALID_STATE, 0);
tduffy> }
tduffy>
tduffy> @@ -642,7 +642,7 @@ DAT_RETURN dat_ia_close(DAT_IA_HANDLE ia
tduffy> dat_dbg_print(DAT_DBG_CLASS_CONSUMER_API,
tduffy> "%s(ia:%x, flags:%x)\n", __func__, ia_handle, flags);
tduffy>
tduffy> - if (DAT_FALSE == dat_check_state()) {
tduffy> + if (FALSE == dat_check_state()) {
tduffy> return DAT_ERROR(DAT_INVALID_STATE, 0);
tduffy> }
tduffy>
tduffy> @@ -739,7 +739,7 @@ DAT_RETURN dat_registry_add_provider(con
tduffy> if (DAT_IS_BAD_POINTER(provider_info))
tduffy> return DAT_ERROR(DAT_INVALID_PARAMETER, DAT_INVALID_ARG2);
tduffy>
tduffy> - if (DAT_FALSE == dat_check_state())
tduffy> + if (FALSE == dat_check_state())
tduffy> return DAT_ERROR(DAT_INVALID_STATE, 0);
tduffy>
tduffy> return dat_dr_insert(provider_info, provider->ia_open_func);
tduffy> @@ -761,7 +761,7 @@ DAT_RETURN dat_registry_remove_provider(
tduffy> if (DAT_IS_BAD_POINTER(provider))
tduffy> return DAT_ERROR(DAT_INVALID_PARAMETER, DAT_INVALID_ARG1);
tduffy>
tduffy> - if (DAT_FALSE == dat_check_state())
tduffy> + if (FALSE == dat_check_state())
tduffy> return DAT_ERROR(DAT_INVALID_STATE, 0);
tduffy>
tduffy> return dat_dr_remove(provider_info);
tduffy> @@ -785,7 +785,7 @@ DAT_RETURN dat_registry_list_providers(D
tduffy> __func__, max_to_return, entries_returned,
tduffy> dat_provider_list);
tduffy>
tduffy> - if (DAT_FALSE == dat_check_state())
tduffy> + if (FALSE == dat_check_state())
tduffy> return DAT_ERROR(DAT_INVALID_STATE, 0);
tduffy>
tduffy> if ((DAT_IS_BAD_POINTER(entries_returned)))
tduffy> Index: linux-kernel/dat/dat.h
tduffy> ===================================================================
tduffy> --- linux-kernel/dat/dat.h (revision 2295)
tduffy> +++ linux-kernel/dat/dat.h (working copy)
tduffy> @@ -35,7 +35,7 @@
tduffy>
tduffy> #define DAT_VERSION_MAJOR 1
tduffy> #define DAT_VERSION_MINOR 2
tduffy> -#define DAT_THREADSAFE DAT_FALSE
tduffy> +#define DAT_THREADSAFE FALSE
tduffy>
tduffy> /* unsigned longest native to compiler */
tduffy> typedef unsigned long long DAT_UVERYLONG;
tduffy> @@ -364,10 +364,12 @@ struct dat_named_attr {
tduffy> const char *value;
tduffy> };
tduffy>
tduffy> -typedef enum dat_boolean {
tduffy> - DAT_FALSE = 0,
tduffy> - DAT_TRUE = 1
tduffy> -} DAT_BOOLEAN;
tduffy> +typedef enum {
tduffy> +#undef FALSE
tduffy> + FALSE = 0,
tduffy> +#undef TRUE
tduffy> + TRUE = 1
tduffy> +} boolean_t;
tduffy>
tduffy> typedef union dat_context {
tduffy> DAT_PVOID as_ptr;
tduffy> @@ -930,7 +932,7 @@ typedef enum dat_upcall_policy {
tduffy> } DAT_UPCALL_POLICY;
tduffy>
tduffy> typedef void (*DAT_UPCALL_FUNC) (DAT_PVOID, const struct dat_event *,
tduffy> - DAT_BOOLEAN);
tduffy> + boolean_t);
tduffy>
tduffy> struct dat_upcall_object {
tduffy> DAT_PVOID instance_data;
tduffy> @@ -950,7 +952,7 @@ struct dat_provider_info {
tduffy> char ia_name[DAT_NAME_MAX_LENGTH];
tduffy> u32 dat_version_major;
tduffy> u32 dat_version_minor;
tduffy> - DAT_BOOLEAN is_thread_safe;
tduffy> + boolean_t is_thread_safe;
tduffy> };
tduffy>
tduffy> struct dat_evd_param {
tduffy> @@ -1033,8 +1035,8 @@ struct dat_ia_attr {
tduffy> DAT_COUNT max_iov_segments_per_rdma_write;
tduffy> DAT_COUNT max_rdma_read_in;
tduffy> DAT_COUNT max_rdma_read_out;
tduffy> - DAT_BOOLEAN max_rdma_read_per_ep_in_guaranteed;
tduffy> - DAT_BOOLEAN max_rdma_read_per_ep_out_guaranteed;
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> struct dat_named_attr *transport_attr;
tduffy> DAT_COUNT num_vendor_attr;
tduffy> @@ -1079,21 +1081,21 @@ struct dat_provider_attr {
tduffy> DAT_IOV_OWNERSHIP iov_ownership_on_return;
tduffy> DAT_QOS dat_qos_supported;
tduffy> DAT_COMPLETION_FLAGS completion_flags_supported;
tduffy> - DAT_BOOLEAN is_thread_safe;
tduffy> + boolean_t is_thread_safe;
tduffy> DAT_COUNT max_private_data_size;
tduffy> - DAT_BOOLEAN supports_multipath;
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 DAT_BOOLEAN evd_stream_merging_supported[6][6];
tduffy> - DAT_BOOLEAN srq_supported;
tduffy> + const boolean_t evd_stream_merging_supported[6][6];
tduffy> + boolean_t srq_supported;
tduffy> DAT_COUNT srq_watermarks_supported;
tduffy> - DAT_BOOLEAN srq_ep_pz_difference_supported;
tduffy> + boolean_t srq_ep_pz_difference_supported;
tduffy> DAT_COUNT srq_info_supported;
tduffy> DAT_COUNT ep_recv_info_supported;
tduffy> - DAT_BOOLEAN lmr_sync_req;
tduffy> - DAT_BOOLEAN dto_async_return_guaranteed;
tduffy> - DAT_BOOLEAN rdma_write_for_rdma_read_req;
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> struct dat_named_attr *provider_specific_attr;
tduffy> };
tduffy> @@ -1110,7 +1112,7 @@ typedef DAT_RETURN (*DAT_IA_OPEN_FUNC) (
tduffy>
tduffy> typedef DAT_RETURN (*DAT_IA_OPENV_FUNC) (
tduffy> const DAT_NAME_PTR, DAT_COUNT, DAT_EVD_HANDLE *, DAT_IA_HANDLE *,
tduffy> - u32, u32, DAT_BOOLEAN);
tduffy> + u32, u32, boolean_t);
tduffy>
tduffy> typedef DAT_RETURN (*DAT_IA_CLOSE_FUNC) (DAT_IA_HANDLE, DAT_CLOSE_FLAGS);
tduffy>
tduffy> @@ -1185,7 +1187,7 @@ typedef DAT_RETURN (*DAT_EP_POST_RDMA_WR
tduffy> const struct dat_rmr_triplet *, DAT_COMPLETION_FLAGS);
tduffy>
tduffy> typedef DAT_RETURN (*DAT_EP_GET_STATUS_FUNC) (
tduffy> - DAT_EP_HANDLE, DAT_EP_STATE *, DAT_BOOLEAN *, DAT_BOOLEAN *);
tduffy> + DAT_EP_HANDLE, DAT_EP_STATE *, boolean_t *, boolean_t *);
tduffy>
tduffy> typedef DAT_RETURN (*DAT_EP_FREE_FUNC) (DAT_EP_HANDLE);
tduffy>
tduffy> @@ -1381,7 +1383,7 @@ extern DAT_RETURN dat_registry_remove_pr
tduffy> */
tduffy> extern DAT_RETURN dat_ia_openv(const DAT_NAME_PTR, DAT_COUNT,
tduffy> DAT_EVD_HANDLE *, DAT_IA_HANDLE *,
tduffy> - u32, u32, DAT_BOOLEAN);
tduffy> + u32, u32, boolean_t);
tduffy>
tduffy> #define dat_ia_open(name, qlen, async_evd, ia) \
tduffy> dat_ia_openv((name), (qlen), (async_evd), (ia), \
tduffy> @@ -1581,8 +1583,8 @@ static inline DAT_RETURN dat_ep_free(DAT
tduffy>
tduffy> static inline DAT_RETURN dat_ep_get_status(DAT_EP_HANDLE ep,
tduffy> DAT_EP_STATE * state,
tduffy> - DAT_BOOLEAN * recv_idle,
tduffy> - DAT_BOOLEAN * req_idle)
tduffy> + boolean_t *recv_idle,
tduffy> + boolean_t *req_idle)
tduffy> {
tduffy> return DAT_CALL_PROVIDER_FUNC(
tduffy> ep_get_status_func, ep, state, recv_idle, req_idle);
tduffy> Index: linux-kernel/dat/core.h
tduffy> ===================================================================
tduffy> --- linux-kernel/dat/core.h (revision 2295)
tduffy> +++ linux-kernel/dat/core.h (working copy)
tduffy> @@ -65,6 +65,6 @@ typedef int DAT_DBG_CLASS;
tduffy>
tduffy> extern void dat_dbg_print(DAT_DBG_CLASS val, const char *fmt, ...);
tduffy>
tduffy> -extern DAT_BOOLEAN dat_check_state(void);
tduffy> +extern boolean_t dat_check_state(void);
tduffy>
tduffy> #endif /* CORE_H */
tduffy>
More information about the general
mailing list