refresh

diff --git a/meta b/meta
index 4bd7647ec9b91717da2a215664b3ea1c2663799c..432b7e4b00df0ba1e7584def5d66cb61d1c480c8 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 54c88d78f651f97fff418ceaad0af388225155ec
-Head: 0f10d4b30a415b12753f94167f96cb0209badaa1
+Previous: 78495cfdd345e6bdd426d5b3b66b34a9c5f2b5bb
+Head: 85e4c4a0da0b501b60a1035d7a003ee20a749511
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
@@ -11,8 +11,7 @@ Applied:
   pre-qpsize: 1d27a538d708554284968f9bf71cbe59fe5caead
   rstream-bufsize: 76a7691690cd14c123b4a3125598134edd567e1f
   rs-def-qpsize: 6895cd6a4d77d7f0c212af73ff4741c5c251b9e6
-  rs-1sge: ec435867dbbf9ce443aeceba22da7898e5e9a1ba
-  refresh-temp: 0f10d4b30a415b12753f94167f96cb0209badaa1
+  rs-1sge: 85e4c4a0da0b501b60a1035d7a003ee20a749511
 Unapplied:
   rs-def-inline: 50d6a49950b5ffc77b971e60c80045c5d70bda2b
   acm-sock: 11767dd5ff9823ee43369fd19a9c624ac4397360

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 58b83e6..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,36 +0,0 @@
-Bottom: d6059001f0d2f622720ad871c89e3c1ef4410125
-Top:    e9e6fbdeef17d4c02f8c8aa86981e6965cd2d120
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-28 00:59:49 -0700
-
-Refresh of rs-1sge
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 5be242f..bd4c8dd 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -1128,18 +1128,16 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags)
-                       xfer_size = rs->sbuf_bytes_avail;
-               if (xfer_size > rs->target_sgl[rs->target_sge].length)
-                       xfer_size = rs->target_sgl[rs->target_sge].length;
--              if (xfer_size > rs_sbuf_left(rs)) {
--                      if (xfer_size <= rs->sbuf_bytes_avail - rs_sbuf_left(rs))
--                              rs->ssge.addr = (uintptr_t) rs->sbuf;
--                      else
--                              xfer_size = rs_sbuf_left(rs);
--              }
-+              if (xfer_size > rs_sbuf_left(rs))
-+                      xfer_size = rs_sbuf_left(rs);
- 
-               if (xfer_size <= rs->sq_inline) {
-                       sge.addr = (uintptr_t) buf;
-                       sge.length = xfer_size;
-                       sge.lkey = 0;
-                       ret = rs_write_data(rs, &sge, IBV_SEND_INLINE);
-+                      if (xfer_size == rs_sbuf_left(rs))
-+                              rs->ssge.addr = (uintptr_t) rs->sbuf;
-               } else {
-                       memcpy((void *) (uintptr_t) rs->ssge.addr, buf, xfer_size);
-                       rs->ssge.length = xfer_size;

diff --git a/patches/rs-1sge b/patches/rs-1sge
index 13601e097b9fded6f50da3dfe49e0ae0f37b1041..728a3663ce87aafa9fd1d6fd32eef07c2a6c7843 100644 (file)
--- a/patches/rs-1sge
+++ b/patches/rs-1sge
@@ -1,5 +1,5 @@
 Bottom: 40360dccfdc90246ade8113c0fc63bee52ca7731
-Top:    d6059001f0d2f622720ad871c89e3c1ef4410125
+Top:    e9e6fbdeef17d4c02f8c8aa86981e6965cd2d120
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-24 14:36:41 -0700
 
@@ -19,7 +19,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index 1140975..5be242f 100644
+index 1140975..bd4c8dd 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -90,6 +90,10 @@ enum {
@@ -155,16 +155,12 @@ index 1140975..5be242f 100644
                        } else {
                                rs->ctrl_avail++;
                        }
-@@ -1144,34 +1128,26 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags)
+@@ -1144,34 +1128,24 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags)
                        xfer_size = rs->sbuf_bytes_avail;
                if (xfer_size > rs->target_sgl[rs->target_sge].length)
                        xfer_size = rs->target_sgl[rs->target_sge].length;
-+              if (xfer_size > rs_sbuf_left(rs)) {
-+                      if (xfer_size <= rs->sbuf_bytes_avail - rs_sbuf_left(rs))
-+                              rs->ssge.addr = (uintptr_t) rs->sbuf;
-+                      else
-+                              xfer_size = rs_sbuf_left(rs);
-+              }
++              if (xfer_size > rs_sbuf_left(rs))
++                      xfer_size = rs_sbuf_left(rs);
  
                if (xfer_size <= rs->sq_inline) {
                        sge.addr = (uintptr_t) buf;
@@ -180,6 +176,8 @@ index 1140975..5be242f 100644
 -                                          rs->ssgl, 1,
 -                                          rs_msg_set(RS_OP_DATA, xfer_size), 0);
 +                      ret = rs_write_data(rs, &sge, IBV_SEND_INLINE);
++                      if (xfer_size == rs_sbuf_left(rs))
++                              rs->ssge.addr = (uintptr_t) rs->sbuf;
 +              } else {
 +                      memcpy((void *) (uintptr_t) rs->ssge.addr, buf, xfer_size);
 +                      rs->ssge.length = xfer_size;
@@ -203,7 +201,7 @@ index 1140975..5be242f 100644
                }
                if (ret)
                        break;
-@@ -1253,33 +1229,21 @@ static ssize_t rsendv(int socket, const struct iovec *iov, int iovcnt, int flags
+@@ -1253,33 +1227,21 @@ static ssize_t rsendv(int socket, const struct iovec *iov, int iovcnt, int flags
                        xfer_size = rs->sbuf_bytes_avail;
                if (xfer_size > rs->target_sgl[rs->target_sge].length)
                        xfer_size = rs->target_sgl[rs->target_sge].length;