refresh

diff --git a/meta b/meta
index ee1daa8f59ac12a044856703f30c78b537226e94..546a3c6e721ea2a370cec124a44ee62710fdafdb 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 945431d1135f08d4c8f1db26743ee28c36587cdf
-Head: f110faafefe66173898dba53b27290da33179735
+Previous: 0afa1e8f692c2cbe246d3e39dd58a06a396a27f8
+Head: ecf6d20467feb7aec39bcf77bfc8795186290eb1
 Applied:
   dsocket: 096a4c37a98b2c1bc46e0661ef8604f7a3a7ddc9
-  udpong: fc1d387204805f609e8f81a9827a43fde914b071
-  refresh-temp: f110faafefe66173898dba53b27290da33179735
+  udpong: ecf6d20467feb7aec39bcf77bfc8795186290eb1
 Unapplied:
   test-udp: f6c78ad2a26f452cf166aff1baa7b76160bd8bf7
   iom-dbg: 88434072d07f8edc58f454ac954d78bd39441eed

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 54aede6..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,60 +0,0 @@
-Bottom: e2b2c3d392d8eb2326d60d38ea68d53984cc2942
-Top:    2ba0685c99aaab7819bb95717eb462a7d2f14053
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-12-19 10:16:22 -0800
-
-Refresh of udpong
-
----
-
-diff --git a/examples/common.h b/examples/common.h
-index eaffb57..7cf16d2 100644
---- a/examples/common.h
-+++ b/examples/common.h
-@@ -76,6 +76,12 @@ union socket_addr {
-       struct sockaddr_in6     sin6;
- };
- 
-+enum rs_optimization {
-+      opt_mixed,
-+      opt_latency,
-+      opt_bandwidth
-+};
-+
- int get_rdma_addr(char *src, char *dst, char *port,
-                 struct rdma_addrinfo *hints, struct rdma_addrinfo **rai);
- 
-diff --git a/examples/riostream.c b/examples/riostream.c
-index 718b20d..a1d3671 100644
---- a/examples/riostream.c
-+++ b/examples/riostream.c
-@@ -73,12 +73,6 @@ static struct test_size_param test_size[] = {
- };
- #define TEST_CNT (sizeof test_size / sizeof test_size[0])
- 
--enum rs_optimization {
--      opt_mixed,
--      opt_latency,
--      opt_bandwidth
--};
--
- static int rs, lrs;
- static int use_async;
- static int verify;
-diff --git a/examples/rstream.c b/examples/rstream.c
-index 617710e..a408b9e 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -73,12 +73,6 @@ static struct test_size_param test_size[] = {
- };
- #define TEST_CNT (sizeof test_size / sizeof test_size[0])
- 
--enum rs_optimization {
--      opt_mixed,
--      opt_latency,
--      opt_bandwidth
--};
--
- static int rs, lrs;
- static int use_async;
- static int verify;

diff --git a/patches/udpong b/patches/udpong
index 64e883993fd47d379fa35ad18c194cdb84d0102e..701849690f8f2f086d7c09228742c135bcb2d7b4 100644 (file)
--- a/patches/udpong
+++ b/patches/udpong
@@ -1,5 +1,5 @@
 Bottom: a51fe46dbaa58743e3254a4ef2288b4490ff5d13
-Top:    e2b2c3d392d8eb2326d60d38ea68d53984cc2942
+Top:    2ba0685c99aaab7819bb95717eb462a7d2f14053
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-12-05 15:58:03 -0800
 
@@ -153,7 +153,7 @@ index 3eeb1e9..939f50c 100644
 +      return ret == 1 ? 0 : ret;
 +}
 diff --git a/examples/common.h b/examples/common.h
-index 8d9fea0..eaffb57 100644
+index 8d9fea0..7cf16d2 100644
 --- a/examples/common.h
 +++ b/examples/common.h
 @@ -1,5 +1,5 @@
@@ -174,7 +174,7 @@ index 8d9fea0..eaffb57 100644
  
  #if __BYTE_ORDER == __BIG_ENDIAN
  static inline uint64_t cpu_to_be64(uint64_t x) { return x; }
