+++ /dev/null
-Bottom: a4b0430790ade98d23b1a462b910e19286b747b0
-Top: e9c95ad102b85dd4ad2970df253388b475935d48
-Author: Sean Hefty <sean.hefty@intel.com>
-Date: 2012-12-06 23:25:52 -0800
-
-Refresh of udpong
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index d72016d..ac3a6b6 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -46,12 +46,14 @@ examples_rdma_xclient_SOURCES = examples/rdma_xclient.c
- examples_rdma_xclient_LDADD = $(top_builddir)/src/librdmacm.la
- examples_rdma_xserver_SOURCES = examples/rdma_xserver.c
- examples_rdma_xserver_LDADD = $(top_builddir)/src/librdmacm.la
--examples_rstream_SOURCES = examples/rstream.c
-+examples_rstream_SOURCES = examples/rstream.c examples/common.c
- examples_rstream_LDADD = $(top_builddir)/src/librdmacm.la
--examples_riostream_SOURCES = examples/riostream.c
-+examples_riostream_SOURCES = examples/riostream.c examples/common.c
- examples_riostream_LDADD = $(top_builddir)/src/librdmacm.la
- examples_rcopy_SOURCES = examples/rcopy.c
- examples_rcopy_LDADD = $(top_builddir)/src/librdmacm.la
-+examples_udpong_SOURCES = examples/udpong.c examples/common.c
-+examples_udpong_LDADD = $(top_builddir)/src/librdmacm.la
-
- librdmacmincludedir = $(includedir)/rdma
- infinibandincludedir = $(includedir)/infiniband
-diff --git a/examples/riostream.c b/examples/riostream.c
-index d73a43f..718b20d 100644
---- a/examples/riostream.c
-+++ b/examples/riostream.c
-@@ -45,6 +45,7 @@
-
- #include <rdma/rdma_cma.h>
- #include <rdma/rsocket.h>
-+#include "common.h"
-
- struct test_size_param {
- int size;
-diff --git a/examples/rstream.c b/examples/rstream.c
-index ae3b8ad..fa7491c 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -45,6 +45,7 @@
-
- #include <rdma/rdma_cma.h>
- #include <rdma/rsocket.h>
-+include "common.h"
-
- struct test_size_param {
- int size;
Bottom: ae4df7b46b3d1c519383a31cb018c70f3e4e8201
-Top: a4b0430790ade98d23b1a462b910e19286b747b0
+Top: e9c95ad102b85dd4ad2970df253388b475935d48
Author: Sean Hefty <sean.hefty@intel.com>
Date: 2012-12-05 15:58:03 -0800
---
+diff --git a/Makefile.am b/Makefile.am
+index d72016d..ac3a6b6 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -46,12 +46,14 @@ examples_rdma_xclient_SOURCES = examples/rdma_xclient.c
+ examples_rdma_xclient_LDADD = $(top_builddir)/src/librdmacm.la
+ examples_rdma_xserver_SOURCES = examples/rdma_xserver.c
+ examples_rdma_xserver_LDADD = $(top_builddir)/src/librdmacm.la
+-examples_rstream_SOURCES = examples/rstream.c
++examples_rstream_SOURCES = examples/rstream.c examples/common.c
+ examples_rstream_LDADD = $(top_builddir)/src/librdmacm.la
+-examples_riostream_SOURCES = examples/riostream.c
++examples_riostream_SOURCES = examples/riostream.c examples/common.c
+ examples_riostream_LDADD = $(top_builddir)/src/librdmacm.la
+ examples_rcopy_SOURCES = examples/rcopy.c
+ examples_rcopy_LDADD = $(top_builddir)/src/librdmacm.la
++examples_udpong_SOURCES = examples/udpong.c examples/common.c
++examples_udpong_LDADD = $(top_builddir)/src/librdmacm.la
+
+ librdmacmincludedir = $(includedir)/rdma
+ infinibandincludedir = $(includedir)/infiniband
diff --git a/examples/common.c b/examples/common.c
index 3eeb1e9..43bfb6b 100644
--- a/examples/common.c
+int verify_buf(void *buf, int size);
+int do_poll(struct pollfd *fds, int timeout);
diff --git a/examples/riostream.c b/examples/riostream.c
-index dfb03e5..d73a43f 100644
+index dfb03e5..718b20d 100644
--- a/examples/riostream.c
+++ b/examples/riostream.c
-@@ -98,46 +98,6 @@ static struct timeval start, end;
+@@ -45,6 +45,7 @@
+
+ #include <rdma/rdma_cma.h>
+ #include <rdma/rsocket.h>
++#include "common.h"
+
+ struct test_size_param {
+ int size;
+@@ -98,46 +99,6 @@ static struct timeval start, end;
static void *buf;
static volatile uint8_t *poll_byte;
static void show_perf(void)
{
char str[32];
-@@ -162,20 +122,6 @@ static void show_perf(void)
+@@ -162,20 +123,6 @@ static void show_perf(void)
(usec / iterations) / (transfer_count * 2));
}
static void init_latency_test(int size)
{
char sstr[5];
-@@ -198,43 +144,6 @@ static void init_bandwidth_test(int size)
+@@ -198,43 +145,6 @@ static void init_bandwidth_test(int size)
transfer_count = size_to_count(transfer_size);
}
static int send_msg(int size)
{
struct pollfd fds;
-@@ -250,7 +159,7 @@ static int send_msg(int size)
+@@ -250,7 +160,7 @@ static int send_msg(int size)
for (offset = 0; offset < size; ) {
if (use_async) {
if (ret)
return ret;
}
-@@ -282,7 +191,7 @@ static int send_xfer(int size)
+@@ -282,7 +192,7 @@ static int send_xfer(int size)
for (offset = 0; offset < size; ) {
if (use_async) {
if (ret)
return ret;
}
-@@ -311,7 +220,7 @@ static int recv_msg(int size)
+@@ -311,7 +221,7 @@ static int recv_msg(int size)
for (offset = 0; offset < size; ) {
if (use_async) {
if (ret)
return ret;
}
-@@ -455,7 +364,7 @@ static int server_listen(void)
+@@ -455,7 +365,7 @@ static int server_listen(void)
int val, ret;
memset(&hints, 0, sizeof hints);
ret = getaddrinfo(src_addr, port, &hints, &res);
if (ret) {
perror("getaddrinfo");
-@@ -505,7 +414,7 @@ static int server_connect(void)
+@@ -505,7 +415,7 @@ static int server_connect(void)
fds.fd = lrs;
fds.events = POLLIN;
if (ret) {
perror("rpoll");
return ret;
-@@ -555,7 +464,7 @@ static int client_connect(void)
+@@ -555,7 +465,7 @@ static int client_connect(void)
if (ret && (errno == EINPROGRESS)) {
fds.fd = rs;
fds.events = POLLOUT;
goto close;
diff --git a/examples/rstream.c b/examples/rstream.c
-index 069b7c9..ae3b8ad 100644
+index 069b7c9..fa7491c 100644
--- a/examples/rstream.c
+++ b/examples/rstream.c
-@@ -116,46 +116,6 @@ static void *buf;
+@@ -45,6 +45,7 @@
+
+ #include <rdma/rdma_cma.h>
+ #include <rdma/rsocket.h>
++include "common.h"
+
+ struct test_size_param {
+ int size;
+@@ -116,46 +117,6 @@ static void *buf;
#define rs_getsockopt(s,l,n,v,ol) \
use_rs ? rgetsockopt(s,l,n,v,ol) : getsockopt(s,l,n,v,ol)
static void show_perf(void)
{
char str[32];
-@@ -180,20 +140,6 @@ static void show_perf(void)
+@@ -180,20 +141,6 @@ static void show_perf(void)
(usec / iterations) / (transfer_count * 2));
}
static void init_latency_test(int size)
{
char sstr[5];
-@@ -216,43 +162,6 @@ static void init_bandwidth_test(int size)
+@@ -216,43 +163,6 @@ static void init_bandwidth_test(int size)
transfer_count = size_to_count(transfer_size);
}
static int send_xfer(int size)
{
struct pollfd fds;
-@@ -268,7 +177,7 @@ static int send_xfer(int size)
+@@ -268,7 +178,7 @@ static int send_xfer(int size)
for (offset = 0; offset < size; ) {
if (use_async) {
if (ret)
return ret;
}
-@@ -297,7 +206,7 @@ static int recv_xfer(int size)
+@@ -297,7 +207,7 @@ static int recv_xfer(int size)
for (offset = 0; offset < size; ) {
if (use_async) {
if (ret)
return ret;
}
-@@ -402,7 +311,7 @@ static int server_listen(void)
+@@ -402,7 +312,7 @@ static int server_listen(void)
int val, ret;
memset(&hints, 0, sizeof hints);
ret = getaddrinfo(src_addr, port, &hints, &res);
if (ret) {
perror("getaddrinfo");
-@@ -452,7 +361,7 @@ static int server_connect(void)
+@@ -452,7 +362,7 @@ static int server_connect(void)
fds.fd = lrs;
fds.events = POLLIN;
if (ret) {
perror("rpoll");
return ret;
-@@ -505,7 +414,7 @@ static int client_connect(void)
+@@ -505,7 +415,7 @@ static int client_connect(void)
if (ret && (errno == EINPROGRESS)) {
fds.fd = rs;
fds.events = POLLOUT;