merging tridge's code...

[vlendec/samba-autobuild/.git] / ctdb / ib / ibwrapper_internal.h

diff --git a/ctdb/ib/ibwrapper_internal.h b/ctdb/ib/ibwrapper_internal.h
index 04d82f9565de970303196c47828f6e63f7e01606..a879427a115ffdb49214480e40a03b62e891af6f 100644 (file)
--- a/ctdb/ib/ibwrapper_internal.h
+++ b/ctdb/ib/ibwrapper_internal.h
@@ -22,13 +22,22 @@
  */
 
 struct ibw_opts {
-       int     max_send_wr;
-       int     max_recv_wr;
+       uint32_t        max_send_wr;
+       uint32_t        max_recv_wr;
+       uint32_t        avg_send_size;
+       uint32_t        recv_bufsize;
+       uint32_t        recv_threshold;
 };
 
 struct ibw_wr {
        char    *msg; /* initialized in ibw_init_memory once per connection */
        int     wr_id; /* position in wr_index list; also used as wr id */
+
+       char    *msg_large; /* allocated specially for "large" message */
+       struct ibv_mr *mr_large;
+
+       char    *queued_msg; /* set at ibw_send - can be different than above */
+
        struct ibw_wr *next, *prev; /* in wr_list_avail or wr_list_used */
 };
 
@@ -42,14 +51,17 @@ struct ibw_ctx_priv {
        struct rdma_event_channel *cm_channel;
        struct fd_event *cm_channel_event;
 
-       struct ibv_pd          *pd;
-
        ibw_connstate_fn_t connstate_func; /* see ibw_init */
        ibw_receive_fn_t receive_func; /* see ibw_init */
 
        long    pagesize; /* sysconf result for memalign */
-       int     qsize; /* opts.max_send_wr + opts.max_recv_wr */
-       int     max_msg_size; /* see ibw_init */
+};
+
+struct ibw_part {
+       char *buf; /* talloced memory buffer */
+       uint32_t bufsize; /* allocated size of buf - always grows */
+       uint32_t len; /* message part length */
+       uint32_t to_read; /* 4 or *((uint32_t)buf) if len>=sizeof(uint32_t) */
 };
 
 struct ibw_conn_priv {
@@ -57,13 +69,27 @@ struct ibw_conn_priv {
        struct fd_event *verbs_channel_event;
 
        struct rdma_cm_id *cm_id; /* client's cm id */
+       struct ibv_pd   *pd;
        int     is_accepted;
 
        struct ibv_cq   *cq; /* qp is in cm_id */
-       struct ibv_mr *mr;
-       char *buf; /* fixed size (qsize * opts.max_msg_size) buffer for send/recv */
+
+       char *buf_send; /* max_send_wr * avg_send_size */
+       struct ibv_mr *mr_send;
        struct ibw_wr *wr_list_avail;
        struct ibw_wr *wr_list_used;
        struct ibw_wr **wr_index; /* array[0..(qsize-1)] of (ibw_wr *) */
+       int     wr_sent; /* # of send wrs in the CQ */
+
+       struct ibw_wr *queue;
+       struct ibw_wr *extra_sent;
+       struct ibw_wr *extra_avail;
+       int     extra_max; /* max wr_id in the queue */
+
+       /* buf_recv is a ring buffer */
+       char *buf_recv; /* max_recv_wr * avg_recv_size */
+       struct ibv_mr *mr_recv;
+       int recv_index; /* index of the next recv buffer when refilling */
+       struct ibw_part part;
 };