Refresh of rs-spin

diff --git a/src/cma.h b/src/cma.h
index 7cd1f041e01937260aea37d8bbfea5e762e791b5..828c6aa39400eda262eaf9310b9ac6aaff1b3d9c 100644 (file)
--- 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 5776806b92f8ce4de803904c98b748e90f410f74..ee1fd6c1f5864d5a7ff33cfc7269b20d8412ee74 100644 (file)
--- 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) {