refresh

diff --git a/meta b/meta
index fe97a942d5f057182e9792de79a25a38764757dc..35da1dda261c13a4f2abc6b36ebd209e10d6c6c7 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: a13f092c53b45b1eac2a3d50b23e1bc5c4f008ae
-Head: 7916559d35751af16bfa9472d0010c4eaab36b44
+Previous: 561aea3fb2bfad6703b5c26024e234163f117c85
+Head: 24951f20aac0dec4aa0ca8fcf796ac5599a511f7
 Applied:
   dsocket: ad3be3a08de1c984c85f2f44d953894f30d279f6
-  udpong: b69ae5072bbf6779d7dbfd01392b8db6ee4f78a6
-  refresh-temp: 7916559d35751af16bfa9472d0010c4eaab36b44
+  udpong: 24951f20aac0dec4aa0ca8fcf796ac5599a511f7
 Unapplied:
   test-udp: f6c78ad2a26f452cf166aff1baa7b76160bd8bf7
   iom-dbg: 88434072d07f8edc58f454ac954d78bd39441eed

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index f261d8a..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,54 +0,0 @@
-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;

diff --git a/patches/udpong b/patches/udpong
index e5a8e417b9f5f33411f16aca30c272500196b0d6..35d81cfb9bea217f96d52bcaf3f1da941bd1aa2e 100644 (file)
--- a/patches/udpong
+++ b/patches/udpong
@@ -1,5 +1,5 @@
 Bottom: ae4df7b46b3d1c519383a31cb018c70f3e4e8201
-Top:    a4b0430790ade98d23b1a462b910e19286b747b0
+Top:    e9c95ad102b85dd4ad2970df253388b475935d48
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-12-05 15:58:03 -0800
 
@@ -10,6 +10,27 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
+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
@@ -140,10 +161,18 @@ index 8d9fea0..ef0ea7b 100644
 +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;
  
@@ -190,7 +219,7 @@ index dfb03e5..d73a43f 100644
  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));
  }
  
@@ -211,7 +240,7 @@ index dfb03e5..d73a43f 100644
  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);
  }
  
@@ -255,7 +284,7 @@ index dfb03e5..d73a43f 100644
  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) {
@@ -264,7 +293,7 @@ index dfb03e5..d73a43f 100644
                        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) {
@@ -273,7 +302,7 @@ index dfb03e5..d73a43f 100644
                        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) {
@@ -282,7 +311,7 @@ index dfb03e5..d73a43f 100644
                        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);
@@ -291,7 +320,7 @@ index dfb03e5..d73a43f 100644
        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;
  
@@ -300,7 +329,7 @@ index dfb03e5..d73a43f 100644
                        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;
@@ -310,10 +339,18 @@ index dfb03e5..d73a43f 100644
                        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)
  
@@ -360,7 +397,7 @@ index 069b7c9..ae3b8ad 100644
  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));
  }
  
@@ -381,7 +418,7 @@ index 069b7c9..ae3b8ad 100644
  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);
  }
  
@@ -425,7 +462,7 @@ index 069b7c9..ae3b8ad 100644
  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) {
@@ -434,7 +471,7 @@ index 069b7c9..ae3b8ad 100644
                        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) {
@@ -443,7 +480,7 @@ index 069b7c9..ae3b8ad 100644
                        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);
@@ -452,7 +489,7 @@ index 069b7c9..ae3b8ad 100644
        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;
  
@@ -461,7 +498,7 @@ index 069b7c9..ae3b8ad 100644
                        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;