refresh

diff --git a/meta b/meta
index 2d785803f926bbbd8e59c1a0937b7d88d8b9a8a0..9bb4c69b64adfb9c2f4c2f03ea1f04e3ee2fdcdb 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: faf1b4768ec10c6c83661665152b139a017e1e52
-Head: ce63483aa16fb7d3e07d6398e6fcbd6840c7674b
+Previous: 9df1d45f66d786a7b2782a17ab9e467982e36e09
+Head: f5bae827622b3754f27b3df3066943efd7181c07
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
@@ -18,7 +18,6 @@ Applied:
   pre-socket: 90d45cd75ac12bc966bea68dc3ac38f63605442c
   rs-states: 4f1e1a0f9774bec1ce86499234e166ca461e0644
   rs-recv-hang: 20e84c7460057cf865a61451dae583feadf7d6a5
-  rstream-opt: 69ba686781d4b2e000c7dd47c8583c9890634b06
-  refresh-temp: ce63483aa16fb7d3e07d6398e6fcbd6840c7674b
+  rstream-opt: f5bae827622b3754f27b3df3066943efd7181c07
 Unapplied:
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index ae1a6ed..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,23 +0,0 @@
-Bottom: 35f06996bb17d5d8e54f3fc37c82713e479fd8c8
-Top:    5a85db9c7f7a5745fbf5b24189f0dcd3d7434c9b
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-27 17:00:28 -0700
-
-Refresh of rstream-opt
-
----
-
-diff --git a/examples/rstream.c b/examples/rstream.c
-index 90980b6..a96a5a4 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -365,6 +365,9 @@ static void set_options(int rs)
-               size = sizeof buffer_size;
-               rs_setsockopt(rs, SOL_SOCKET, SO_SNDBUF, (void *) &buffer_size, size);
-               rs_setsockopt(rs, SOL_SOCKET, SO_RCVBUF, (void *) &buffer_size, size);
-+      } else {
-+              if (optimization == opt_bandwidth) {
-+                      rs_setsockopt(rs, SOL_SOCKET, SO_SNDBUF, &val, sizeof val)
-       }
- 
-       val = 1;

diff --git a/patches/rstream-opt b/patches/rstream-opt
index c8c2489ccba0d76587919b18c730423d75afcf0d..4c7f8febdcc32d654f9695ea89abfc656a8d4173 100644 (file)
--- a/patches/rstream-opt
+++ b/patches/rstream-opt
@@ -1,5 +1,5 @@
 Bottom: 1f4b9e8b1201e5fac58e29366786f53b07faf3f1
-Top:    35f06996bb17d5d8e54f3fc37c82713e479fd8c8
+Top:    5a85db9c7f7a5745fbf5b24189f0dcd3d7434c9b
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-27 14:07:42 -0700
 
@@ -14,7 +14,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/examples/rstream.c b/examples/rstream.c
-index 757a0f6..90980b6 100644
+index 757a0f6..a96a5a4 100644
 --- a/examples/rstream.c
 +++ b/examples/rstream.c
 @@ -71,12 +71,20 @@ static struct test_size_param test_size[] = {
@@ -103,7 +103,17 @@ index 757a0f6..90980b6 100644
                        if (ret)
                                goto out;
                }
-@@ -364,13 +372,24 @@ static void set_options(int rs)
+@@ -357,6 +365,9 @@ static void set_options(int rs)
+               size = sizeof buffer_size;
+               rs_setsockopt(rs, SOL_SOCKET, SO_SNDBUF, (void *) &buffer_size, size);
+               rs_setsockopt(rs, SOL_SOCKET, SO_RCVBUF, (void *) &buffer_size, size);
++      } else {
++              if (optimization == opt_bandwidth) {
++                      rs_setsockopt(rs, SOL_SOCKET, SO_SNDBUF, &val, sizeof val)
+       }
+ 
+       val = 1;
+@@ -364,13 +375,24 @@ static void set_options(int rs)
  
        if (flags & MSG_DONTWAIT)
                rs_fcntl(rs, F_SETFL, O_NONBLOCK);
@@ -131,7 +141,7 @@ index 757a0f6..90980b6 100644
  
        memset(&hints, 0, sizeof hints);
        hints.ai_flags = RAI_PASSIVE;
-@@ -383,30 +402,41 @@ static int server_connect(void)
+@@ -383,30 +405,41 @@ static int server_connect(void)
        lrs = rs_socket(res->ai_family, res->ai_socktype, res->ai_protocol);
        if (lrs < 0) {
                perror("rsocket");
@@ -184,7 +194,7 @@ index 757a0f6..90980b6 100644
        do {
                if (use_async) {
                        fds.fd = lrs;
-@@ -415,28 +445,26 @@ static int server_connect(void)
+@@ -415,28 +448,26 @@ static int server_connect(void)
                        ret = do_poll(&fds);
                        if (ret) {
                                perror("rpoll");
@@ -219,7 +229,7 @@ index 757a0f6..90980b6 100644
        socklen_t len;
  
        ret = getaddrinfo(dst_addr, port, NULL, &res);
-@@ -448,6 +476,7 @@ static int client_connect(void)
+@@ -448,6 +479,7 @@ static int client_connect(void)
        rs = rs_socket(res->ai_family, res->ai_socktype, res->ai_protocol);
        if (rs < 0) {
                perror("rsocket");
@@ -227,7 +237,7 @@ index 757a0f6..90980b6 100644
                goto free;
        }
  
-@@ -457,40 +486,38 @@ static int client_connect(void)
+@@ -457,40 +489,38 @@ static int client_connect(void)
        ret = rs_connect(rs, res->ai_addr, res->ai_addrlen);
        if (ret && (errno != EINPROGRESS)) {
                perror("rconnect");
@@ -276,7 +286,7 @@ index 757a0f6..90980b6 100644
  
        buf = malloc(!custom ? test_size[TEST_CNT - 1].size : transfer_size);
        if (!buf) {
-@@ -498,29 +525,45 @@ static int run(void)
+@@ -498,29 +528,45 @@ static int run(void)
                return -1;
        }