From 18ee125a721eabcc7a78ecfde90294971e23cbfc Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 24 Oct 2012 22:51:47 -0700 Subject: [PATCH] refresh --- meta | 7 +++---- patches/refresh-temp | 20 -------------------- patches/rs-iomap | 41 ++++++++++++++++++++--------------------- 3 files changed, 23 insertions(+), 45 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 4463d6f3..6318485d 100644 --- a/meta +++ b/meta @@ -1,9 +1,8 @@ Version: 1 -Previous: d39f418206d5d924d486195b158f6d91c36356c0 -Head: c70fcfde8678b15b57af15265ac8420041bff0bd +Previous: 679d273783d98d9ed9b5a77d29634a51a31f6e58 +Head: e5a8d2c61f31c60bf37aa3ad41219bdf62e08e57 Applied: - rs-iomap: 0841b5f6724681ed1859262c190a4dedf6df37e1 - refresh-temp: c70fcfde8678b15b57af15265ac8420041bff0bd + rs-iomap: e5a8d2c61f31c60bf37aa3ad41219bdf62e08e57 Unapplied: riostream: edef3f821b0265ee07b11e7a881720f72cf35fc8 iom-dbg: 88434072d07f8edc58f454ac954d78bd39441eed diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 4d3658bf..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,20 +0,0 @@ -Bottom: adbc5e044ca220d9d21d72e8b804f954a84df8bc -Top: 915e0ee4505ffa5dc789b46752172eee702adae3 -Author: Sean Hefty -Date: 2012-10-24 22:51:47 -0700 - -Refresh of rs-iomap - ---- - -diff --git a/src/rsocket.c b/src/rsocket.c -index f0c4c35..29b8c01 100644 ---- a/src/rsocket.c -+++ b/src/rsocket.c -@@ -944,7 +944,6 @@ static int rs_write_direct(struct rsocket *rs, struct rs_iomap *iom, uint64_t of - { - uint64_t addr; - -- rs->sseq_no++; - rs->sqe_avail--; - rs->sbuf_bytes_avail -= length; diff --git a/patches/rs-iomap b/patches/rs-iomap index ca732187..a24bc0ef 100644 --- a/patches/rs-iomap +++ b/patches/rs-iomap @@ -1,5 +1,5 @@ Bottom: daf53db464152f40dc8d6f2c99844510b03f8567 -Top: adbc5e044ca220d9d21d72e8b804f954a84df8bc +Top: 915e0ee4505ffa5dc789b46752172eee702adae3 Author: Sean Hefty Date: 2012-10-21 14:16:03 -0700 @@ -286,7 +286,7 @@ index 5c317a3..d5ef736 100644 local: *; }; diff --git a/src/rsocket.c b/src/rsocket.c -index cc5effe..f0c4c35 100644 +index cc5effe..29b8c01 100644 --- a/src/rsocket.c +++ b/src/rsocket.c @@ -55,6 +55,7 @@ @@ -620,7 +620,7 @@ index cc5effe..f0c4c35 100644 /* * Update target SGE before sending data. Otherwise the remote side may * update the entry before we do. -@@ -799,8 +935,36 @@ static int rs_write_data(struct rsocket *rs, +@@ -799,8 +935,35 @@ static int rs_write_data(struct rsocket *rs, rs->target_sge = 0; } @@ -635,7 +635,6 @@ index cc5effe..f0c4c35 100644 +{ + uint64_t addr; + -+ rs->sseq_no++; + rs->sqe_avail--; + rs->sbuf_bytes_avail -= length; + @@ -659,7 +658,7 @@ index cc5effe..f0c4c35 100644 } static uint32_t rs_sbuf_left(struct rsocket *rs) -@@ -831,12 +995,12 @@ static void rs_send_credits(struct rsocket *rs) +@@ -831,12 +994,12 @@ static void rs_send_credits(struct rsocket *rs) ibsge.lkey = 0; ibsge.length = sizeof(sge); @@ -678,7 +677,7 @@ index cc5effe..f0c4c35 100644 rs->rbuf_bytes_avail -= rs->rbuf_size >> 1; rs->rbuf_free_offset += rs->rbuf_size >> 1; -@@ -845,8 +1009,9 @@ static void rs_send_credits(struct rsocket *rs) +@@ -845,8 +1008,9 @@ static void rs_send_credits(struct rsocket *rs) if (++rs->remote_sge == rs->remote_sgl.length) rs->remote_sge = 0; } else { @@ -690,7 +689,7 @@ index cc5effe..f0c4c35 100644 } } -@@ -880,6 +1045,9 @@ static int rs_poll_cq(struct rsocket *rs) +@@ -880,6 +1044,9 @@ static int rs_poll_cq(struct rsocket *rs) case RS_OP_SGL: rs->sseq_comp = (uint16_t) rs_msg_data(imm_data); break; @@ -700,7 +699,7 @@ index cc5effe..f0c4c35 100644 case RS_OP_CTRL: if (rs_msg_data(imm_data) == RS_CTRL_DISCONNECT) { rs->state = rs_disconnected; -@@ -888,6 +1056,9 @@ static int rs_poll_cq(struct rsocket *rs) +@@ -888,6 +1055,9 @@ static int rs_poll_cq(struct rsocket *rs) rs->state &= ~rs_connect_rd; } break; @@ -710,7 +709,7 @@ index cc5effe..f0c4c35 100644 default: rs->rmsg[rs->rmsg_tail].op = rs_msg_op(imm_data); rs->rmsg[rs->rmsg_tail].data = rs_msg_data(imm_data); -@@ -905,6 +1076,10 @@ static int rs_poll_cq(struct rsocket *rs) +@@ -905,6 +1075,10 @@ static int rs_poll_cq(struct rsocket *rs) if (rs_msg_data((uint32_t) wc.wr_id) == RS_CTRL_DISCONNECT) rs->state = rs_disconnected; break; @@ -721,7 +720,7 @@ index cc5effe..f0c4c35 100644 default: rs->sqe_avail++; rs->sbuf_bytes_avail += rs_msg_data((uint32_t) wc.wr_id); -@@ -1046,7 +1221,7 @@ static int rs_poll_all(struct rsocket *rs) +@@ -1046,7 +1220,7 @@ static int rs_poll_all(struct rsocket *rs) */ static int rs_can_send(struct rsocket *rs) { @@ -730,7 +729,7 @@ index cc5effe..f0c4c35 100644 (rs->sseq_no != rs->sseq_comp) && (rs->target_sgl[rs->target_sge].length != 0); } -@@ -1216,6 +1391,73 @@ ssize_t rreadv(int socket, const struct iovec *iov, int iovcnt) +@@ -1216,6 +1390,73 @@ ssize_t rreadv(int socket, const struct iovec *iov, int iovcnt) return rrecvv(socket, iov, iovcnt, 0); } @@ -804,7 +803,7 @@ index cc5effe..f0c4c35 100644 /* * We overlap sending the data, by posting a small work request immediately, * then increasing the size of the send on each iteration. -@@ -1224,7 +1466,7 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags) +@@ -1224,7 +1465,7 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags) { struct rsocket *rs; struct ibv_sge sge; @@ -813,7 +812,7 @@ index cc5effe..f0c4c35 100644 uint32_t xfer_size, olen = RS_OLAP_START_SIZE; int ret = 0; -@@ -1239,7 +1481,12 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags) +@@ -1239,7 +1480,12 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags) } fastlock_acquire(&rs->slock); @@ -827,7 +826,7 @@ index cc5effe..f0c4c35 100644 if (!rs_can_send(rs)) { ret = rs_get_comp(rs, rs_nonblocking(rs, flags), rs_conn_can_send); -@@ -1289,6 +1536,7 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags) +@@ -1289,6 +1535,7 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags) if (ret) break; } @@ -835,7 +834,7 @@ index cc5effe..f0c4c35 100644 fastlock_release(&rs->slock); return (ret && left == len) ? ret : len - left; -@@ -1345,9 +1593,15 @@ static ssize_t rsendv(int socket, const struct iovec *iov, int iovcnt, int flags +@@ -1345,9 +1592,15 @@ static ssize_t rsendv(int socket, const struct iovec *iov, int iovcnt, int flags len = iov[0].iov_len; for (i = 1; i < iovcnt; i++) len += iov[i].iov_len; @@ -852,7 +851,7 @@ index cc5effe..f0c4c35 100644 if (!rs_can_send(rs)) { ret = rs_get_comp(rs, rs_nonblocking(rs, flags), rs_conn_can_send); -@@ -1395,6 +1649,7 @@ static ssize_t rsendv(int socket, const struct iovec *iov, int iovcnt, int flags +@@ -1395,6 +1648,7 @@ static ssize_t rsendv(int socket, const struct iovec *iov, int iovcnt, int flags if (ret) break; } @@ -860,7 +859,7 @@ index cc5effe..f0c4c35 100644 fastlock_release(&rs->slock); return (ret && left == len) ? ret : len - left; -@@ -1725,8 +1980,8 @@ int rshutdown(int socket, int how) +@@ -1725,8 +1979,8 @@ int rshutdown(int socket, int how) if ((rs->state & rs_connected) && rs->ctrl_avail) { rs->ctrl_avail--; @@ -871,7 +870,7 @@ index cc5effe..f0c4c35 100644 } } -@@ -1814,6 +2069,8 @@ int rsetsockopt(int socket, int level, int optname, +@@ -1814,6 +2068,8 @@ int rsetsockopt(int socket, int level, int optname, case SO_SNDBUF: if (!rs->sbuf) rs->sbuf_size = (*(uint32_t *) optval) << 1; @@ -880,7 +879,7 @@ index cc5effe..f0c4c35 100644 ret = 0; break; case SO_LINGER: -@@ -1878,6 +2135,10 @@ int rsetsockopt(int socket, int level, int optname, +@@ -1878,6 +2134,10 @@ int rsetsockopt(int socket, int level, int optname, if (rs->sq_inline < RS_MIN_INLINE) rs->sq_inline = RS_MIN_INLINE; break; @@ -891,7 +890,7 @@ index cc5effe..f0c4c35 100644 default: break; } -@@ -1979,6 +2240,10 @@ int rgetsockopt(int socket, int level, int optname, +@@ -1979,6 +2239,10 @@ int rgetsockopt(int socket, int level, int optname, *((int *) optval) = rs->sq_inline; *optlen = sizeof(int); break; @@ -902,7 +901,7 @@ index cc5effe..f0c4c35 100644 default: ret = ENOTSUP; break; -@@ -2020,3 +2285,201 @@ int rfcntl(int socket, int cmd, ... /* arg */ ) +@@ -2020,3 +2284,201 @@ int rfcntl(int socket, int cmd, ... /* arg */ ) va_end(args); return ret; } -- 2.46.0