From 5470df6a3117c6e80ab5036a31ed495d4071cf65 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Tue, 5 Jun 2012 14:17:36 -0700 Subject: [PATCH] Refresh of rs-spin --- src/cma.h | 2 +- src/rsocket.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cma.h b/src/cma.h index 7cd1f041..828c6aa3 100644 --- a/src/cma.h +++ b/src/cma.h @@ -174,6 +174,6 @@ struct ibv_path_data #define RDMADIR "rdma" #endif #define RDMA_CONF_DIR SYSCONFDIR "/" RDMADIR -#define RS_CONF_DIR RDMA_CONF_DIR "/rsockets" +#define RS_CONF_DIR RDMA_CONF_DIR "/rsocket" #endif /* CMA_H */ diff --git a/src/rsocket.c b/src/rsocket.c index 5776806b..ee1fd6c1 100644 --- a/src/rsocket.c +++ b/src/rsocket.c @@ -1071,7 +1071,7 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags) } fastlock_acquire(&rs->rlock); if (!rs_have_rdata(rs)) { - ret = rs_process_cq(rs, rs_nonblocking(rs, flags), rs_conn_have_rdata); + ret = rs_get_comp(rs, rs_nonblocking(rs, flags), rs_conn_have_rdata); if (ret && errno != ECONNRESET) goto out; } @@ -1175,8 +1175,8 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags) fastlock_acquire(&rs->slock); for (left = len; left; left -= xfer_size, buf += xfer_size) { if (!rs_can_send(rs)) { - ret = rs_process_cq(rs, rs_nonblocking(rs, flags), - rs_conn_can_send); + ret = rs_get_comp(rs, rs_nonblocking(rs, flags), + rs_conn_can_send); if (ret) break; if (rs->state != rs_connected) { @@ -1289,8 +1289,8 @@ static ssize_t rsendv(int socket, const struct iovec *iov, int iovcnt, int flags fastlock_acquire(&rs->slock); for (left = len; left; left -= xfer_size) { if (!rs_can_send(rs)) { - ret = rs_process_cq(rs, rs_nonblocking(rs, flags), - rs_conn_can_send); + ret = rs_get_comp(rs, rs_nonblocking(rs, flags), + rs_conn_can_send); if (ret) break; if (rs->state != rs_connected) { -- 2.45.2