refresh (create temporary patch)

diff --git a/meta b/meta
index ca4142574fb6d87a626d2a340291cc3f8a4ed061..6d7d0d3245f845b4ce10a36c2a438b41223987e3 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 3cc33fc4c575b9e75c074bca903eb4076fe5a322
-Head: 11385ea5d83fb57988a6e57591e346ce19df6ff2
+Previous: ace390fa40015baa1ff09452d0dc6a30ab277863
+Head: 7bd0398a7af8c4c1f46e8c2243be329f548a8c3b
 Applied:
   waitall-buggy: 11385ea5d83fb57988a6e57591e346ce19df6ff2
+  refresh-temp: 7bd0398a7af8c4c1f46e8c2243be329f548a8c3b
 Unapplied:
   v6only-kernel: 56e2b4566930fa7b05debec8b247e8dfe9df7ffe
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..70df095
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,29 @@
+Bottom: b7dfa8c66e1dc86225c445ccf919d88ab1bb492c
+Top:    cc155d40ac28117d20959cbd97dbc2bbb3c4ffe6
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-06-28 12:40:22 -0700
+
+Refresh of waitall-buggy
+
+---
+
+diff --git a/src/rsocket.c b/src/rsocket.c
+index 30727fa..6605df9 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -1143,6 +1143,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);
+                       continue;
+               }
+@@ -1170,7 +1171,7 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
+                       rs->rbuf_offset += rsize;
+                       buf += rsize;
+               }
+-              rs->rbuf_bytes_avail += len - left;
++              rs->rbuf_bytes_avail += len - left; // <- fixme in waitall loop
+ 
+       } while ((flags & MSG_WAITALL) && (rs->state & rs_connect_rd) && left);