refresh

diff --git a/meta b/meta
index eb1847ed5bebdf7f832f8cf31390390f637dd98f..a56d654b6d57aa922fbc160e934ff171fcb725c7 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 6ace78cd21a6b168f0b1a0aaa5619657ec5f7c75
-Head: f5f686312918f8ef9291441f194b8a6bda27517a
+Previous: 757047e5c2e95828d80cf33bda3e45c3925d85a0
+Head: 6bb438e80dd6dee5ab2d84cd9c9f47f0f9b0c4a1
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
@@ -9,8 +9,7 @@ Applied:
   fork-connect: a50a83fb4e574a2cc435bba1abf6f9df3d0cc7a6
   sendfile: 9073427ddddfa2f7c93d0ac4a6da9844cb7d2960
   fstat: a957d5786c30dfb1da9cf9345e4a639f6006fbda
-  waitall-buggy: aa1793e1b70c856f450fb173bf32cfa47f0f7690
-  refresh-temp: f5f686312918f8ef9291441f194b8a6bda27517a
+  waitall-buggy: 6bb438e80dd6dee5ab2d84cd9c9f47f0f9b0c4a1
 Unapplied:
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index ed3e9cc..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,42 +0,0 @@
-Bottom: 22a257de4ff3a8bf47adda8be0b930b2fbcc4fea
-Top:    f0b4d530a7758f20a79b3abc8f27419ecb1fc961
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-16 13:30:36 -0700
-
-Refresh of waitall-buggy
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 07c1355..13fd0da 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -1077,7 +1077,7 @@ static int rs_conn_all_sends_done(struct rsocket *rs)
-              !(rs->state & rs_connected);
- }
- 
--static ssize_t rs_peek(struct rsocket *rs, void **buf, size_t len)
-+static ssize_t rs_peek(struct rsocket *rs, void *buf, size_t len)
- {
-       size_t left = len;
-       uint32_t end_size, rsize;
-@@ -1097,15 +1097,15 @@ static ssize_t rs_peek(struct rsocket *rs, void **buf, size_t len)
- 
-               end_size = rs->rbuf_size - rbuf_offset;
-               if (rsize > end_size) {
--                      memcpy(*buf, &rs->rbuf[rbuf_offset], end_size);
-+                      memcpy(buf, &rs->rbuf[rbuf_offset], end_size);
-                       rbuf_offset = 0;
--                      *buf += end_size;
-+                      buf += end_size;
-                       rsize -= end_size;
-                       left -= end_size;
-               }
--              memcpy(*buf, &rs->rbuf[rbuf_offset], rsize);
-+              memcpy(buf, &rs->rbuf[rbuf_offset], rsize);
-               rbuf_offset += rsize;
--              *buf += rsize;
-+              buf += rsize;
-       }
- 
-       return len - left;

diff --git a/patches/waitall-buggy b/patches/waitall-buggy
index b4b7e385be8664ef7200a6081077e4831c9319bf..12e2cf78823f75a5e7a40b702b59043ef2405a00 100644 (file)
--- a/patches/waitall-buggy
+++ b/patches/waitall-buggy
@@ -1,5 +1,5 @@
 Bottom: 3f4ba48a611f719563dc773a1c33fbd391708df0
-Top:    22a257de4ff3a8bf47adda8be0b930b2fbcc4fea
+Top:    f0b4d530a7758f20a79b3abc8f27419ecb1fc961
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-06-28 11:34:38 -0700
 
@@ -11,38 +11,9 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index 996cb2f..07c1355 100644
+index 996cb2f..13fd0da 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
-@@ -1077,7 +1077,7 @@ static int rs_conn_all_sends_done(struct rsocket *rs)
-              !(rs->state & rs_connected);
- }
- 
--static ssize_t rs_peek(struct rsocket *rs, void *buf, size_t len)
-+static ssize_t rs_peek(struct rsocket *rs, void **buf, size_t len)
- {
-       size_t left = len;
-       uint32_t end_size, rsize;
-@@ -1097,15 +1097,15 @@ static ssize_t rs_peek(struct rsocket *rs, void *buf, size_t len)
- 
-               end_size = rs->rbuf_size - rbuf_offset;
-               if (rsize > end_size) {
--                      memcpy(buf, &rs->rbuf[rbuf_offset], end_size);
-+                      memcpy(*buf, &rs->rbuf[rbuf_offset], end_size);
-                       rbuf_offset = 0;
--                      buf += end_size;
-+                      *buf += end_size;
-                       rsize -= end_size;
-                       left -= end_size;
-               }
--              memcpy(buf, &rs->rbuf[rbuf_offset], rsize);
-+              memcpy(*buf, &rs->rbuf[rbuf_offset], rsize);
-               rbuf_offset += rsize;
--              buf += rsize;
-+              *buf += rsize;
-       }
- 
-       return len - left;
 @@ -1131,43 +1131,48 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
                }
        }