refresh

diff --git a/meta b/meta
index 4daf4e712ad0e53ec13a2b32922b1b91a94f72b1..cf5353859ffcbc232b9f55f057ac5b7ebeee58ec 100644 (file)
--- a/meta
+++ b/meta
@@ -1,14 +1,13 @@
 Version: 1
-Previous: 6dc9af52a0993d50f15384dcdd86fe3f9b8fd317
-Head: 52d5cb74480f4a9bf0c624b265bb0336fa965f7b
+Previous: 4f4f74d9a95d23801c97fd3165269c923437a6f8
+Head: 992a8c5abcb0199fd6214fd31b6695573ccb5bf5
 Applied:
   rs-locking: ec6a8efe211b0dc98548443c2e0d67e2c355351f
   reuseaddr: 5ce7d9c48d082fd1959918e9134f4bdd85c402d9
   rstream-delay: 8f0437ec677c4752126de8667e093667dd681d56
   rstream-async-opt: 0ee1dfc9ad50f07fd3708ebb04cb92e0fb2f41d5
   rs-nodelay: 7601a5adca71f10ad1cb63292c769b7b9a35dd08
-  rs-async-nonblock: 4756e96b146fc78a016b82a07f42a5b375a29eaf
-  refresh-temp: 52d5cb74480f4a9bf0c624b265bb0336fa965f7b
+  rs-async-nonblock: 992a8c5abcb0199fd6214fd31b6695573ccb5bf5
 Unapplied:
   comp_locks: b89aab130b4619806557e11e6b9c10964f00743f
   preload: 5dfe7abc07064485c5100e04e5412279244c2bc3

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 1680646..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,24 +0,0 @@
-Bottom: e458b46af068c102885a173b1e9d7a083a3f1511
-Top:    8f6ed845f1d4f512d6113d3b4ff5776c7e330fc4
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-16 15:49:24 -0700
-
-Refresh of rs-async-nonblock
-
----
-
-diff --git a/examples/rstream.c b/examples/rstream.c
-index 5532905..2b25ef5 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -335,8 +335,8 @@ static void set_options(int rs)
-                       break;
-       }
- 
--      rs_setsockopt(rs, IPPROTO_TCP, TCP_NODELAY,
--                    (void *) &no_delay, sizeof(no_delay));
-+      val = 1;
-+      rs_setsockopt(rs, IPPROTO_TCP, TCP_NODELAY, (void *) &val, sizeof(val));
- 
-       if (flags & MSG_DONTWAIT) {
-               rs_fcntl(rs, F_SETFL, O_NONBLOCK);

diff --git a/patches/rs-async-nonblock b/patches/rs-async-nonblock
index 8c9c52bcecc66029aa1174244f5f906331d26667..9fa6d34204427b61dfc2f6c7792172f25d06b353 100644 (file)
--- a/patches/rs-async-nonblock
+++ b/patches/rs-async-nonblock
@@ -1,5 +1,5 @@
 Bottom: 456260422aff51feca00c1ee2db83c3d63b6e111
-Top:    e458b46af068c102885a173b1e9d7a083a3f1511
+Top:    8f6ed845f1d4f512d6113d3b4ff5776c7e330fc4
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-16 15:23:41 -0700
 
@@ -24,7 +24,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/examples/rstream.c b/examples/rstream.c
-index 8d5a22d..5532905 100644
+index 8d5a22d..2b25ef5 100644
 --- a/examples/rstream.c
 +++ b/examples/rstream.c
 @@ -57,6 +57,7 @@ static int use_rs = 1;
@@ -75,6 +75,17 @@ index 8d5a22d..5532905 100644
                                return ret;
                }
  
+@@ -323,8 +335,8 @@ static void set_options(int rs)
+                       break;
+       }
+ 
+-      rs_setsockopt(rs, IPPROTO_TCP, TCP_NODELAY,
+-                    (void *) &no_delay, sizeof(no_delay));
++      val = 1;
++      rs_setsockopt(rs, IPPROTO_TCP, TCP_NODELAY, (void *) &val, sizeof(val));
+ 
+       if (flags & MSG_DONTWAIT) {
+               rs_fcntl(rs, F_SETFL, O_NONBLOCK);
 @@ -377,8 +389,8 @@ static int server_connect(void)
                        fds.fd = lrs;
                        fds.events = POLLIN;