From 4b97ed4ca521bf8b820b144f00cb5927a00209f0 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Thu, 16 Aug 2012 13:01:57 -0700 Subject: [PATCH] pop --- meta | 6 +++--- patches/waitall-buggy | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meta b/meta index 892c78fa..6bb64744 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: 43becf5160f3d6562bc5b68ef5c8f8166bd707c5 -Head: a957d5786c30dfb1da9cf9345e4a639f6006fbda +Previous: 4e1fbf1da1b919f715918d970d363189ea785347 +Head: aa1793e1b70c856f450fb173bf32cfa47f0f7690 Applied: real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2 dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824 @@ -9,9 +9,9 @@ Applied: fork-connect: a50a83fb4e574a2cc435bba1abf6f9df3d0cc7a6 sendfile: 9073427ddddfa2f7c93d0ac4a6da9844cb7d2960 fstat: a957d5786c30dfb1da9cf9345e4a639f6006fbda + waitall-buggy: aa1793e1b70c856f450fb173bf32cfa47f0f7690 Unapplied: dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6 - waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8 rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de Hidden: diff --git a/patches/waitall-buggy b/patches/waitall-buggy index 288cb566..b4b7e385 100644 --- a/patches/waitall-buggy +++ b/patches/waitall-buggy @@ -1,5 +1,5 @@ -Bottom: 1242d5df80aef5749c32bdb6490d768bfdd28ffe -Top: cc155d40ac28117d20959cbd97dbc2bbb3c4ffe6 +Bottom: 3f4ba48a611f719563dc773a1c33fbd391708df0 +Top: 22a257de4ff3a8bf47adda8be0b930b2fbcc4fea Author: Sean Hefty Date: 2012-06-28 11:34:38 -0700 @@ -11,11 +11,11 @@ Signed-off-by: Sean Hefty --- diff --git a/src/rsocket.c b/src/rsocket.c -index bdb756f..6605df9 100644 +index 996cb2f..07c1355 100644 --- a/src/rsocket.c +++ b/src/rsocket.c -@@ -1079,7 +1079,7 @@ static int rs_all_sends_done(struct rsocket *rs) - return (rs->sqe_avail + rs->ctrl_avail) == rs->sq_size; +@@ -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) @@ -23,7 +23,7 @@ index bdb756f..6605df9 100644 { size_t left = len; uint32_t end_size, rsize; -@@ -1099,15 +1099,15 @@ static ssize_t rs_peek(struct rsocket *rs, void *buf, size_t len) +@@ -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) { @@ -43,7 +43,7 @@ index bdb756f..6605df9 100644 } return len - left; -@@ -1133,43 +1133,48 @@ 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); -- 2.46.0