refresh

diff --git a/meta b/meta
index 9d2375e2241b9d77cdcfda1bf8a14164c880b185..3364a3ff45150e9072b7052ff2a8d7326030cba9 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 013667c34056942eb41cf4d6ff05812a36a88eb7
-Head: 1e75ba28ee20b822234d91f180b8aba35b83e5ab
+Previous: 212a44d17fb98fbf723069d4e1a7eaef7693f0bf
+Head: 00027ae94707991c0bcfeea2b3f56d8c32f53587
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
@@ -9,8 +9,7 @@ Applied:
   fork-connect: a50a83fb4e574a2cc435bba1abf6f9df3d0cc7a6
   sendfile: 9073427ddddfa2f7c93d0ac4a6da9844cb7d2960
   fstat: a957d5786c30dfb1da9cf9345e4a639f6006fbda
-  waitall-buggy: 5cbd0d0dc8394ffda74a1e55badc2e2fb37d27a1
-  refresh-temp: 1e75ba28ee20b822234d91f180b8aba35b83e5ab
+  waitall-buggy: 00027ae94707991c0bcfeea2b3f56d8c32f53587
 Unapplied:
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index bef3563..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 82b0aedfaff9c5dc6df2e8b45d95f760cc338281
-Top:    9ceee3ed5d3b8307cdf04d2f0cca8313992ef22e
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-16 14:25:17 -0700
-
-Refresh of waitall-buggy
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 8c9e847..e48c305 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -1141,8 +1141,7 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
- 
-               ret = 0;
-               if (flags & MSG_PEEK) {
--                      // fixme or will peek same data in waitall loop
--                      left -= rs_peek(rs, &buf, left);
-+                      left = len - rs_peek(rs, &buf, left);
-                       break;
-               }

diff --git a/patches/waitall-buggy b/patches/waitall-buggy
index 83a6f0bd73f5b42edc0d67ccb0b675f3580b898c..614bf244b2477bde5d52e90a1391a2be56e36066 100644 (file)
--- a/patches/waitall-buggy
+++ b/patches/waitall-buggy
@@ -1,5 +1,5 @@
 Bottom: 3f4ba48a611f719563dc773a1c33fbd391708df0
-Top:    82b0aedfaff9c5dc6df2e8b45d95f760cc338281
+Top:    9ceee3ed5d3b8307cdf04d2f0cca8313992ef22e
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-06-28 11:34:38 -0700
 
@@ -11,10 +11,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index 996cb2f..8c9e847 100644
+index 996cb2f..e48c305 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
-@@ -1131,43 +1131,49 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
+@@ -1131,43 +1131,48 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
                }
        }
        fastlock_acquire(&rs->rlock);
@@ -48,8 +48,7 @@ index 996cb2f..8c9e847 100644
 -                              rs->rmsg_head = 0;
 +              ret = 0;
 +              if (flags & MSG_PEEK) {
-+                      // fixme or will peek same data in waitall loop
-+                      left -= rs_peek(rs, &buf, left);
++                      left = len - rs_peek(rs, &buf, left);
 +                      break;
                }