rename

diff --git a/meta b/meta
index 16a595c6944d0c8974af37257829e04207a56e73..9e5be459b516271bbaa094543d231f2c04f648bd 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,8 @@
 Version: 1
-Previous: 43ecbb4f4ebd753a55ef0021ecc59c4a9512daa7
+Previous: 9536055280f08b5ce918c18b238d63593f2c92d5
 Head: 11385ea5d83fb57988a6e57591e346ce19df6ff2
 Applied:
-  waitall: 11385ea5d83fb57988a6e57591e346ce19df6ff2
+  waitall-buggy: 11385ea5d83fb57988a6e57591e346ce19df6ff2
 Unapplied:
   v6only-kernel: 56e2b4566930fa7b05debec8b247e8dfe9df7ffe
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/waitall b/patches/waitall
deleted file mode 100644 (file)
index c4f8b9f..0000000
--- a/patches/waitall
+++ /dev/null
@@ -1,126 +0,0 @@
-Bottom: 1242d5df80aef5749c32bdb6490d768bfdd28ffe
-Top:    b7dfa8c66e1dc86225c445ccf919d88ab1bb492c
-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 bdb756f..30727fa 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;
- }
- 
--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;
-@@ -1099,15 +1099,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;
-@@ -1133,43 +1133,47 @@ 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 -= rs_peek(rs, &buf, left);
-+                      continue;
-               }
- 
--              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;
-+                      }
-+                      memcpy(buf, &rs->rbuf[rs->rbuf_offset], rsize);
-+                      rs->rbuf_offset += rsize;
-+                      buf += rsize;
-               }
--              memcpy(buf, &rs->rbuf[rs->rbuf_offset], rsize);
--              rs->rbuf_offset += rsize;
--              buf += rsize;
--      }
--      rs->rbuf_bytes_avail += len - left;
--out:
-+              rs->rbuf_bytes_avail += len - left;
-+
-+      } while ((flags & MSG_WAITALL) && (rs->state & rs_connect_rd) && left);
-+
-       fastlock_release(&rs->rlock);
-       return ret ? ret : len - left;
- }

diff --git a/patches/waitall-buggy b/patches/waitall-buggy
new file mode 100644 (file)
index 0000000..c4f8b9f
--- /dev/null
+++ b/patches/waitall-buggy
@@ -0,0 +1,126 @@
+Bottom: 1242d5df80aef5749c32bdb6490d768bfdd28ffe
+Top:    b7dfa8c66e1dc86225c445ccf919d88ab1bb492c
+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 bdb756f..30727fa 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;
+ }
+ 
+-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;
+@@ -1099,15 +1099,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;
+@@ -1133,43 +1133,47 @@ 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 -= rs_peek(rs, &buf, left);
++                      continue;
+               }
+ 
+-              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;
++                      }
++                      memcpy(buf, &rs->rbuf[rs->rbuf_offset], rsize);
++                      rs->rbuf_offset += rsize;
++                      buf += rsize;
+               }
+-              memcpy(buf, &rs->rbuf[rs->rbuf_offset], rsize);
+-              rs->rbuf_offset += rsize;
+-              buf += rsize;
+-      }
+-      rs->rbuf_bytes_avail += len - left;
+-out:
++              rs->rbuf_bytes_avail += len - left;
++
++      } while ((flags & MSG_WAITALL) && (rs->state & rs_connect_rd) && left);
++
+       fastlock_release(&rs->rlock);
+       return ret ? ret : len - left;
+ }