Refresh of dbg-fork

diff --git a/src/rsocket.c b/src/rsocket.c
index 4c4821bca26705dd7862be5f413da549c0d3057b..52476a279f2e486ce33a57dfd2b598cf0693ac27 100644 (file)
--- a/src/rsocket.c
+++ b/src/rsocket.c
@@ -156,6 +156,10 @@ struct rsocket {
        fastlock_t        cq_lock;
        fastlock_t        cq_wait_lock;
 
+       struct rs_msg     last_ctrl;
+       uint64_t          bytes_sent;
+       uint64_t          bytes_received;
+
        int               opts;
        long              fd_flags;
        uint64_t          so_opts;
@@ -816,6 +820,7 @@ static void rs_send_credits(struct rsocket *rs)
 
        rs->ctrl_avail--;
        rs->rseq_comp = rs->rseq_no + (rs->rq_size >> 1);
+       rs->last_ctrl.op = rs->rseq_no + rs->rq_size;
        if (rs->rbuf_bytes_avail >= (rs->rbuf_size >> 1)) {
                if (!(rs->opts & RS_OPT_SWAP_SGL)) {
                        sge.addr = (uintptr_t) &rs->rbuf[rs->rbuf_free_offset];
@@ -830,6 +835,7 @@ static void rs_send_credits(struct rsocket *rs)
                ibsge.addr = (uintptr_t) &sge;
                ibsge.lkey = 0;
                ibsge.length = sizeof(sge);
+               rs->last_ctrl.data = sge.length;
 
                rs_post_write(rs, &ibsge, 1,
                              rs_msg_set(RS_OP_SGL, rs->rseq_no + rs->rq_size),
@@ -845,6 +851,7 @@ static void rs_send_credits(struct rsocket *rs)
                if (++rs->remote_sge == rs->remote_sgl.length)
                        rs->remote_sge = 0;
        } else {
+               rs->last_ctrl.data = 0;
                rs_post_write(rs, NULL, 0,
                              rs_msg_set(RS_OP_SGL, rs->rseq_no + rs->rq_size), 0, 0, 0);
        }
@@ -1173,6 +1180,7 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
 
        } while (left && (flags & MSG_WAITALL) && (rs->state & rs_connect_rd));
 
+       rs->bytes_received += (len - left);
        fastlock_release(&rs->rlock);
        return ret ? ret : len - left;
 }
@@ -1289,6 +1297,7 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags)
                if (ret)
                        break;
        }
+       rs->bytes_sent += (len - left);
        fastlock_release(&rs->slock);
 
        return (ret && left == len) ? ret : len - left;