-@@ -46,5 +48,40 @@ static inline uint64_t cpu_to_be64(uint64_t x) { return bswap_64(x); }
+@@ -46,5 +48,46 @@ static inline uint64_t cpu_to_be64(uint64_t x) { return bswap_64(x); }
  static inline uint32_t cpu_to_be32(uint32_t x) { return bswap_32(x); }
  #endif
  
@@ -205,6 +205,12 @@ index 8d9fea0..eaffb57 100644
 +      struct sockaddr_in      sin;
 +      struct sockaddr_in6     sin6;
 +};
++
++enum rs_optimization {
++      opt_mixed,
++      opt_latency,
++      opt_bandwidth
++};
 +
  int get_rdma_addr(char *src, char *dst, char *port,
                  struct rdma_addrinfo *hints, struct rdma_addrinfo **rai);
@@ -216,7 +222,7 @@ index 8d9fea0..eaffb57 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..718b20d 100644
+index dfb03e5..a1d3671 100644
 --- a/examples/riostream.c
 +++ b/examples/riostream.c
 @@ -45,6 +45,7 @@
@@ -227,7 +233,20 @@ index dfb03e5..718b20d 100644
  
  struct test_size_param {
        int size;
-@@ -98,46 +99,6 @@ static struct timeval start, end;
+@@ -72,12 +73,6 @@ static struct test_size_param test_size[] = {
+ };
+ #define TEST_CNT (sizeof test_size / sizeof test_size[0])
+ 
+-enum rs_optimization {
+-      opt_mixed,
+-      opt_latency,
+-      opt_bandwidth
+-};
+-
+ static int rs, lrs;
+ static int use_async;
+ static int verify;
+@@ -98,46 +93,6 @@ static struct timeval start, end;
  static void *buf;
  static volatile uint8_t *poll_byte;
  
@@ -274,7 +293,7 @@ index dfb03e5..718b20d 100644
  static void show_perf(void)
  {
        char str[32];
-@@ -162,20 +123,6 @@ static void show_perf(void)
+@@ -162,20 +117,6 @@ static void show_perf(void)
                (usec / iterations) / (transfer_count * 2));
  }
  
@@ -295,7 +314,7 @@ index dfb03e5..718b20d 100644
  static void init_latency_test(int size)
  {
        char sstr[5];
-@@ -198,43 +145,6 @@ static void init_bandwidth_test(int size)
+@@ -198,43 +139,6 @@ static void init_bandwidth_test(int size)
        transfer_count = size_to_count(transfer_size);
  }
  
