From 6316f8317d4ecb0e6b47e94ea0782356f201bcb9 Mon Sep 17 00:00:00 2001 From: Arlin Davis Date: Fri, 4 Mar 2016 13:15:05 -0800 Subject: [PATCH] dtest: clean up warnings, keep variables and functions local Signed-off-by: Arlin Davis --- test/dtest/dtest.c | 85 ++++++++++++++-------------- test/dtest/dtestcm.c | 49 ++++++++-------- test/dtest/dtestsrq.c | 69 +++++++++++----------- test/dtest/dtestx.c | 129 +++++++++++++++++++++--------------------- 4 files changed, 166 insertions(+), 166 deletions(-) diff --git a/test/dtest/dtest.c b/test/dtest/dtest.c index e61e000..a9f3cb2 100755 --- a/test/dtest/dtest.c +++ b/test/dtest/dtest.c @@ -166,12 +166,11 @@ static DAT_RMR_TRIPLET *p_rmr_rcv; static DAT_RMR_TRIPLET *p_rmr_snd; /* rdma pointers */ -char *rbuf = NULL; -char *sbuf = NULL; -int status; +static char *rbuf = NULL; +static char *sbuf = NULL; /* timers */ -double start, stop, total_us, total_sec; +static double start, stop; struct dt_time { double total; @@ -194,7 +193,7 @@ struct dt_time { double conn; }; -struct dt_time ts; +static struct dt_time ts; /* defaults */ static int all_data_sizes = 0; @@ -233,28 +232,29 @@ static int data_check = 0; /* forward prototypes */ const char *DT_RetToStr(DAT_RETURN ret_value); const char *DT_EventToStr(DAT_EVENT_NUMBER event_code); -void print_usage(void); -double get_time(void); -void init_data(void); -DAT_RETURN send_msg(void *data, +static void print_usage(void); +static double get_time(void); +static void init_data(void); + +static DAT_RETURN send_msg(void *data, DAT_COUNT size, DAT_LMR_CONTEXT context, DAT_DTO_COOKIE cookie, DAT_COMPLETION_FLAGS flags); -DAT_RETURN connect_ep(char *hostname, +static DAT_RETURN connect_ep(char *hostname, DAT_CONN_QUAL conn_id, struct sockaddr *ser_sa); -void disconnect_ep(void); -DAT_RETURN register_rdma_memory(void); -DAT_RETURN unregister_rdma_memory(void); -DAT_RETURN create_events(void); -DAT_RETURN destroy_events(void); -DAT_RETURN do_rdma_write_imm_with_msg(void); -DAT_RETURN do_rdma_write_with_msg(void); -DAT_RETURN do_rdma_write_ping_pong(int p2, int bytes); -DAT_RETURN do_rdma_read_with_msg(void); -DAT_RETURN do_ping_pong_msg(void); +static void disconnect_ep(void); +static DAT_RETURN register_rdma_memory(void); +static DAT_RETURN unregister_rdma_memory(void); +static DAT_RETURN create_events(void); +static DAT_RETURN destroy_events(void); +static DAT_RETURN do_rdma_write_imm_with_msg(void); +static DAT_RETURN do_rdma_write_with_msg(void); +static DAT_RETURN do_rdma_write_ping_pong(int p2, int bytes); +static DAT_RETURN do_rdma_read_with_msg(void); +static DAT_RETURN do_ping_pong_msg(void); #define LOGPRINTF if (verbose) printf #define CONN_PORT 15828 @@ -262,7 +262,7 @@ DAT_RETURN do_ping_pong_msg(void); /* The Format of the message we pass through sockets */ #define CONN_MSG_FMT "%04hx:%08x:%08x:%08x:%s" -void flush_evds(void) +static void flush_evds(void) { DAT_EVENT event; @@ -359,7 +359,7 @@ static void print_ia_address(struct sockaddr *sa) } } -int conn_client_connect(const char *servername, int port) +static int conn_client_connect(const char *servername, int port) { struct addrinfo *res, *t; @@ -402,7 +402,7 @@ int conn_client_connect(const char *servername, int port) return sockfd; } -int conn_server_connect(int port) +static int conn_server_connect(int port) { struct addrinfo *res, *t; struct addrinfo hints = { @@ -1129,7 +1129,7 @@ finish: return (0); } -double get_time(void) +static double get_time(void) { struct timeval tp; @@ -1137,13 +1137,13 @@ double get_time(void) return ((double)tp.tv_sec + (double)tp.tv_usec * 1e-6); } -void init_data(void) +static void init_data(void) { memset(rbuf, 'a', buf_len); memset(sbuf, 'b', buf_len); } -DAT_RETURN +static DAT_RETURN send_msg(void *data, DAT_COUNT size, DAT_LMR_CONTEXT context, @@ -1202,7 +1202,7 @@ send_msg(void *data, } if (event.event_data.dto_completion_event_data.status != - DAT_SUCCESS) { + DAT_DTO_SUCCESS) { fprintf(stderr, "%d: ERROR: DTO event status %s\n", getpid(), DT_RetToStr(ret)); return (DAT_ABORT); @@ -1212,6 +1212,7 @@ send_msg(void *data, return DAT_SUCCESS; } +static DAT_RETURN connect_ep(char *hostname, DAT_CONN_QUAL conn_id, struct sockaddr *ser_sa) @@ -1609,7 +1610,7 @@ no_resolution: return (DAT_SUCCESS); } -void disconnect_ep(void) +static void disconnect_ep(void) { DAT_RETURN ret; DAT_EVENT event; @@ -1695,7 +1696,7 @@ void disconnect_ep(void) return; } -DAT_RETURN do_rdma_write_with_msg(void) +static DAT_RETURN do_rdma_write_with_msg(void) { DAT_EVENT event; DAT_DTO_COMPLETION_EVENT_DATA *dto_event; @@ -1862,7 +1863,7 @@ acked: return (DAT_SUCCESS); } -DAT_RETURN do_rdma_write_imm_with_msg(void) +static DAT_RETURN do_rdma_write_imm_with_msg(void) { DAT_EVENT event; DAT_LMR_TRIPLET l_iov[MSG_IOV_COUNT]; @@ -2041,9 +2042,9 @@ acked: } #define PAT_NUM 5 -unsigned char pat[PAT_NUM] = { 0, 0xff, 0x55, 0xaa, 0 }; +static unsigned char pat[PAT_NUM] = { 0, 0xff, 0x55, 0xaa, 0 }; -void set_pat(unsigned int len, unsigned int pat_num) +static void set_pat(unsigned int len, unsigned int pat_num) { if (len <= 1) return; @@ -2089,7 +2090,7 @@ void set_pat(unsigned int len, unsigned int pat_num) /* always uni-direction */ -DAT_RETURN do_rdma_write_ping_pong(int p2, int bytes) +static DAT_RETURN do_rdma_write_ping_pong(int p2, int bytes) { DAT_EVENT event; DAT_LMR_TRIPLET l_iov[MSG_IOV_COUNT]; @@ -2215,7 +2216,7 @@ DAT_RETURN do_rdma_write_ping_pong(int p2, int bytes) return (DAT_SUCCESS); } -DAT_RETURN do_rdma_read_with_msg(void) +static DAT_RETURN do_rdma_read_with_msg(void) { DAT_EVENT event; DAT_LMR_TRIPLET l_iov; @@ -2287,7 +2288,7 @@ DAT_RETURN do_rdma_read_with_msg(void) return (DAT_ABORT); } if (event.event_data.dto_completion_event_data.status != - DAT_SUCCESS) { + DAT_DTO_SUCCESS) { fprintf(stderr, "%d: ERROR: DTO event status %s\n", getpid(), DT_RetToStr(ret)); return (DAT_ABORT); @@ -2385,7 +2386,7 @@ DAT_RETURN do_rdma_read_with_msg(void) return (DAT_SUCCESS); } -DAT_RETURN do_ping_pong_msg() +static DAT_RETURN do_ping_pong_msg() { DAT_EVENT event; DAT_DTO_COOKIE cookie; @@ -2540,7 +2541,7 @@ DAT_RETURN do_ping_pong_msg() } /* Register RDMA Receive buffer */ -DAT_RETURN register_rdma_memory(void) +static DAT_RETURN register_rdma_memory(void) { DAT_RETURN ret; DAT_REGION_DESCRIPTION region; @@ -2600,7 +2601,7 @@ DAT_RETURN register_rdma_memory(void) /* * Unregister RDMA memory */ -DAT_RETURN unregister_rdma_memory(void) +static DAT_RETURN unregister_rdma_memory(void) { DAT_RETURN ret; @@ -2641,7 +2642,7 @@ DAT_RETURN unregister_rdma_memory(void) /* * Create CNO, CR, CONN, and DTO events */ -DAT_RETURN create_events(void) +static DAT_RETURN create_events(void) { DAT_RETURN ret; DAT_EVD_PARAM param; @@ -2751,7 +2752,7 @@ DAT_RETURN create_events(void) * Destroy CR, CONN, CNO, and DTO events */ -DAT_RETURN destroy_events(void) +static DAT_RETURN destroy_events(void) { DAT_RETURN ret; @@ -2839,7 +2840,7 @@ DAT_RETURN destroy_events(void) * Map DAT_RETURN values to readable strings, * but don't assume the values are zero-based or contiguous. */ -char errmsg[512] = { 0 }; +static char errmsg[512] = { 0 }; const char *DT_RetToStr(DAT_RETURN ret_value) { const char *major_msg, *minor_msg; @@ -2894,7 +2895,7 @@ const char *DT_EventToStr(DAT_EVENT_NUMBER event_code) return ("Invalid_DAT_EVENT_NUMBER"); } -void print_usage(void) +static void print_usage(void) { printf("\n DAPL USAGE \n\n"); printf("s: server\n"); diff --git a/test/dtest/dtestcm.c b/test/dtest/dtestcm.c index ffba8a4..77f8e55 100644 --- a/test/dtest/dtestcm.c +++ b/test/dtest/dtestcm.c @@ -120,14 +120,11 @@ static DAT_EVD_HANDLE h_cr_evd = DAT_HANDLE_NULL; static DAT_EVD_HANDLE h_conn_evd = DAT_HANDLE_NULL; static DAT_EP_ATTR ep_attr; -char hostname[256] = { 0 }; -char provider[64] = DAPL_PROVIDER; -char addr_str[INET_ADDRSTRLEN]; - -int status; +static char hostname[256] = { 0 }; +static char provider[64] = DAPL_PROVIDER; /* timers */ -double start, stop, total_us, total_sec; +static double start, stop; struct dt_time { double total; @@ -147,7 +144,7 @@ struct dt_time { double conn; }; -struct dt_time ts; +static struct dt_time ts; /* defaults */ static int connected = 0; @@ -168,17 +165,17 @@ static DAT_SOCK_ADDR6 remote; /* forward prototypes */ const char *DT_RetToString(DAT_RETURN ret_value); const char *DT_EventToSTr(DAT_EVENT_NUMBER event_code); -void print_usage(void); -double get_time(void); -DAT_RETURN conn_client(void); -DAT_RETURN conn_server(void); -DAT_RETURN disconnect_eps(void); -DAT_RETURN create_events(void); -DAT_RETURN destroy_events(void); +static void print_usage(void); +static double get_time(void); +static DAT_RETURN conn_client(void); +static DAT_RETURN conn_server(void); +static DAT_RETURN disconnect_eps(void); +static DAT_RETURN create_events(void); +static DAT_RETURN destroy_events(void); #define LOGPRINTF if (verbose) printf -void flush_evds(void) +static void flush_evds(void) { DAT_EVENT event; @@ -550,7 +547,7 @@ bail: return (0); } -double get_time(void) +static double get_time(void) { struct timeval tp; @@ -558,7 +555,7 @@ double get_time(void) return ((double)tp.tv_sec + (double)tp.tv_usec * 1e-6); } -DAT_RETURN conn_server() +static DAT_RETURN conn_server() { DAT_RETURN ret; DAT_EVENT event; @@ -590,7 +587,7 @@ DAT_RETURN conn_server() } if ((event.event_number != DAT_CONNECTION_REQUEST_EVENT) && - (ud_test && event.event_number != + (ud_test && event.event_number != (DAT_EVENT_NUMBER) DAT_IB_UD_CONNECTION_REQUEST_EVENT)) { fprintf(stderr, " Error unexpected CR event : %s\n", DT_EventToSTr(event.event_number)); @@ -673,7 +670,7 @@ DAT_RETURN conn_server() } } if ((event.event_number != DAT_CONNECTION_EVENT_ESTABLISHED) && - (ud_test && event.event_number != + (ud_test && event.event_number != (DAT_EVENT_NUMBER) DAT_IB_UD_CONNECTION_EVENT_ESTABLISHED)) { fprintf(stderr, " Error unexpected CR EST " @@ -691,7 +688,7 @@ DAT_RETURN conn_server() } -DAT_RETURN conn_client() +static DAT_RETURN conn_client() { DAT_IA_ADDRESS_PTR raddr = (DAT_IA_ADDRESS_PTR)&remote; DAT_RETURN ret; @@ -806,7 +803,7 @@ no_resolution: #endif if ((event.event_number != DAT_CONNECTION_EVENT_ESTABLISHED) && - (ud_test && event.event_number != + (ud_test && event.event_number != (DAT_EVENT_NUMBER) DAT_IB_UD_CONNECTION_EVENT_ESTABLISHED)) { fprintf(stderr, " Error unexpected conn " "event : 0x%x %s\n", @@ -854,7 +851,7 @@ no_resolution: } /* validate disconnected EP's and free them */ -DAT_RETURN disconnect_eps(void) +static DAT_RETURN disconnect_eps(void) { DAT_RETURN ret; DAT_EVENT event; @@ -968,7 +965,7 @@ DAT_RETURN disconnect_eps(void) /* * Create CR, CONN, and DTO events */ -DAT_RETURN create_events(void) +static DAT_RETURN create_events(void) { DAT_RETURN ret; @@ -1030,7 +1027,7 @@ DAT_RETURN create_events(void) * Destroy CR, CONN, CNO, and DTO events */ -DAT_RETURN destroy_events(void) +static DAT_RETURN destroy_events(void) { DAT_RETURN ret; @@ -1101,7 +1098,7 @@ DAT_RETURN destroy_events(void) * Map DAT_RETURN values to readable strings, * but don't assume the values are zero-based or contiguous. */ -char errmsg[512] = { 0 }; +static char errmsg[512] = { 0 }; const char *DT_RetToString(DAT_RETURN ret_value) { const char *major_msg, *minor_msg; @@ -1156,7 +1153,7 @@ const char *DT_EventToSTr(DAT_EVENT_NUMBER event_code) return ("Invalid_DAT_EVENT_NUMBER"); } -void print_usage(void) +static void print_usage(void) { printf("\n DAPL USAGE \n\n"); printf("s: server\n"); diff --git a/test/dtest/dtestsrq.c b/test/dtest/dtestsrq.c index 2bc2596..c1a0f67 100644 --- a/test/dtest/dtestsrq.c +++ b/test/dtest/dtestsrq.c @@ -124,11 +124,8 @@ static DAT_EVD_HANDLE h_cr_evd = DAT_HANDLE_NULL; static DAT_EVD_HANDLE h_conn_evd = DAT_HANDLE_NULL; static DAT_EP_ATTR ep_attr; -char hostname[256] = { 0 }; -char provider[64] = DAPL_PROVIDER; -char addr_str[INET_ADDRSTRLEN]; - -int status; +static char hostname[256] = { 0 }; +static char provider[64] = DAPL_PROVIDER; /* defaults */ static int server = 1; @@ -156,26 +153,26 @@ static DAT_VADDR registered_addr_recv; static int tx_buf_len = 0, rx_buf_len; static int connected = 0; -char *rbuf = NULL; -char *sbuf = NULL; +static char *rbuf = NULL; +static char *sbuf = NULL; static DAT_SOCK_ADDR6 remote; /* forward prototypes */ const char *DT_RetToString(DAT_RETURN ret_value); const char *DT_EventToSTr(DAT_EVENT_NUMBER event_code); -void print_usage(void); -void flush_evds(void); +static void print_usage(void); +static void flush_evds(void); static void print_ia_address(struct sockaddr *sa); -DAT_RETURN conn_client(void); -DAT_RETURN conn_server(void); -DAT_RETURN disconnect_eps(void); -DAT_RETURN create_events(void); -DAT_RETURN destroy_events(void); -DAT_RETURN register_rdma_memory(void); -void unregister_rdma_memory(void); -DAT_RETURN send_msg(char *buff, char msg_head, DAT_UINT32 ep_num, DAT_UINT32 msg_num); -DAT_RETURN process_cr(void); -DAT_RETURN process_conn(void); +static DAT_RETURN conn_client(void); +static DAT_RETURN conn_server(void); +static DAT_RETURN disconnect_eps(void); +static DAT_RETURN create_events(void); +static DAT_RETURN destroy_events(void); +static DAT_RETURN register_rdma_memory(void); +static void unregister_rdma_memory(void); +static DAT_RETURN send_msg(char *buff, char msg_head, DAT_UINT32 ep_num, DAT_UINT32 msg_num); +static DAT_RETURN process_cr(void); +static DAT_RETURN process_conn(void); #define LOGPRINTF if (verbose) printf int main(int argc, char **argv) @@ -601,7 +598,8 @@ int main(int argc, char **argv) /* validate event number and status */ LOGPRINTF(" inbound message; message arrived!\n"); if (event.event_number != DAT_DTO_COMPLETION_EVENT && - ud_test && event.event_number != DAT_IB_DTO_EVENT) { + ud_test && event.event_number != (DAT_EVENT_NUMBER) + DAT_IB_DTO_EVENT) { fprintf(stderr, " Error unexpected DTO event (%d): %s\n", event.event_number, DT_EventToSTr(event.event_number)); @@ -722,7 +720,7 @@ int main(int argc, char **argv) if ((event.event_data.dto_completion_event_data. transfered_length != tx_buf_len) || event.event_data.dto_completion_event_data. - status != DAT_SUCCESS) { + status != DAT_DTO_SUCCESS) { fprintf(stderr, " ERROR: DTO REQ size %d, status %d\n", event.event_data.dto_completion_event_data. transfered_length, @@ -827,7 +825,7 @@ bail: return (0); } -DAT_RETURN process_cr() +static DAT_RETURN process_cr() { DAT_RETURN ret; DAT_EVENT event; @@ -850,7 +848,8 @@ DAT_RETURN process_cr() if (event.event_number != DAT_CONNECTION_REQUEST_EVENT && (ud_test && event.event_number != - DAT_IB_UD_CONNECTION_REQUEST_EVENT)) { + (DAT_EVENT_NUMBER) + DAT_IB_UD_CONNECTION_REQUEST_EVENT)) { fprintf(stderr, " Error unexpected cr event : %s\n", DT_EventToSTr(event.event_number)); return (DAT_ABORT); @@ -892,7 +891,7 @@ DAT_RETURN process_cr() return DAT_SUCCESS; } -DAT_RETURN process_conn() +static DAT_RETURN process_conn() { DAT_RETURN ret; DAT_EVENT event; @@ -968,7 +967,7 @@ DAT_RETURN process_conn() return DAT_SUCCESS; } -DAT_RETURN conn_server() +static DAT_RETURN conn_server() { DAT_RETURN ret; @@ -985,7 +984,7 @@ DAT_RETURN conn_server() return DAT_SUCCESS; } -DAT_RETURN conn_client() +static DAT_RETURN conn_client() { DAT_IA_ADDRESS_PTR raddr = (DAT_IA_ADDRESS_PTR)&remote; DAT_RETURN ret; @@ -1046,7 +1045,7 @@ no_resolution: } /* validate disconnected EP's and free them */ -DAT_RETURN disconnect_eps(void) +static DAT_RETURN disconnect_eps(void) { DAT_RETURN ret; DAT_EVENT event, async_event; @@ -1170,7 +1169,7 @@ DAT_RETURN disconnect_eps(void) /* * Create CR, CONN, and DTO events */ -DAT_RETURN create_events(void) +static DAT_RETURN create_events(void) { DAT_RETURN ret; DAT_EVD_PARAM param; @@ -1298,7 +1297,7 @@ DAT_RETURN create_events(void) /* * Destroy CR, CONN, CNO, and DTO events */ -DAT_RETURN destroy_events(void) +static DAT_RETURN destroy_events(void) { DAT_RETURN ret; @@ -1365,7 +1364,7 @@ DAT_RETURN destroy_events(void) * Map DAT_RETURN values to readable strings, * but don't assume the values are zero-based or contiguous. */ -char errmsg[512] = { 0 }; +static char errmsg[512] = { 0 }; const char *DT_RetToString(DAT_RETURN ret_value) { const char *major_msg, *minor_msg; @@ -1420,7 +1419,7 @@ const char *DT_EventToSTr(DAT_EVENT_NUMBER event_code) return ("Invalid_DAT_EVENT_NUMBER"); } -void flush_evds(void) +static void flush_evds(void) { DAT_EVENT event; @@ -1455,7 +1454,7 @@ static void print_ia_address(struct sockaddr *sa) } /* Register RDMA Receive buffer */ -DAT_RETURN register_rdma_memory(void) +static DAT_RETURN register_rdma_memory(void) { DAT_RETURN ret; DAT_REGION_DESCRIPTION region; @@ -1505,7 +1504,7 @@ DAT_RETURN register_rdma_memory(void) return DAT_SUCCESS; } -void unregister_rdma_memory() +static void unregister_rdma_memory() { DAT_RETURN ret; @@ -1538,7 +1537,7 @@ void unregister_rdma_memory() } } -DAT_RETURN send_msg(char *buff, char msg_head, DAT_UINT32 ep_num, +static DAT_RETURN send_msg(char *buff, char msg_head, DAT_UINT32 ep_num, DAT_UINT32 msg_num) { DAT_DTO_COOKIE cookie; @@ -1586,7 +1585,7 @@ DAT_RETURN send_msg(char *buff, char msg_head, DAT_UINT32 ep_num, } } -void print_usage(void) +static void print_usage(void) { printf("\n DAPL SRQ USAGE \n\n"); printf("s: server\n"); diff --git a/test/dtest/dtestx.c b/test/dtest/dtestx.c index a5693d8..085da6b 100755 --- a/test/dtest/dtestx.c +++ b/test/dtest/dtestx.c @@ -69,7 +69,7 @@ #include "dat2/udat.h" #include "dat2/dat_ib_extensions.h" -int disconnect_ep(void); +static int disconnect_ep(void); #define _OK(status, str) \ {\ @@ -146,41 +146,40 @@ int disconnect_ep(void); #define MAX_EP_COUNT 1000 #define MAX_AH_COUNT (MAX_EP_COUNT * 2) -DAT_VADDR *atomic_buf; -DAT_LMR_HANDLE lmr_atomic; -DAT_LMR_CONTEXT lmr_atomic_context; -DAT_RMR_CONTEXT rmr_atomic_context; -DAT_VLEN reg_atomic_size; -DAT_VADDR reg_atomic_addr; -DAT_LMR_HANDLE lmr[REG_MEM_COUNT * MAX_EP_COUNT]; -DAT_LMR_CONTEXT lmr_context[REG_MEM_COUNT * MAX_EP_COUNT]; -DAT_RMR_TRIPLET rmr[REG_MEM_COUNT * MAX_EP_COUNT]; -DAT_RMR_CONTEXT rmr_context[REG_MEM_COUNT * MAX_EP_COUNT]; -DAT_VLEN reg_size[REG_MEM_COUNT * MAX_EP_COUNT]; -DAT_VADDR reg_addr[REG_MEM_COUNT * MAX_EP_COUNT]; -DAT_RMR_TRIPLET *buf[REG_MEM_COUNT * MAX_EP_COUNT]; -DAT_EP_HANDLE ep[MAX_EP_COUNT]; -DAT_EVD_HANDLE async_evd = DAT_HANDLE_NULL; -DAT_IA_HANDLE ia = DAT_HANDLE_NULL; -DAT_PZ_HANDLE pz = DAT_HANDLE_NULL; -DAT_EVD_HANDLE cr_evd = DAT_HANDLE_NULL; -DAT_EVD_HANDLE con_evd = DAT_HANDLE_NULL; -DAT_EVD_HANDLE dto_evd = DAT_HANDLE_NULL; -DAT_PSP_HANDLE psp = DAT_HANDLE_NULL; -int server = 1; -int remote_host = 0; -int ud_test = 0; -int multi_eps = 0; -int buf_size = BUF_SIZE; -int msg_size = sizeof(DAT_RMR_TRIPLET); -char provider[64] = DAPL_PROVIDER; -char hostname[256] = { 0 }; +static DAT_VADDR *atomic_buf; +static DAT_LMR_HANDLE lmr_atomic; +static DAT_LMR_CONTEXT lmr_atomic_context; +static DAT_RMR_CONTEXT rmr_atomic_context; +static DAT_VLEN reg_atomic_size; +static DAT_VADDR reg_atomic_addr; +static DAT_LMR_HANDLE lmr[REG_MEM_COUNT * MAX_EP_COUNT]; +static DAT_LMR_CONTEXT lmr_context[REG_MEM_COUNT * MAX_EP_COUNT]; +static DAT_RMR_CONTEXT rmr_context[REG_MEM_COUNT * MAX_EP_COUNT]; +static DAT_VLEN reg_size[REG_MEM_COUNT * MAX_EP_COUNT]; +static DAT_VADDR reg_addr[REG_MEM_COUNT * MAX_EP_COUNT]; +static DAT_RMR_TRIPLET *buf[REG_MEM_COUNT * MAX_EP_COUNT]; +static DAT_EP_HANDLE ep[MAX_EP_COUNT]; +static DAT_EVD_HANDLE async_evd = DAT_HANDLE_NULL; +static DAT_IA_HANDLE ia = DAT_HANDLE_NULL; +static DAT_PZ_HANDLE pz = DAT_HANDLE_NULL; +static DAT_EVD_HANDLE cr_evd = DAT_HANDLE_NULL; +static DAT_EVD_HANDLE con_evd = DAT_HANDLE_NULL; +static DAT_EVD_HANDLE dto_evd = DAT_HANDLE_NULL; +static DAT_PSP_HANDLE psp = DAT_HANDLE_NULL; +static int server = 1; +static int remote_host = 0; +static int ud_test = 0; +static int multi_eps = 0; +static int buf_size = BUF_SIZE; +static int msg_size = sizeof(DAT_RMR_TRIPLET); +static char provider[64] = DAPL_PROVIDER; +static char hostname[256] = { 0 }; static DAT_IB_ADDR_HANDLE remote_ah[MAX_EP_COUNT][MAX_AH_COUNT]; -int eps = 1; -int verbose = 0; -int counters = 0; -int counters_ok = 0; -int query_only = 0; +static int eps = 1; +static int verbose = 0; +static int counters = 0; +static int counters_ok = 0; +static int query_only = 0; static int ucm = 0; static DAT_SOCK_ADDR6 remote; static DAT_IA_ATTR ia_attr; @@ -192,7 +191,7 @@ static DAT_PROVIDER_ATTR prov_attrs; #define CONN_MSG_SIZE 128 #define CONN_MSG_FMT "%04hx:%08x:%08x:%08x:%s" -void print_usage(void) +static void print_usage(void) { printf("\n dtestx usage \n\n"); printf("v: verbose\n"); @@ -240,7 +239,7 @@ static void print_ia_address(struct sockaddr *sa) } } -int conn_client_connect(const char *servername, int port) +static int conn_client_connect(const char *servername, int port) { struct addrinfo *res, *t; @@ -283,7 +282,7 @@ int conn_client_connect(const char *servername, int port) return sockfd; } -int conn_server_connect(int port) +static int conn_server_connect(int port) { struct addrinfo *res, *t; struct addrinfo hints = { @@ -499,7 +498,7 @@ static int send_server_params(struct sockaddr *ser_sa) return 0; } -void +static void send_msg(void *data, DAT_COUNT size, DAT_LMR_CONTEXT context, @@ -556,19 +555,20 @@ send_msg(void *data, _OK(status, "dat_evd_wait after dat_ep_post_send"); if (event.event_number != DAT_DTO_COMPLETION_EVENT && - ud_test && event.event_number != DAT_IB_DTO_EVENT) { + ud_test && event.event_number != + (DAT_EVENT_NUMBER) DAT_IB_DTO_EVENT) { printf("unexpected event waiting post_send " "completion - 0x%x\n", event.event_number); exit(1); } - _OK(dto_event->status, "event status for post_send"); + _OK((DAT_RETURN)dto_event->status, "event status for post_send"); } } } /* RC - Server only, UD - Server and Client, one per EP */ -void process_cr(int idx) +static void process_cr(int idx) { DAT_EVENT event; DAT_COUNT nmore; @@ -586,8 +586,9 @@ void process_cr(int idx) status = dat_evd_wait(cr_evd, SERVER_TIMEOUT, 1, &event, &nmore); _OK(status, "CR dat_evd_wait"); - if (event.event_number != DAT_CONNECTION_REQUEST_EVENT && - (ud_test && event.event_number != + if (event.event_number != + (DAT_EVENT_NUMBER) DAT_CONNECTION_REQUEST_EVENT && + (ud_test && event.event_number != (DAT_EVENT_NUMBER) DAT_IB_UD_CONNECTION_REQUEST_EVENT)) { printf("unexpected event,!conn req: 0x%x\n", event.event_number); @@ -619,7 +620,7 @@ void process_cr(int idx) } /* RC - Client and Server: 1, UD - Client: 1 per EP, Server: 2 per EP's */ -void process_conn(int idx) +static void process_conn(int idx) { DAT_EVENT event; DAT_COUNT nmore; @@ -647,7 +648,7 @@ void process_conn(int idx) exp_event = DAT_CONNECTION_EVENT_ESTABLISHED; /* Waiting on CR's or CONN_EST */ - if (event.event_number != exp_event) { + if (event.event_number != (DAT_EVENT_NUMBER) exp_event) { printf("unexpected event, !conn established: 0x%x\n", event.event_number); exit(1); @@ -714,7 +715,7 @@ void process_conn(int idx) } -int connect_ep(char *hostname, struct sockaddr *ser_sa) +static int connect_ep(char *hostname, struct sockaddr *ser_sa) { DAT_IA_ADDRESS_PTR remote_addr = (DAT_IA_ADDRESS_PTR)&remote; DAT_EP_ATTR ep_attr; @@ -764,6 +765,7 @@ int connect_ep(char *hostname, struct sockaddr *ser_sa) ep_attr.max_rdma_read_in = 4; ep_attr.max_rdma_read_out = 4; } + cookie.as_64 = 0; ep_attr.qos = 0; ep_attr.recv_completion_flags = 0; if (ud_test && !multi_eps) @@ -987,12 +989,13 @@ no_resolution: _OK(status, "dat_evd_wait for receive message"); if ((event.event_number != DAT_DTO_COMPLETION_EVENT) && - (ud_test && event.event_number != DAT_IB_DTO_EVENT)) { + (ud_test && event.event_number != + (DAT_EVENT_NUMBER) DAT_IB_DTO_EVENT)) { printf("unexpected event waiting for RMR context " "- 0x%x\n", event.event_number); exit(1); } - _OK(dto_event->status, "event status for post_recv"); + _OK((DAT_RETURN)dto_event->status, "event status for post_recv"); /* * multi_eps - receive multi messages on single EP @@ -1045,7 +1048,7 @@ no_resolution: return (0); } -int disconnect_ep(void) +static int disconnect_ep(void) { DAT_RETURN status; DAT_EVENT event; @@ -1162,7 +1165,7 @@ int disconnect_ep(void) return (0); } -int do_immediate() +static int do_immediate() { DAT_EVENT event; DAT_COUNT nmore; @@ -1210,7 +1213,7 @@ int do_immediate() */ status = dat_evd_wait(dto_evd, DTO_TIMEOUT, 1, &event, &nmore); _OK(status, "dat_evd_wait after dat_ib_post_rdma_write"); - if (event.event_number != DAT_IB_DTO_EVENT) { + if (event.event_number != (DAT_EVENT_NUMBER) DAT_IB_DTO_EVENT) { printf("unexpected event #0x%x waiting for WR-IMMED #0x%x\n", event.event_number, DAT_IB_DTO_EVENT); exit(1); @@ -1218,7 +1221,7 @@ int do_immediate() if (nmore) printf("%s() nmore %d\n", __FUNCTION__, nmore); - _OK(dto_event->status, "DTO event status"); + _OK((DAT_RETURN)dto_event->status, "DTO event status"); if (ext_event->type == DAT_IB_RDMA_WRITE_IMMED) { if ((dto_event->transfered_length != buf_size) || (dto_event->user_cookie.as_64 != 0x9999)) { @@ -1253,13 +1256,13 @@ int do_immediate() */ status = dat_evd_wait(dto_evd, DTO_TIMEOUT, 1, &event, &nmore); _OK(status, "dat_evd_wait after dat_ib_post_rdma_write"); - if (event.event_number != DAT_IB_DTO_EVENT) { + if (event.event_number != (DAT_EVENT_NUMBER) DAT_IB_DTO_EVENT) { printf("unexpected event # waiting for WR-IMMED - 0x%x\n", event.event_number); exit(1); } - _OK(dto_event->status, "event status"); + _OK((DAT_RETURN)dto_event->status, "event status"); if (ext_event->type == DAT_IB_RDMA_WRITE_IMMED) { if ((dto_event->transfered_length != buf_size) || (dto_event->user_cookie.as_64 != 0x9999)) { @@ -1311,7 +1314,7 @@ int do_immediate() return (0); } -int do_cmp_swap() +static int do_cmp_swap() { DAT_DTO_COOKIE cookie; DAT_RETURN status; @@ -1366,13 +1369,13 @@ int do_cmp_swap() _OK(status, "dat_ib_post_cmp_and_swap"); status = dat_evd_wait(dto_evd, DTO_TIMEOUT, 1, &event, &nmore); _OK(status, "dat_evd_wait for compare and swap"); - if (event.event_number != DAT_IB_DTO_EVENT) { + if (event.event_number != (DAT_EVENT_NUMBER) DAT_IB_DTO_EVENT) { printf("unexpected event after post_cmp_and_swap: 0x%x\n", event.event_number); exit(1); } - _OK(dto_event->status, "event status for CMP and SWAP"); + _OK((DAT_RETURN)dto_event->status, "event status for CMP and SWAP"); if (ext_event->type != DAT_IB_CMP_AND_SWAP) { printf("unexpected event data of cmp_swap: type=%d cookie=%d " "original " F64x "\n", @@ -1408,7 +1411,7 @@ int do_cmp_swap() return (0); } -int do_fetch_add() +static int do_fetch_add() { DAT_DTO_COOKIE cookie; DAT_RETURN status; @@ -1458,13 +1461,13 @@ int do_fetch_add() _OK(status, "dat_ib_post_fetch_and_add"); status = dat_evd_wait(dto_evd, DTO_TIMEOUT, 1, &event, &nmore); _OK(status, "dat_evd_wait for fetch and add"); - if (event.event_number != DAT_IB_DTO_EVENT) { + if (event.event_number != (DAT_EVENT_NUMBER) DAT_IB_DTO_EVENT) { printf("unexpected event after post_fetch_and_add: 0x%x\n", event.event_number); exit(1); } - _OK(dto_event->status, "event status for FETCH and ADD"); + _OK((DAT_RETURN)dto_event->status, "event status for FETCH and ADD"); if (ext_event->type != DAT_IB_FETCH_AND_ADD) { printf("unexpected event data of fetch and add : type=%d " "cookie=%d original%d\n", @@ -1501,13 +1504,13 @@ int do_fetch_add() status = dat_evd_wait(dto_evd, DTO_TIMEOUT, 1, &event, &nmore); _OK(status, "dat_evd_wait for second fetch and add"); - if (event.event_number != DAT_IB_DTO_EVENT) { + if (event.event_number != (DAT_EVENT_NUMBER) DAT_IB_DTO_EVENT) { printf("unexpected event after second post_fetch_and_add: " "0x%x\n", event.event_number); exit(1); } - _OK(dto_event->status, "event status for second FETCH and ADD"); + _OK((DAT_RETURN)dto_event->status, "event status for second FETCH and ADD"); if (ext_event->type != DAT_IB_FETCH_AND_ADD) { printf("unexpected event data of second fetch and add : " "type=%d cookie=%d original%p\n", -- 2.46.0