refresh

diff --git a/meta b/meta
index 8b7402f063aa419b0fb3d267bac39acbffc06f28..7a25b22c45a959c76657872bda0faaff90c37e4f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: d9840888029f84ed8cb841836c0d2cc0907d7926
-Head: b849cdcc8f1f98b139e77a20d1f2567e406437d9
+Previous: e7b120d04c2b21c188dea0107c576ea256c5335a
+Head: 7601a5adca71f10ad1cb63292c769b7b9a35dd08
 Applied:
   rs-locking: ec6a8efe211b0dc98548443c2e0d67e2c355351f
   reuseaddr: 5ce7d9c48d082fd1959918e9134f4bdd85c402d9
   rstream-delay: 8f0437ec677c4752126de8667e093667dd681d56
   rstream-async-opt: 0ee1dfc9ad50f07fd3708ebb04cb92e0fb2f41d5
-  rs-nodelay: a9c270a56c982051ee4ca99a6c3972aace71d600
-  refresh-temp: b849cdcc8f1f98b139e77a20d1f2567e406437d9
+  rs-nodelay: 7601a5adca71f10ad1cb63292c769b7b9a35dd08
 Unapplied:
   rstream-spinpoll: a7f657e418c1ba35ba61550f67f6bf7bb1352575
   comp_locks: b89aab130b4619806557e11e6b9c10964f00743f

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index b142487..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,57 +0,0 @@
-Bottom: fb3f150e6146757e6bdb884182c4b19457bd6b6b
-Top:    456260422aff51feca00c1ee2db83c3d63b6e111
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-16 15:17:13 -0700
-
-Refresh of rs-nodelay
-
----
-
-diff --git a/examples/rstream.c b/examples/rstream.c
-index decb204..8d5a22d 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -57,7 +57,6 @@ static int use_rs = 1;
- static int use_async;
- static int verify;
- static int flags = MSG_DONTWAIT;
--static int no_delay = 1;
- static int custom;
- static int iterations = 1;
- static int transfer_size = 1000;
-@@ -324,10 +323,8 @@ static void set_options(int rs)
-                       break;
-       }
- 
--      if (no_delay) {
--              rs_setsockopt(rs, IPPROTO_TCP, TCP_NODELAY,
--                            (void *) &no_delay, sizeof(no_delay));
--      }
-+      rs_setsockopt(rs, IPPROTO_TCP, TCP_NODELAY,
-+                    (void *) &no_delay, sizeof(no_delay));
- 
-       if (flags & MSG_DONTWAIT) {
-               rs_fcntl(rs, F_SETFL, O_NONBLOCK);
-@@ -488,11 +485,9 @@ static int set_test_opt(char *optarg)
-                       break;
-               case 'b':
-                       flags &= ~MSG_DONTWAIT;
--                      no_delay = 0;
-                       break;
-               case 'n':
-                       flags |= MSG_DONTWAIT;
--                      no_delay = 1;
-                       break;
-               case 'v':
-                       verify = 1;
-@@ -507,10 +502,8 @@ static int set_test_opt(char *optarg)
-                       use_async = 1;
-               } else if (!strncasecmp("block", optarg, 5)) {
-                       flags &= ~MSG_DONTWAIT;
--                      no_delay = 0;
-               } else if (!strncasecmp("nonblock", optarg, 8)) {
-                       flags |= MSG_DONTWAIT;
--                      no_delay = 1;
-               } else if (!strncasecmp("verify", optarg, 6)) {
-                       verify = 1;
-               } else {

diff --git a/patches/rs-nodelay b/patches/rs-nodelay
index 817897d03f1005bb61f9c323ca166d8b37ae37c5..8b08d8715b152b980d25fac05072d1eeef1bd5a4 100644 (file)
--- a/patches/rs-nodelay
+++ b/patches/rs-nodelay
@@ -1,5 +1,5 @@
 Bottom: fb3f150e6146757e6bdb884182c4b19457bd6b6b
-Top:    fb3f150e6146757e6bdb884182c4b19457bd6b6b
+Top:    456260422aff51feca00c1ee2db83c3d63b6e111
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-16 15:16:40 -0700
 
@@ -16,4 +16,51 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/examples/rstream.c b/examples/rstream.c
+index decb204..8d5a22d 100644
+--- a/examples/rstream.c
++++ b/examples/rstream.c
+@@ -57,7 +57,6 @@ static int use_rs = 1;
+ static int use_async;
+ static int verify;
+ static int flags = MSG_DONTWAIT;
+-static int no_delay = 1;
+ static int custom;
+ static int iterations = 1;
+ static int transfer_size = 1000;
+@@ -324,10 +323,8 @@ static void set_options(int rs)
+                       break;
+       }
+ 
+-      if (no_delay) {
+-              rs_setsockopt(rs, IPPROTO_TCP, TCP_NODELAY,
+-                            (void *) &no_delay, sizeof(no_delay));
+-      }
++      rs_setsockopt(rs, IPPROTO_TCP, TCP_NODELAY,
++                    (void *) &no_delay, sizeof(no_delay));
+ 
+       if (flags & MSG_DONTWAIT) {
+               rs_fcntl(rs, F_SETFL, O_NONBLOCK);
+@@ -488,11 +485,9 @@ static int set_test_opt(char *optarg)
+                       break;
+               case 'b':
+                       flags &= ~MSG_DONTWAIT;
+-                      no_delay = 0;
+                       break;
+               case 'n':
+                       flags |= MSG_DONTWAIT;
+-                      no_delay = 1;
+                       break;
+               case 'v':
+                       verify = 1;
+@@ -507,10 +502,8 @@ static int set_test_opt(char *optarg)
+                       use_async = 1;
+               } else if (!strncasecmp("block", optarg, 5)) {
+                       flags &= ~MSG_DONTWAIT;
+-                      no_delay = 0;
+               } else if (!strncasecmp("nonblock", optarg, 8)) {
+                       flags |= MSG_DONTWAIT;
+-                      no_delay = 1;
+               } else if (!strncasecmp("verify", optarg, 6)) {
+                       verify = 1;
+               } else {