From c5549c08913c0858916b728933ec456512c316f3 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 10 Dec 2012 15:01:48 -0800 Subject: [PATCH] refresh --- meta | 7 ++-- patches/dsocket | 85 ++++++++++++++++++++++---------------------- patches/refresh-temp | 30 ---------------- 3 files changed, 46 insertions(+), 76 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 3fc1fdfb..85946b38 100644 --- a/meta +++ b/meta @@ -1,9 +1,8 @@ Version: 1 -Previous: af6f72b6a7f7982599bafb83ff89f5b8b4bf5a76 -Head: e3a5037223af6f5489d7ae9169d87cf8c83ebd99 +Previous: 1149007696dea54fca9573a031954cae9b361a2f +Head: 62b2303fc5fdbbf9cc712e04662f80970e662563 Applied: - dsocket: 320986faa492c17e8858885798b9da8afaad7551 - refresh-temp: e3a5037223af6f5489d7ae9169d87cf8c83ebd99 + dsocket: 62b2303fc5fdbbf9cc712e04662f80970e662563 Unapplied: udpong: 0d01bada46421fe24e2ecc84c6d3d1e89cebef64 test-udp: f6c78ad2a26f452cf166aff1baa7b76160bd8bf7 diff --git a/patches/dsocket b/patches/dsocket index 329b44c4..88acc0a7 100644 --- a/patches/dsocket +++ b/patches/dsocket @@ -1,5 +1,5 @@ Bottom: 1fa07c62817ac4b6cb8d9c5e327ea2cdc75dbd21 -Top: d58bea7ff66215f5a1631dca9de9254822217783 +Top: 149a333bd2b79ef125e96607d91fa8f10b9155e8 Author: Sean Hefty Date: 2012-11-09 10:26:38 -0800 @@ -112,7 +112,7 @@ index 0a0370e..7135a61 100644 { errno = err; diff --git a/src/rsocket.c b/src/rsocket.c -index a060f66..024c634 100644 +index a060f66..56f6f39 100644 --- a/src/rsocket.c +++ b/src/rsocket.c @@ -47,6 +47,8 @@ @@ -843,7 +843,7 @@ index a060f66..024c634 100644 fastlock_destroy(&rs->cq_wait_lock); fastlock_destroy(&rs->cq_lock); fastlock_destroy(&rs->rlock); -@@ -636,29 +1003,54 @@ static void rs_save_conn_data(struct rsocket *rs, struct rs_conn_data *conn) +@@ -636,29 +1003,55 @@ static void rs_save_conn_data(struct rsocket *rs, struct rs_conn_data *conn) rs->sseq_comp = ntohs(conn->credits); } @@ -853,7 +853,7 @@ index a060f66..024c634 100644 + if (rs->udp_sock < 0) + return rs->udp_sock; + -+ rs->epfd = epoll_create(0); ++ rs->epfd = epoll_create(2); + if (rs->epfd < 0) + return rs->epfd; + @@ -891,6 +891,7 @@ index a060f66..024c634 100644 + rs->cm_id->route.addr.src_addr.sa_family = domain; + index = rs->cm_id->channel->fd; + } else { ++printf("rsocket DGRAM\n"); + ret = ds_init(rs, domain); + if (ret) + goto err; @@ -906,7 +907,7 @@ index a060f66..024c634 100644 return rs->index; err: -@@ -672,9 +1064,18 @@ int rbind(int socket, const struct sockaddr *addr, socklen_t addrlen) +@@ -672,9 +1065,18 @@ int rbind(int socket, const struct sockaddr *addr, socklen_t addrlen) int ret; rs = idm_at(&idm, socket); @@ -928,7 +929,7 @@ index a060f66..024c634 100644 return ret; } -@@ -710,7 +1111,7 @@ int raccept(int socket, struct sockaddr *addr, socklen_t *addrlen) +@@ -710,7 +1112,7 @@ int raccept(int socket, struct sockaddr *addr, socklen_t *addrlen) int ret; rs = idm_at(&idm, socket); @@ -937,7 +938,7 @@ index a060f66..024c634 100644 if (!new_rs) return ERR(ENOMEM); -@@ -718,7 +1119,7 @@ int raccept(int socket, struct sockaddr *addr, socklen_t *addrlen) +@@ -718,7 +1120,7 @@ int raccept(int socket, struct sockaddr *addr, socklen_t *addrlen) if (ret) goto err; @@ -946,7 +947,7 @@ index a060f66..024c634 100644 if (ret < 0) goto err; -@@ -855,13 +1256,268 @@ connected: +@@ -855,13 +1257,268 @@ connected: return ret; } @@ -1217,7 +1218,7 @@ index a060f66..024c634 100644 } static int rs_post_write_msg(struct rsocket *rs, -@@ -903,6 +1559,24 @@ static int rs_post_write(struct rsocket *rs, +@@ -903,6 +1560,24 @@ static int rs_post_write(struct rsocket *rs, return rdma_seterrno(ibv_post_send(rs->cm_id->qp, &wr, &bad)); } @@ -1242,7 +1243,7 @@ index a060f66..024c634 100644 /* * Update target SGE before sending data. Otherwise the remote side may * update the entry before we do. -@@ -1046,7 +1720,7 @@ static int rs_poll_cq(struct rsocket *rs) +@@ -1046,7 +1721,7 @@ static int rs_poll_cq(struct rsocket *rs) rs->state = rs_disconnected; return 0; } else if (rs_msg_data(imm_data) == RS_CTRL_SHUTDOWN) { @@ -1251,7 +1252,7 @@ index a060f66..024c634 100644 } break; case RS_OP_WRITE: -@@ -1133,46 +1807,205 @@ static int rs_get_cq_event(struct rsocket *rs) +@@ -1133,46 +1808,205 @@ static int rs_get_cq_event(struct rsocket *rs) */ static int rs_process_cq(struct rsocket *rs, int nonblock, int (*test)(struct rsocket *rs)) { @@ -1467,7 +1468,7 @@ index a060f66..024c634 100644 if (!ret || nonblock || errno != EWOULDBLOCK) return ret; -@@ -1184,7 +2017,7 @@ static int rs_get_comp(struct rsocket *rs, int nonblock, int (*test)(struct rsoc +@@ -1184,7 +2018,7 @@ static int rs_get_comp(struct rsocket *rs, int nonblock, int (*test)(struct rsoc (e.tv_usec - s.tv_usec) + 1; } while (poll_time <= polling_time); @@ -1476,7 +1477,7 @@ index a060f66..024c634 100644 return ret; } -@@ -1219,9 +2052,19 @@ static int rs_can_send(struct rsocket *rs) +@@ -1219,9 +2053,19 @@ static int rs_can_send(struct rsocket *rs) (rs->target_sgl[rs->target_sge].length != 0); } @@ -1497,7 +1498,7 @@ index a060f66..024c634 100644 } static int rs_conn_can_send_ctrl(struct rsocket *rs) -@@ -1236,7 +2079,7 @@ static int rs_have_rdata(struct rsocket *rs) +@@ -1236,7 +2080,7 @@ static int rs_have_rdata(struct rsocket *rs) static int rs_conn_have_rdata(struct rsocket *rs) { @@ -1506,7 +1507,7 @@ index a060f66..024c634 100644 } static int rs_conn_all_sends_done(struct rsocket *rs) -@@ -1245,6 +2088,66 @@ static int rs_conn_all_sends_done(struct rsocket *rs) +@@ -1245,6 +2089,66 @@ static int rs_conn_all_sends_done(struct rsocket *rs) !(rs->state & rs_connected); } @@ -1573,7 +1574,7 @@ index a060f66..024c634 100644 static ssize_t rs_peek(struct rsocket *rs, void *buf, size_t len) { size_t left = len; -@@ -1290,6 +2193,13 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags) +@@ -1290,6 +2194,13 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags) int ret; rs = idm_at(&idm, socket); @@ -1587,7 +1588,7 @@ index a060f66..024c634 100644 if (rs->state & rs_opening) { ret = rs_do_connect(rs); if (ret) { -@@ -1339,7 +2249,7 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags) +@@ -1339,7 +2250,7 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags) rs->rbuf_bytes_avail += rsize; } @@ -1596,7 +1597,7 @@ index a060f66..024c634 100644 fastlock_release(&rs->rlock); return ret ? ret : len - left; -@@ -1348,8 +2258,17 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags) +@@ -1348,8 +2259,17 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags) ssize_t rrecvfrom(int socket, void *buf, size_t len, int flags, struct sockaddr *src_addr, socklen_t *addrlen) { @@ -1614,7 +1615,7 @@ index a060f66..024c634 100644 ret = rrecv(socket, buf, len, flags); if (ret > 0 && src_addr) rgetpeername(socket, src_addr, addrlen); -@@ -1391,14 +2310,14 @@ static int rs_send_iomaps(struct rsocket *rs, int flags) +@@ -1391,14 +2311,14 @@ static int rs_send_iomaps(struct rsocket *rs, int flags) struct rs_iomap iom; int ret; @@ -1631,7 +1632,7 @@ index a060f66..024c634 100644 ret = ERR(ECONNRESET); break; } -@@ -1447,10 +2366,90 @@ static int rs_send_iomaps(struct rsocket *rs, int flags) +@@ -1447,10 +2367,90 @@ static int rs_send_iomaps(struct rsocket *rs, int flags) } rs->iomap_pending = !dlist_empty(&rs->iomap_queue); @@ -1723,7 +1724,7 @@ index a060f66..024c634 100644 /* * We overlap sending the data, by posting a small work request immediately, * then increasing the size of the send on each iteration. -@@ -1464,6 +2463,13 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags) +@@ -1464,6 +2464,13 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags) int ret = 0; rs = idm_at(&idm, socket); @@ -1737,7 +1738,7 @@ index a060f66..024c634 100644 if (rs->state & rs_opening) { ret = rs_do_connect(rs); if (ret) { -@@ -1485,7 +2491,7 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags) +@@ -1485,7 +2492,7 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags) rs_conn_can_send); if (ret) break; @@ -1746,7 +1747,7 @@ index a060f66..024c634 100644 ret = ERR(ECONNRESET); break; } -@@ -1538,10 +2544,27 @@ out: +@@ -1538,10 +2545,27 @@ out: ssize_t rsendto(int socket, const void *buf, size_t len, int flags, const struct sockaddr *dest_addr, socklen_t addrlen) { @@ -1777,7 +1778,7 @@ index a060f66..024c634 100644 } static void rs_copy_iov(void *dst, const struct iovec **iov, size_t *offset, size_t len) -@@ -1600,7 +2623,7 @@ static ssize_t rsendv(int socket, const struct iovec *iov, int iovcnt, int flags +@@ -1600,7 +2624,7 @@ static ssize_t rsendv(int socket, const struct iovec *iov, int iovcnt, int flags rs_conn_can_send); if (ret) break; @@ -1786,7 +1787,7 @@ index a060f66..024c634 100644 ret = ERR(ECONNRESET); break; } -@@ -1653,7 +2676,7 @@ ssize_t rsendmsg(int socket, const struct msghdr *msg, int flags) +@@ -1653,7 +2677,7 @@ ssize_t rsendmsg(int socket, const struct msghdr *msg, int flags) if (msg->msg_control && msg->msg_controllen) return ERR(ENOTSUP); @@ -1795,7 +1796,7 @@ index a060f66..024c634 100644 } ssize_t rwrite(int socket, const void *buf, size_t count) -@@ -1690,8 +2713,8 @@ static int rs_poll_rs(struct rsocket *rs, int events, +@@ -1690,8 +2714,8 @@ static int rs_poll_rs(struct rsocket *rs, int events, int ret; check_cq: @@ -1806,7 +1807,7 @@ index a060f66..024c634 100644 rs_process_cq(rs, nonblock, test); revents = 0; -@@ -1707,6 +2730,16 @@ check_cq: +@@ -1707,6 +2731,16 @@ check_cq: } return revents; @@ -1823,7 +1824,7 @@ index a060f66..024c634 100644 } if (rs->state == rs_listening) { -@@ -1766,11 +2799,14 @@ static int rs_poll_arm(struct pollfd *rfds, struct pollfd *fds, nfds_t nfds) +@@ -1766,11 +2800,14 @@ static int rs_poll_arm(struct pollfd *rfds, struct pollfd *fds, nfds_t nfds) if (fds[i].revents) return 1; @@ -1843,7 +1844,7 @@ index a060f66..024c634 100644 rfds[i].events = POLLIN; } else { rfds[i].fd = fds[i].fd; -@@ -1793,7 +2829,10 @@ static int rs_poll_events(struct pollfd *rfds, struct pollfd *fds, nfds_t nfds) +@@ -1793,7 +2830,10 @@ static int rs_poll_events(struct pollfd *rfds, struct pollfd *fds, nfds_t nfds) rs = idm_lookup(&idm, fds[i].fd); if (rs) { @@ -1855,7 +1856,7 @@ index a060f66..024c634 100644 fds[i].revents = rs_poll_rs(rs, fds[i].events, 1, rs_poll_all); } else { fds[i].revents = rfds[i].revents; -@@ -1949,7 +2988,7 @@ int rshutdown(int socket, int how) +@@ -1949,7 +2989,7 @@ int rshutdown(int socket, int how) rs = idm_at(&idm, socket); if (how == SHUT_RD) { @@ -1864,7 +1865,7 @@ index a060f66..024c634 100644 return 0; } -@@ -1959,10 +2998,10 @@ int rshutdown(int socket, int how) +@@ -1959,10 +2999,10 @@ int rshutdown(int socket, int how) if (rs->state & rs_connected) { if (how == SHUT_RDWR) { ctrl = RS_CTRL_DISCONNECT; @@ -1878,7 +1879,7 @@ index a060f66..024c634 100644 RS_CTRL_SHUTDOWN : RS_CTRL_DISCONNECT; } if (!rs->ctrl_avail) { -@@ -1987,13 +3026,29 @@ int rshutdown(int socket, int how) +@@ -1987,13 +3027,29 @@ int rshutdown(int socket, int how) return 0; } @@ -1910,7 +1911,7 @@ index a060f66..024c634 100644 rs_free(rs); return 0; -@@ -2018,8 +3073,12 @@ int rgetpeername(int socket, struct sockaddr *addr, socklen_t *addrlen) +@@ -2018,8 +3074,12 @@ int rgetpeername(int socket, struct sockaddr *addr, socklen_t *addrlen) struct rsocket *rs; rs = idm_at(&idm, socket); @@ -1925,7 +1926,7 @@ index a060f66..024c634 100644 } int rgetsockname(int socket, struct sockaddr *addr, socklen_t *addrlen) -@@ -2027,8 +3086,12 @@ int rgetsockname(int socket, struct sockaddr *addr, socklen_t *addrlen) +@@ -2027,8 +3087,12 @@ int rgetsockname(int socket, struct sockaddr *addr, socklen_t *addrlen) struct rsocket *rs; rs = idm_at(&idm, socket); @@ -1940,7 +1941,7 @@ index a060f66..024c634 100644 } int rsetsockopt(int socket, int level, int optname, -@@ -2040,18 +3103,26 @@ int rsetsockopt(int socket, int level, int optname, +@@ -2040,18 +3104,26 @@ int rsetsockopt(int socket, int level, int optname, ret = ERR(ENOTSUP); rs = idm_at(&idm, socket); @@ -1974,7 +1975,7 @@ index a060f66..024c634 100644 opt_on = *(int *) optval; break; case SO_RCVBUF: -@@ -2101,9 +3172,11 @@ int rsetsockopt(int socket, int level, int optname, +@@ -2101,9 +3173,11 @@ int rsetsockopt(int socket, int level, int optname, opts = &rs->ipv6_opts; switch (optname) { case IPV6_V6ONLY: @@ -1989,7 +1990,7 @@ index a060f66..024c634 100644 opt_on = *(int *) optval; break; default: -@@ -2315,7 +3388,7 @@ off_t riomap(int socket, void *buf, size_t len, int prot, int flags, off_t offse +@@ -2315,7 +3389,7 @@ off_t riomap(int socket, void *buf, size_t len, int prot, int flags, off_t offse if (!rs->cm_id->pd || (prot & ~(PROT_WRITE | PROT_NONE))) return ERR(EINVAL); @@ -1998,7 +1999,7 @@ index a060f66..024c634 100644 if (prot & PROT_WRITE) { iomr = rs_get_iomap_mr(rs); access |= IBV_ACCESS_REMOTE_WRITE; -@@ -2349,7 +3422,7 @@ off_t riomap(int socket, void *buf, size_t len, int prot, int flags, off_t offse +@@ -2349,7 +3423,7 @@ off_t riomap(int socket, void *buf, size_t len, int prot, int flags, off_t offse dlist_insert_tail(&iomr->entry, &rs->iomap_list); } out: @@ -2007,7 +2008,7 @@ index a060f66..024c634 100644 return offset; } -@@ -2361,7 +3434,7 @@ int riounmap(int socket, void *buf, size_t len) +@@ -2361,7 +3435,7 @@ int riounmap(int socket, void *buf, size_t len) int ret = 0; rs = idm_at(&idm, socket); @@ -2016,7 +2017,7 @@ index a060f66..024c634 100644 for (entry = rs->iomap_list.next; entry != &rs->iomap_list; entry = entry->next) { -@@ -2382,7 +3455,7 @@ int riounmap(int socket, void *buf, size_t len) +@@ -2382,7 +3456,7 @@ int riounmap(int socket, void *buf, size_t len) } ret = ERR(EINVAL); out: @@ -2025,7 +2026,7 @@ index a060f66..024c634 100644 return ret; } -@@ -2426,7 +3499,7 @@ size_t riowrite(int socket, const void *buf, size_t count, off_t offset, int fla +@@ -2426,7 +3500,7 @@ size_t riowrite(int socket, const void *buf, size_t count, off_t offset, int fla rs_conn_can_send); if (ret) break; @@ -2034,7 +2035,7 @@ index a060f66..024c634 100644 ret = ERR(ECONNRESET); break; } -@@ -2476,3 +3549,269 @@ out: +@@ -2476,3 +3550,269 @@ out: return (ret && left == count) ? ret : count - left; } diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 78451600..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,30 +0,0 @@ -Bottom: d58bea7ff66215f5a1631dca9de9254822217783 -Top: 149a333bd2b79ef125e96607d91fa8f10b9155e8 -Author: Sean Hefty -Date: 2012-12-10 15:01:47 -0800 - -Refresh of dsocket - ---- - -diff --git a/src/rsocket.c b/src/rsocket.c -index 024c634..56f6f39 100644 ---- a/src/rsocket.c -+++ b/src/rsocket.c -@@ -1009,7 +1009,7 @@ static int ds_init(struct rsocket *rs, int domain) - if (rs->udp_sock < 0) - return rs->udp_sock; - -- rs->epfd = epoll_create(0); -+ rs->epfd = epoll_create(2); - if (rs->epfd < 0) - return rs->epfd; - -@@ -1040,6 +1040,7 @@ int rsocket(int domain, int type, int protocol) - rs->cm_id->route.addr.src_addr.sa_family = domain; - index = rs->cm_id->channel->fd; - } else { -+printf("rsocket DGRAM\n"); - ret = ds_init(rs, domain); - if (ret) - goto err; -- 2.46.0