From 26ca11bdc7033415f05c0b83d50d5ed1b4f6028e Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Thu, 16 Aug 2012 14:26:42 -0700 Subject: [PATCH] refresh --- meta | 7 +++---- patches/refresh-temp | 23 ----------------------- patches/waitall-buggy | 9 ++++----- 3 files changed, 7 insertions(+), 32 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 073e3240..0c03e9d8 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: cdaf2d76a50c27ae85593291deee41c2722b4f2d -Head: e59f2da75c818b44fb907d948a93db244780c380 +Previous: 62d3ba97618203ad82b2a5515d08195e09a6445d +Head: 7e015ddb5914093ecb1e7f87938f7c55f5cefde1 Applied: real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2 dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824 @@ -9,8 +9,7 @@ Applied: fork-connect: a50a83fb4e574a2cc435bba1abf6f9df3d0cc7a6 sendfile: 9073427ddddfa2f7c93d0ac4a6da9844cb7d2960 fstat: a957d5786c30dfb1da9cf9345e4a639f6006fbda - waitall-buggy: e25feca85b5309386f87c67d9cc5a74610205d39 - refresh-temp: e59f2da75c818b44fb907d948a93db244780c380 + waitall-buggy: 7e015ddb5914093ecb1e7f87938f7c55f5cefde1 Unapplied: dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6 diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 5c37db6d..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,23 +0,0 @@ -Bottom: a382695e2987cbd0d5a442f0e357413683b8c1df -Top: dc40d7521b90802ab52de937f20882c5d9cf6403 -Author: Sean Hefty -Date: 2012-08-16 14:26:41 -0700 - -Refresh of waitall-buggy - ---- - -diff --git a/src/rsocket.c b/src/rsocket.c -index 2edd44e..a7692c5 100644 ---- a/src/rsocket.c -+++ b/src/rsocket.c -@@ -1133,8 +1133,7 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags) - fastlock_acquire(&rs->rlock); - do { - if (!rs_have_rdata(rs)) { -- ret = rs_get_comp(rs, rs_nonblocking(rs, flags), -- rs_conn_have_rdata); -+ ret = rs_get_comp(rs, rs_nonblocking(rs, flags), rs_conn_have_rdata); - if (ret) - break; - } diff --git a/patches/waitall-buggy b/patches/waitall-buggy index 48f22308..c17e3763 100644 --- a/patches/waitall-buggy +++ b/patches/waitall-buggy @@ -1,5 +1,5 @@ Bottom: 3f4ba48a611f719563dc773a1c33fbd391708df0 -Top: a382695e2987cbd0d5a442f0e357413683b8c1df +Top: dc40d7521b90802ab52de937f20882c5d9cf6403 Author: Sean Hefty Date: 2012-06-28 11:34:38 -0700 @@ -11,10 +11,10 @@ Signed-off-by: Sean Hefty --- diff --git a/src/rsocket.c b/src/rsocket.c -index 996cb2f..2edd44e 100644 +index 996cb2f..a7692c5 100644 --- a/src/rsocket.c +++ b/src/rsocket.c -@@ -1131,43 +1131,48 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags) +@@ -1131,43 +1131,47 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags) } } fastlock_acquire(&rs->rlock); @@ -31,8 +31,7 @@ index 996cb2f..2edd44e 100644 - } + do { + if (!rs_have_rdata(rs)) { -+ ret = rs_get_comp(rs, rs_nonblocking(rs, flags), -+ rs_conn_have_rdata); ++ ret = rs_get_comp(rs, rs_nonblocking(rs, flags), rs_conn_have_rdata); + if (ret) + break; + } -- 2.46.0