From 45b1da6f3dabe199c4e2e6e3841a7b578bc56d3e Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Sat, 20 Jul 2013 21:21:05 -0700 Subject: [PATCH] Refresh of ex-afib --- examples/rstream.c | 56 ++++++++++++++++++++++++++++++++++++---------- examples/udaddy.c | 47 ++++++++++++++++++++++++++------------ 2 files changed, 77 insertions(+), 26 deletions(-) diff --git a/examples/rstream.c b/examples/rstream.c index a408b9ea..9c84a6b5 100644 --- a/examples/rstream.c +++ b/examples/rstream.c @@ -93,6 +93,8 @@ static char *dst_addr; static char *src_addr; static struct timeval start, end; static void *buf; +static struct rdma_addrinfo rai_hints; +static struct addrinfo ai_hints; static void show_perf(void) { @@ -285,18 +287,23 @@ static void set_options(int rs) static int server_listen(void) { - struct addrinfo hints, *res; + struct rdma_addrinfo *rai; + struct addrinfo *ai; int val, ret; - memset(&hints, 0, sizeof hints); - hints.ai_flags = AI_PASSIVE; - ret = getaddrinfo(src_addr, port, &hints, &res); + if (rai_hints.ai_flags) { + rai_hints.ai_flags |= RAI_PASSIVE; + ret = rdma_getaddrinfo(src_addr, port, &rai_hints, &rai); + } else { + ai_hints.ai_flags |= AI_PASSIVE; + ret = getaddrinfo(src_addr, port, &ai_hints, &ai); + } if (ret) { perror("getaddrinfo"); return ret; } - lrs = rs_socket(res->ai_family, res->ai_socktype, res->ai_protocol); + lrs = rs_socket(res->ai_family, SOCK_STREAM, 0); if (lrs < 0) { perror("rsocket"); ret = lrs; @@ -310,7 +317,9 @@ static int server_listen(void) goto close; } - ret = rs_bind(lrs, res->ai_addr, res->ai_addrlen); + ret = rai_hints.ai_flags ? + rs_bind(lrs, rai->ai_src_addr, rai->ai_src_len) : + rs_bind(lrs, ai->ai_addr, ai->ai_addrlen); if (ret) { perror("rbind"); goto close; @@ -324,7 +333,10 @@ close: if (ret) rs_close(lrs); free: - freeaddrinfo(res); + if (rai_hints.ai_flags) + rdma_freeaddrinfo(rai); + else + freeaddrinfo(ai); return ret; } @@ -362,18 +374,21 @@ static int server_connect(void) static int client_connect(void) { - struct addrinfo *res; + struct rdma_addrinfo *rai; + struct addrinfo *ai; struct pollfd fds; int ret, err; socklen_t len; - ret = getaddrinfo(dst_addr, port, NULL, &res); + ret = rai_hints.ai_flags ? + rdma_getaddrinfo(dst_addr, port, &rai_hints, *rai) : + getaddrinfo(dst_addr, port, &ai_hints, &ai); if (ret) { perror("getaddrinfo"); return ret; } - rs = rs_socket(res->ai_family, res->ai_socktype, res->ai_protocol); + rs = rs_socket(res->ai_family, SOCK_STREAM, 0); if (rs < 0) { perror("rsocket"); ret = rs; @@ -383,7 +398,9 @@ static int client_connect(void) set_options(rs); /* TODO: bind client to src_addr */ - ret = rs_connect(rs, res->ai_addr, res->ai_addrlen); + ret = rai_hints.ai_flags ? + rs_connect(rs, rai->ai_dst_addr, rai->ai_dst_len) : + rs_connect(rs, ai->ai_addr, ai->ai_addrlen); if (ret && (errno != EINPROGRESS)) { perror("rconnect"); goto close; @@ -411,7 +428,10 @@ close: if (ret) rs_close(rs); free: - freeaddrinfo(res); + if (rai_hints.ai_flags) + rdma_freeaddrinfo(rai); + else + freeaddrinfo(res); return ret; } @@ -534,6 +554,8 @@ int main(int argc, char **argv) { int op, ret; + ai_hints.ai_socktype = SOCK_STREAM; + rai_hints.ai_port_space = RDMA_PS_TCP; while ((op = getopt(argc, argv, "s:b:B:I:C:S:p:T:")) != -1) { switch (op) { case 's': @@ -542,6 +564,14 @@ int main(int argc, char **argv) case 'b': src_addr = optarg; break; + case 'f': + if (!strncasecmp("ip", optarg, 2)) { + ai_hints.ai_flags = AI_NUMERICHOST; + } else if (!strncasecmp("gid", optarg, 3)) { + rai_hints.ai_flags = RAI_NUMERICHOST | RAI_FAMILY; + rai_hints.ai_family = AF_IB; + } + break; case 'B': buffer_size = atoi(optarg); break; @@ -572,6 +602,8 @@ int main(int argc, char **argv) printf("usage: %s\n", argv[0]); printf("\t[-s server_address]\n"); printf("\t[-b bind_address]\n"); + printf("\t[-f address_format]\n"); + printf("\t name, ip, ipv6, or gid\n"); printf("\t[-B buffer_size]\n"); printf("\t[-I iterations]\n"); printf("\t[-C transfer_count]\n"); diff --git a/examples/udaddy.c b/examples/udaddy.c index 7360d603..e49c93b1 100644 --- a/examples/udaddy.c +++ b/examples/udaddy.c @@ -77,7 +77,7 @@ static uint8_t set_tos = 0; static uint8_t tos; static char *dst_addr; static char *src_addr; -static enum rdma_port_space port_space = RDMA_PS_UDP; +static struct rdma_addrinfo hints; static int create_message(struct cmatest_node *node) { @@ -505,19 +505,15 @@ static int connect_events(void) static int run_server(void) { struct rdma_cm_id *listen_id; - struct rdma_addrinfo hints; int i, ret; printf("udaddy: starting server\n"); - ret = rdma_create_id(test.channel, &listen_id, &test, port_space); + ret = rdma_create_id(test.channel, &listen_id, &test, hints.ai_port_space); if (ret) { perror("udaddy: listen request failed"); return ret; } - memset(&hints, 0, sizeof hints); - hints.ai_flags = RAI_PASSIVE; - hints.ai_port_space = port_space; ret = get_rdma_addr(src_addr, dst_addr, port, &hints, &test.rai); if (ret) { perror("cmatose: getrdmaaddr error"); @@ -563,13 +559,10 @@ out: static int run_client(void) { - struct rdma_addrinfo hints; int i, ret; printf("udaddy: starting client\n"); - memset(&hints, 0, sizeof hints); - hints.ai_port_space = port_space; ret = get_rdma_addr(src_addr, dst_addr, port, &hints, &test.rai); if (ret) { perror("udaddy: getaddrinfo error"); @@ -613,7 +606,8 @@ int main(int argc, char **argv) { int op, ret; - while ((op = getopt(argc, argv, "s:b:c:C:S:t:p:")) != -1) { + hints.ai_port_space = RDMA_PS_UDP; + while ((op = getopt(argc, argv, "s:b:c:C:S:t:p:P:f:")) != -1) { switch (op) { case 's': dst_addr = optarg; @@ -634,13 +628,36 @@ int main(int argc, char **argv) set_tos = 1; tos = (uint8_t) strtoul(optarg, NULL, 0); break; - case 'p': - port_space = strtol(optarg, NULL, 0); + case 'p': /* for backwards compatibility - use -P */ + hints.ai_port_space = strtol(optarg, NULL, 0); + break; + case 'f': + if (!strncasecmp("ip", optarg, 2)) { + hints.ai_flags = RAI_NUMERICHOST; + } else if (!strncasecmp("gid", optarg, 3)) { + hints.ai_flags = RAI_NUMERICHOST | RAI_FAMILY; + hints.ai_family = AF_IB; + } else if (strncasecmp("name", optarg, 4)) { + fprintf(stderr, "Warning: unknown address format\n"); + } + break; + case 'P': + if (!strncasecmp("ib", optarg, 2)) { + hints.ai_port_space = RDMA_PS_IB; + } else if (!stncasecmp("ipoib", optarg, 5)) { + hints.ai_port_space = RDMA_PS_IPOIB; + } else if (strncasecmp("udp", optarg, 3)) { + fprintf(stderr, "Warning: unknown port space format\n"); + } break; default: printf("usage: %s\n", argv[0]); printf("\t[-s server_address]\n"); printf("\t[-b bind_address]\n"); + printf("\t[-f address_format]\n"); + printf("\t name, ip, ipv6, or gid\n"); + printf("\t[-P port_space]\n"); + printf("\t udp, ipoib, or ib\n"); printf("\t[-c connections]\n"); printf("\t[-C message_count]\n"); printf("\t[-S message_size]\n"); @@ -662,10 +679,12 @@ int main(int argc, char **argv) if (alloc_nodes()) exit(1); - if (dst_addr) + if (dst_addr) { ret = run_client(); - else + } else { + hints.ai_flags |= RAI_PASSIVE; ret = run_server(); + } printf("test complete\n"); destroy_nodes(); -- 2.41.0