refresh (create temporary patch)

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

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..b142487
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,57 @@
+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 {