Signed-off-by: Sean Hefty <[email protected]>
---
src/rsocket.c | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/src/rsocket.c b/src/rsocket.c
index ef070a8..b89ef42 100644
--- a/src/rsocket.c
+++ b/src/rsocket.c
@@ -126,6 +126,9 @@ union rs_wr_id {
};
};
+/*
+ * rsocket states are ordered as passive, connecting, connected, disconnected.
+ */
enum rs_state {
rs_init,
rs_bound,
@@ -134,9 +137,9 @@ enum rs_state {
rs_resolving_route,
rs_connecting,
rs_accepting,
+ rs_connect_error,
rs_connected,
rs_disconnected,
- rs_connect_error,
rs_error
};
@@ -1021,9 +1024,7 @@ ssize_t rrecv(int socket, void *buf, size_t len, int
flags)
int ret;
rs = idm_at(&idm, socket);
- if (rs->state != rs_connected &&
- (rs->state == rs_resolving_addr || rs->state == rs_resolving_route
||
- rs->state == rs_connecting || rs->state == rs_accepting)) {
+ if (rs->state < rs_connected) {
ret = rs_do_connect(rs);
if (ret) {
if (errno == EINPROGRESS)
@@ -1125,7 +1126,7 @@ ssize_t rsend(int socket, const void *buf, size_t len,
int flags)
int ret = 0;
rs = idm_at(&idm, socket);
- if (rs->state != rs_connected) {
+ if (rs->state < rs_connected) {
ret = rs_do_connect(rs);
if (ret) {
if (errno == EINPROGRESS)
@@ -1234,7 +1235,7 @@ static ssize_t rsendv(int socket, const struct iovec
*iov, int iovcnt, int flags
int i, ret = 0;
rs = idm_at(&idm, socket);
- if (rs->state != rs_connected) {
+ if (rs->state < rs_connected) {
ret = rs_do_connect(rs);
if (ret) {
if (errno == EINPROGRESS)
@@ -1380,7 +1381,7 @@ static int rs_poll_rs(struct rsocket *rs, int events,
revents |= POLLOUT;
if (rs->state == rs_disconnected)
revents |= POLLHUP;
- if (rs->state == rs_error)
+ else if (rs->state == rs_error)
revents |= POLLERR;
return revents;
@@ -1421,16 +1422,11 @@ static int rs_poll_arm(struct pollfd *rfds, struct
pollfd *fds, nfds_t nfds)
if (fds[i].revents)
return 1;
- switch (rs->state) {
- case rs_connected:
- case rs_disconnected:
- case rs_error:
+ if (rs->state >= rs_connected)
rfds[i].fd = rs->cm_id->recv_cq_channel->fd;
- break;
- default:
+ else
rfds[i].fd = rs->cm_id->channel->fd;
- break;
- }
+
rfds[i].events = POLLIN;
} else {
rfds[i].fd = fds[i].fd;
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