@@ -339,7 +358,7 @@ index dfb03e5..718b20d 100644
  static int send_msg(int size)
  {
        struct pollfd fds;
-@@ -250,7 +160,7 @@ static int send_msg(int size)
+@@ -250,7 +154,7 @@ static int send_msg(int size)
  
        for (offset = 0; offset < size; ) {
                if (use_async) {
@@ -348,7 +367,7 @@ index dfb03e5..718b20d 100644
                        if (ret)
                                return ret;
                }
-@@ -282,7 +192,7 @@ static int send_xfer(int size)
+@@ -282,7 +186,7 @@ static int send_xfer(int size)
  
        for (offset = 0; offset < size; ) {
                if (use_async) {
@@ -357,7 +376,7 @@ index dfb03e5..718b20d 100644
                        if (ret)
                                return ret;
                }
-@@ -311,7 +221,7 @@ static int recv_msg(int size)
+@@ -311,7 +215,7 @@ static int recv_msg(int size)
  
        for (offset = 0; offset < size; ) {
                if (use_async) {
@@ -366,7 +385,7 @@ index dfb03e5..718b20d 100644
                        if (ret)
                                return ret;
                }
-@@ -455,7 +365,7 @@ static int server_listen(void)
+@@ -455,7 +359,7 @@ static int server_listen(void)
        int val, ret;
  
        memset(&hints, 0, sizeof hints);
@@ -375,7 +394,7 @@ index dfb03e5..718b20d 100644
        ret = getaddrinfo(src_addr, port, &hints, &res);
        if (ret) {
                perror("getaddrinfo");
-@@ -505,7 +415,7 @@ static int server_connect(void)
+@@ -505,7 +409,7 @@ static int server_connect(void)
                        fds.fd = lrs;
                        fds.events = POLLIN;
  
@@ -384,7 +403,7 @@ index dfb03e5..718b20d 100644
                        if (ret) {
                                perror("rpoll");
                                return ret;
-@@ -555,7 +465,7 @@ static int client_connect(void)
+@@ -555,7 +459,7 @@ static int client_connect(void)
        if (ret && (errno == EINPROGRESS)) {
                fds.fd = rs;
                fds.events = POLLOUT;
@@ -394,7 +413,7 @@ index dfb03e5..718b20d 100644
                        goto close;
  
 diff --git a/examples/rstream.c b/examples/rstream.c
-index 069b7c9..617710e 100644
+index 069b7c9..a408b9e 100644
 --- a/examples/rstream.c
 +++ b/examples/rstream.c
 @@ -45,6 +45,7 @@
@@ -405,15 +424,22 @@ index 069b7c9..617710e 100644
  
  struct test_size_param {
        int size;
-@@ -79,7 +80,6 @@ enum rs_optimization {
+@@ -72,14 +73,7 @@ static struct test_size_param test_size[] = {
  };
+ #define TEST_CNT (sizeof test_size / sizeof test_size[0])
  
+-enum rs_optimization {
+-      opt_mixed,
+-      opt_latency,
+-      opt_bandwidth
+-};
+-
  static int rs, lrs;
 -static int use_rs = 1;
  static int use_async;
  static int verify;
  static int flags = MSG_DONTWAIT;
-@@ -100,62 +100,6 @@ static char *src_addr;
+@@ -100,62 +94,6 @@ static char *src_addr;
  static struct timeval start, end;
  static void *buf;
  
@@ -476,7 +502,7 @@ index 069b7c9..617710e 100644
  static void show_perf(void)
  {
        char str[32];
-@@ -180,20 +124,6 @@ static void show_perf(void)
+@@ -180,20 +118,6 @@ static void show_perf(void)
                (usec / iterations) / (transfer_count * 2));
  }
  
@@ -497,7 +523,7 @@ index 069b7c9..617710e 100644
  static void init_latency_test(int size)
  {
        char sstr[5];
-@@ -216,43 +146,6 @@ static void init_bandwidth_test(int size)
+@@ -216,43 +140,6 @@ static void init_bandwidth_test(int size)
        transfer_count = size_to_count(transfer_size);
  }
  
@@ -541,7 +567,7 @@ index 069b7c9..617710e 100644
  static int send_xfer(int size)
  {
        struct pollfd fds;
-@@ -268,7 +161,7 @@ static int send_xfer(int size)
+@@ -268,7 +155,7 @@ static int send_xfer(int size)
  
        for (offset = 0; offset < size; ) {
                if (use_async) {
@@ -550,7 +576,7 @@ index 069b7c9..617710e 100644
                        if (ret)
                                return ret;
                }
-@@ -297,7 +190,7 @@ static int recv_xfer(int size)
+@@ -297,7 +184,7 @@ static int recv_xfer(int size)
  
        for (offset = 0; offset < size; ) {
                if (use_async) {
@@ -559,7 +585,7 @@ index 069b7c9..617710e 100644
                        if (ret)
                                return ret;
                }
-@@ -402,7 +295,7 @@ static int server_listen(void)
+@@ -402,7 +289,7 @@ static int server_listen(void)
        int val, ret;
  
        memset(&hints, 0, sizeof hints);
@@ -568,7 +594,7 @@ index 069b7c9..617710e 100644
        ret = getaddrinfo(src_addr, port, &hints, &res);
        if (ret) {
                perror("getaddrinfo");
-@@ -452,7 +345,7 @@ static int server_connect(void)
+@@ -452,7 +339,7 @@ static int server_connect(void)
                        fds.fd = lrs;
                        fds.events = POLLIN;
  
@@ -577,7 +603,7 @@ index 069b7c9..617710e 100644
                        if (ret) {
                                perror("rpoll");
                                return ret;
-@@ -505,7 +398,7 @@ static int client_connect(void)
+@@ -505,7 +392,7 @@ static int client_connect(void)
        if (ret && (errno == EINPROGRESS)) {
                fds.fd = rs;
                fds.events = POLLOUT;