Compile fix

[sahlberg/ctdb.git] / ib / ibwrapper_internal.h

diff --git a/ib/ibwrapper_internal.h b/ib/ibwrapper_internal.h
index a879427a115ffdb49214480e40a03b62e891af6f..20aef7fd86b83b8a17b54a3558235855b8d2becd 100644 (file)
--- a/ib/ibwrapper_internal.h
+++ b/ib/ibwrapper_internal.h
@@ -8,7 +8,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,28 +17,31 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 struct ibw_opts {
        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 */
+       char    *buf; /* 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 */
+       char    *buf_large; /* allocated specially for "large" message */
        struct ibv_mr *mr_large;
+       int     ref_cnt; /* reference count for ibw_wc_send to know when to release */
 
        char    *queued_msg; /* set at ibw_send - can be different than above */
+       int     queued_ref_cnt; /* instead of adding the same to the queue again */
+       uint32_t        queued_rlen; /* last wins when queued_ref_cnt>0; or simple msg size */
 
        struct ibw_wr *next, *prev; /* in wr_list_avail or wr_list_used */
+                               /* or extra_sent or extra_avail */
+       struct ibw_wr *qnext, *qprev; /* in queue */
 };
 
 struct ibw_ctx_priv {
@@ -81,11 +84,12 @@ struct ibw_conn_priv {
        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 */
 
+       struct ibw_wr *queue;
+
        /* buf_recv is a ring buffer */
        char *buf_recv; /* max_recv_wr * avg_recv_size */
        struct ibv_mr *mr_recv;
@@ -93,3 +97,30 @@ struct ibw_conn_priv {
        struct ibw_part part;
 };
 
+/* remove an element from a list - element doesn't have to be in list. */
+#define DLIST_REMOVE2(list, p, prev, next) \
+do { \
+       if ((p) == (list)) { \
+               (list) = (p)->next; \
+               if (list) (list)->prev = NULL; \
+       } else { \
+               if ((p)->prev) (p)->prev->next = (p)->next; \
+               if ((p)->next) (p)->next->prev = (p)->prev; \
+       } \
+       if ((p) != (list)) (p)->next = (p)->prev = NULL; \
+} while (0)
+
+/* hook into the end of the list - needs a tmp pointer */
+#define DLIST_ADD_END2(list, p, type, prev, next) \
+do { \
+               if (!(list)) { \
+                       (list) = (p); \
+                       (p)->next = (p)->prev = NULL; \
+               } else { \
+                       type tmp; \
+                       for (tmp = (list); tmp->next; tmp = tmp->next) ; \
+                       tmp->next = (p); \
+                       (p)->next = NULL; \
+                       (p)->prev = tmp; \
+               } \
+} while (0)