rename

diff --git a/meta b/meta
index 1a7ae221e16419780b14027162926ff0dd41b2db..46fb5a3c29ac9dfb11e0599b2ac0a61a53558608 100644 (file)
--- a/meta
+++ b/meta
@@ -1,5 +1,5 @@
 Version: 1
-Previous: c5c0c4355c415d2dbf2188d438051dcf421b9d84
+Previous: dc61bf5a17053f923641127b73de9eb0b6463a5b
 Head: d7cda32bb4b602342b191888d2b9f861b2592ec9
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
@@ -9,7 +9,7 @@ Applied:
   fork-connect: a50a83fb4e574a2cc435bba1abf6f9df3d0cc7a6
   sendfile: 9073427ddddfa2f7c93d0ac4a6da9844cb7d2960
   fstat: a957d5786c30dfb1da9cf9345e4a639f6006fbda
-  waitall-buggy: d7cda32bb4b602342b191888d2b9f861b2592ec9
+  waitall: d7cda32bb4b602342b191888d2b9f861b2592ec9
 Unapplied:
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6

diff --git a/patches/waitall b/patches/waitall
new file mode 100644 (file)
index 0000000..b5885b6
--- /dev/null
+++ b/patches/waitall
@@ -0,0 +1,98 @@
+Bottom: 3f4ba48a611f719563dc773a1c33fbd391708df0
+Top:    0c97026b5f690fd1e2693e9f9c63549fc3e00f00
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-06-28 11:34:38 -0700
+
+rsockets: Add support for MSG_WAITALL rrecv() flag
+
+Signed-off-by: Sean Hefty <sean.hefty@intel.com>
+
+
+---
+
+diff --git a/src/rsocket.c b/src/rsocket.c
+index 996cb2f..4c4821b 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)
+               }
+       }
+       fastlock_acquire(&rs->rlock);
+-      if (!rs_have_rdata(rs)) {
+-              ret = rs_get_comp(rs, rs_nonblocking(rs, flags), rs_conn_have_rdata);
+-              if (ret)
+-                      goto out;
+-      }
+-
+-      ret = 0;
+-      if (flags & MSG_PEEK) {
+-              left = len - rs_peek(rs, buf, len);
+-              goto out;
+-      }
++      do {
++              if (!rs_have_rdata(rs)) {
++                      ret = rs_get_comp(rs, rs_nonblocking(rs, flags),
++                                        rs_conn_have_rdata);
++                      if (ret)
++                              break;
++              }
+ 
+-      for (; left && rs_have_rdata(rs); left -= rsize) {
+-              if (left < rs->rmsg[rs->rmsg_head].data) {
+-                      rsize = left;
+-                      rs->rmsg[rs->rmsg_head].data -= left;
+-              } else {
+-                      rs->rseq_no++;
+-                      rsize = rs->rmsg[rs->rmsg_head].data;
+-                      if (++rs->rmsg_head == rs->rq_size + 1)
+-                              rs->rmsg_head = 0;
++              ret = 0;
++              if (flags & MSG_PEEK) {
++                      left = len - rs_peek(rs, buf, left);
++                      break;
+               }
+ 
+-              end_size = rs->rbuf_size - rs->rbuf_offset;
+-              if (rsize > end_size) {
+-                      memcpy(buf, &rs->rbuf[rs->rbuf_offset], end_size);
+-                      rs->rbuf_offset = 0;
+-                      buf += end_size;
+-                      rsize -= end_size;
+-                      left -= end_size;
++              for (; left && rs_have_rdata(rs); left -= rsize) {
++                      if (left < rs->rmsg[rs->rmsg_head].data) {
++                              rsize = left;
++                              rs->rmsg[rs->rmsg_head].data -= left;
++                      } else {
++                              rs->rseq_no++;
++                              rsize = rs->rmsg[rs->rmsg_head].data;
++                              if (++rs->rmsg_head == rs->rq_size + 1)
++                                      rs->rmsg_head = 0;
++                      }
++
++                      end_size = rs->rbuf_size - rs->rbuf_offset;
++                      if (rsize > end_size) {
++                              memcpy(buf, &rs->rbuf[rs->rbuf_offset], end_size);
++                              rs->rbuf_offset = 0;
++                              buf += end_size;
++                              rsize -= end_size;
++                              left -= end_size;
++                              rs->rbuf_bytes_avail += end_size;
++                      }
++                      memcpy(buf, &rs->rbuf[rs->rbuf_offset], rsize);
++                      rs->rbuf_offset += rsize;
++                      buf += rsize;
++                      rs->rbuf_bytes_avail += rsize;
+               }
+-              memcpy(buf, &rs->rbuf[rs->rbuf_offset], rsize);
+-              rs->rbuf_offset += rsize;
+-              buf += rsize;
+-      }
+-      rs->rbuf_bytes_avail += len - left;
+-out:
++
++      } while (left && (flags & MSG_WAITALL) && (rs->state & rs_connect_rd));
++
+       fastlock_release(&rs->rlock);
+       return ret ? ret : len - left;
+ }

diff --git a/patches/waitall-buggy b/patches/waitall-buggy
deleted file mode 100644 (file)
index b5885b6..0000000
--- a/patches/waitall-buggy
+++ /dev/null
@@ -1,98 +0,0 @@
-Bottom: 3f4ba48a611f719563dc773a1c33fbd391708df0
-Top:    0c97026b5f690fd1e2693e9f9c63549fc3e00f00
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-06-28 11:34:38 -0700
-
-rsockets: Add support for MSG_WAITALL rrecv() flag
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 996cb2f..4c4821b 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)
-               }
-       }
-       fastlock_acquire(&rs->rlock);
--      if (!rs_have_rdata(rs)) {
--              ret = rs_get_comp(rs, rs_nonblocking(rs, flags), rs_conn_have_rdata);
--              if (ret)
--                      goto out;
--      }
--
--      ret = 0;
--      if (flags & MSG_PEEK) {
--              left = len - rs_peek(rs, buf, len);
--              goto out;
--      }
-+      do {
-+              if (!rs_have_rdata(rs)) {
-+                      ret = rs_get_comp(rs, rs_nonblocking(rs, flags),
-+                                        rs_conn_have_rdata);
-+                      if (ret)
-+                              break;
-+              }
- 
--      for (; left && rs_have_rdata(rs); left -= rsize) {
--              if (left < rs->rmsg[rs->rmsg_head].data) {
--                      rsize = left;
--                      rs->rmsg[rs->rmsg_head].data -= left;
--              } else {
--                      rs->rseq_no++;
--                      rsize = rs->rmsg[rs->rmsg_head].data;
--                      if (++rs->rmsg_head == rs->rq_size + 1)
--                              rs->rmsg_head = 0;
-+              ret = 0;
-+              if (flags & MSG_PEEK) {
-+                      left = len - rs_peek(rs, buf, left);
-+                      break;
-               }
- 
--              end_size = rs->rbuf_size - rs->rbuf_offset;
--              if (rsize > end_size) {
--                      memcpy(buf, &rs->rbuf[rs->rbuf_offset], end_size);
--                      rs->rbuf_offset = 0;
--                      buf += end_size;
--                      rsize -= end_size;
--                      left -= end_size;
-+              for (; left && rs_have_rdata(rs); left -= rsize) {
-+                      if (left < rs->rmsg[rs->rmsg_head].data) {
-+                              rsize = left;
-+                              rs->rmsg[rs->rmsg_head].data -= left;
-+                      } else {
-+                              rs->rseq_no++;
-+                              rsize = rs->rmsg[rs->rmsg_head].data;
-+                              if (++rs->rmsg_head == rs->rq_size + 1)
-+                                      rs->rmsg_head = 0;
-+                      }
-+
-+                      end_size = rs->rbuf_size - rs->rbuf_offset;
-+                      if (rsize > end_size) {
-+                              memcpy(buf, &rs->rbuf[rs->rbuf_offset], end_size);
-+                              rs->rbuf_offset = 0;
-+                              buf += end_size;
-+                              rsize -= end_size;
-+                              left -= end_size;
-+                              rs->rbuf_bytes_avail += end_size;
-+                      }
-+                      memcpy(buf, &rs->rbuf[rs->rbuf_offset], rsize);
-+                      rs->rbuf_offset += rsize;
-+                      buf += rsize;
-+                      rs->rbuf_bytes_avail += rsize;
-               }
--              memcpy(buf, &rs->rbuf[rs->rbuf_offset], rsize);
--              rs->rbuf_offset += rsize;
--              buf += rsize;
--      }
--      rs->rbuf_bytes_avail += len - left;
--out:
-+
-+      } while (left && (flags & MSG_WAITALL) && (rs->state & rs_connect_rd));
-+
-       fastlock_release(&rs->rlock);
-       return ret ? ret : len - left;
- }