[haiku-commits] haiku: hrev52103 - src/libs/compat/freebsd11_network/compat/sys

  • From: waddlesplash <waddlesplash@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 15 Jul 2018 22:20:59 -0400 (EDT)

hrev52103 adds 1 changeset to branch 'master'
old head: a5167229e147ebb7937c2db70bf6470b0e3e1d5a
new head: 562ec5674fe1708d2ecb7c931b904314ded83d1e
overview: 
https://git.haiku-os.org/haiku/log/?qt=range&q=562ec5674fe1+%5Ea5167229e147

----------------------------------------------------------------------------

562ec5674fe1: freebsd11_network: Sync queue.h with FreeBSD 11.1.
  
  Includes some actual bugfixes, from reading the FreeBSD commit logs.

                              [ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev52103
Commit:      562ec5674fe1708d2ecb7c931b904314ded83d1e
URL:         https://git.haiku-os.org/haiku/commit/?id=562ec5674fe1
Author:      Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date:        Mon Jul 16 01:51:59 2018 UTC

----------------------------------------------------------------------------

1 file changed, 311 insertions(+), 76 deletions(-)
.../compat/freebsd11_network/compat/sys/queue.h  | 387 +++++++++++++++----

----------------------------------------------------------------------------

diff --git a/src/libs/compat/freebsd11_network/compat/sys/queue.h 
b/src/libs/compat/freebsd11_network/compat/sys/queue.h
index 7f2428779c..636dbe5302 100644
--- a/src/libs/compat/freebsd11_network/compat/sys/queue.h
+++ b/src/libs/compat/freebsd11_network/compat/sys/queue.h
@@ -27,8 +27,9 @@
  * SUCH DAMAGE.
  *
  *     @(#)queue.h     8.5 (Berkeley) 8/20/94
- * $FreeBSD: src/sys/sys/queue.h,v 1.60.2.1 2005/08/16 22:41:39 phk Exp $
+ * $FreeBSD: releng/11.1/sys/sys/queue.h 307533 2016-10-17 21:44:41Z mckusick $
  */
+
 #ifndef _SYS_QUEUE_H_
 #define        _SYS_QUEUE_H_
 
@@ -64,7 +65,7 @@
  * so that an arbitrary element can be removed without a need to
  * traverse the list. New elements can be added to the list before
  * or after an existing element or at the head of the list. A list
- * may only be traversed in the forward direction.
+ * may be traversed in either direction.
  *
  * A tail queue is headed by a pair of pointers, one to the head of the
  * list and the other to the tail of the list. The elements are doubly
@@ -75,42 +76,55 @@
  *
  * For details on the use of these macros, see the queue(3) manual page.
  *
+ * Below is a summary of implemented functions where:
+ *  +  means the macro is available
+ *  -  means the macro is not available
+ *  s  means the macro is available but is slow (runs in O(n) time)
  *
  *                             SLIST   LIST    STAILQ  TAILQ
  * _HEAD                       +       +       +       +
+ * _CLASS_HEAD                 +       +       +       +
  * _HEAD_INITIALIZER           +       +       +       +
  * _ENTRY                      +       +       +       +
+ * _CLASS_ENTRY                        +       +       +       +
  * _INIT                       +       +       +       +
  * _EMPTY                      +       +       +       +
  * _FIRST                      +       +       +       +
  * _NEXT                       +       +       +       +
- * _PREV                       -       -       -       +
+ * _PREV                       -       +       -       +
  * _LAST                       -       -       +       +
  * _FOREACH                    +       +       +       +
+ * _FOREACH_FROM               +       +       +       +
  * _FOREACH_SAFE               +       +       +       +
+ * _FOREACH_FROM_SAFE          +       +       +       +
  * _FOREACH_REVERSE            -       -       -       +
+ * _FOREACH_REVERSE_FROM       -       -       -       +
  * _FOREACH_REVERSE_SAFE       -       -       -       +
+ * _FOREACH_REVERSE_FROM_SAFE  -       -       -       +
  * _INSERT_HEAD                        +       +       +       +
  * _INSERT_BEFORE              -       +       -       +
  * _INSERT_AFTER               +       +       +       +
  * _INSERT_TAIL                        -       -       +       +
- * _CONCAT                     -       -       +       +
+ * _CONCAT                     s       s       +       +
+ * _REMOVE_AFTER               +       -       +       -
  * _REMOVE_HEAD                        +       -       +       -
- * _REMOVE                     +       +       +       +
+ * _REMOVE                     s       +       s       +
+ * _SWAP                       +       +       +       +
  *
  */
-#define        QUEUE_MACRO_DEBUG 0
-#if QUEUE_MACRO_DEBUG
+#ifdef QUEUE_MACRO_DEBUG
 /* Store the last 2 places the queue element or head was altered */
 struct qm_trace {
-       char * lastfile;
-       int lastline;
-       char * prevfile;
-       int prevline;
+       unsigned long    lastline;
+       unsigned long    prevline;
+       const char      *lastfile;
+       const char      *prevfile;
 };
 
 #define        TRACEBUF        struct qm_trace trace;
+#define        TRACEBUF_INITIALIZER    { __LINE__, 0, __FILE__, NULL } ,
 #define        TRASHIT(x)      do {(x) = (void *)-1;} while (0)
+#define        QMD_SAVELINK(name, link)        void **name = (void *)&(link)
 
 #define        QMD_TRACE_HEAD(head) do {                                       
\
        (head)->trace.prevline = (head)->trace.lastline;                \
@@ -129,10 +143,21 @@ struct qm_trace {
 #else
 #define        QMD_TRACE_ELEM(elem)
 #define        QMD_TRACE_HEAD(head)
+#define        QMD_SAVELINK(name, link)
 #define        TRACEBUF
+#define        TRACEBUF_INITIALIZER
 #define        TRASHIT(x)
 #endif /* QUEUE_MACRO_DEBUG */
 
+#ifdef __cplusplus
+/*
+ * In C++ there can be structure lists and class lists:
+ */
+#define        QUEUE_TYPEOF(type) type
+#else
+#define        QUEUE_TYPEOF(type) struct type
+#endif
+
 /*
  * Singly-linked List declarations.
  */
@@ -141,6 +166,11 @@ struct name {                                              
                \
        struct type *slh_first; /* first element */                     \
 }
 
+#define        SLIST_CLASS_HEAD(name, type)                                    
\
+struct name {                                                          \
+       class type *slh_first;  /* first element */                     \
+}
+
 #define        SLIST_HEAD_INITIALIZER(head)                                    
\
        { NULL }
 
@@ -149,9 +179,27 @@ struct {                                                   
        \
        struct type *sle_next;  /* next element */                      \
 }
 
+#define        SLIST_CLASS_ENTRY(type)                                         
\
+struct {                                                               \
+       class type *sle_next;           /* next element */              \
+}
+
 /*
  * Singly-linked List functions.
  */
+#define SLIST_CONCAT(head1, head2, type, field) do {                   \
+       QUEUE_TYPEOF(type) *curelm = SLIST_FIRST(head1);                \
+       if (curelm == NULL) {                                           \
+               if ((SLIST_FIRST(head1) = SLIST_FIRST(head2)) != NULL)  \
+                       SLIST_INIT(head2);                              \
+       } else if (SLIST_FIRST(head2) != NULL) {                        \
+               while (SLIST_NEXT(curelm, field) != NULL)               \
+                       curelm = SLIST_NEXT(curelm, field);             \
+               SLIST_NEXT(curelm, field) = SLIST_FIRST(head2);         \
+               SLIST_INIT(head2);                                      \
+       }                                                               \
+} while (0)
+
 #define        SLIST_EMPTY(head)       ((head)->slh_first == NULL)
 
 #define        SLIST_FIRST(head)       ((head)->slh_first)
@@ -161,11 +209,21 @@ struct {                                                  
        \
            (var);                                                      \
            (var) = SLIST_NEXT((var), field))
 
+#define        SLIST_FOREACH_FROM(var, head, field)                            
\
+       for ((var) = ((var) ? (var) : SLIST_FIRST((head)));             \
+           (var);                                                      \
+           (var) = SLIST_NEXT((var), field))
+
 #define        SLIST_FOREACH_SAFE(var, head, field, tvar)                      
\
        for ((var) = SLIST_FIRST((head));                               \
            (var) && ((tvar) = SLIST_NEXT((var), field), 1);            \
            (var) = (tvar))
 
+#define        SLIST_FOREACH_FROM_SAFE(var, head, field, tvar)                 
\
+       for ((var) = ((var) ? (var) : SLIST_FIRST((head)));             \
+           (var) && ((tvar) = SLIST_NEXT((var), field), 1);            \
+           (var) = (tvar))
+
 #define        SLIST_FOREACH_PREVPTR(var, varp, head, field)                   
\
        for ((varp) = &SLIST_FIRST((head));                             \
            ((var) = *(varp)) != NULL;                                  \
@@ -188,22 +246,34 @@ struct {                                                  
        \
 #define        SLIST_NEXT(elm, field)  ((elm)->field.sle_next)
 
 #define        SLIST_REMOVE(head, elm, type, field) do {                       
\
+       QMD_SAVELINK(oldnext, (elm)->field.sle_next);                   \
        if (SLIST_FIRST((head)) == (elm)) {                             \
                SLIST_REMOVE_HEAD((head), field);                       \
        }                                                               \
        else {                                                          \
-               struct type *curelm = SLIST_FIRST((head));              \
+               QUEUE_TYPEOF(type) *curelm = SLIST_FIRST(head);         \
                while (SLIST_NEXT(curelm, field) != (elm))              \
                        curelm = SLIST_NEXT(curelm, field);             \
-               SLIST_NEXT(curelm, field) =                             \
-                   SLIST_NEXT(SLIST_NEXT(curelm, field), field);       \
+               SLIST_REMOVE_AFTER(curelm, field);                      \
        }                                                               \
+       TRASHIT(*oldnext);                                              \
+} while (0)
+
+#define SLIST_REMOVE_AFTER(elm, field) do {                            \
+       SLIST_NEXT(elm, field) =                                        \
+           SLIST_NEXT(SLIST_NEXT(elm, field), field);                  \
 } while (0)
 
 #define        SLIST_REMOVE_HEAD(head, field) do {                             
\
        SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field);   \
 } while (0)
 
+#define SLIST_SWAP(head1, head2, type) do {                            \
+       QUEUE_TYPEOF(type) *swap_first = SLIST_FIRST(head1);            \
+       SLIST_FIRST(head1) = SLIST_FIRST(head2);                        \
+       SLIST_FIRST(head2) = swap_first;                                \
+} while (0)
+
 /*
  * Singly-linked Tail queue declarations.
  */
@@ -213,6 +283,12 @@ struct name {                                              
                \
        struct type **stqh_last;/* addr of last next element */         \
 }
 
+#define        STAILQ_CLASS_HEAD(name, type)                                   
\
+struct name {                                                          \
+       class type *stqh_first; /* first element */                     \
+       class type **stqh_last; /* addr of last next element */         \
+}
+
 #define        STAILQ_HEAD_INITIALIZER(head)                                   
\
        { NULL, &(head).stqh_first }
 
@@ -221,6 +297,11 @@ struct {                                                   
        \
        struct type *stqe_next; /* next element */                      \
 }
 
+#define        STAILQ_CLASS_ENTRY(type)                                        
\
+struct {                                                               \
+       class type *stqe_next;  /* next element */                      \
+}
+
 /*
  * Singly-linked Tail queue functions.
  */
@@ -241,12 +322,21 @@ struct {                                                  
        \
           (var);                                                       \
           (var) = STAILQ_NEXT((var), field))
 
+#define        STAILQ_FOREACH_FROM(var, head, field)                           
\
+       for ((var) = ((var) ? (var) : STAILQ_FIRST((head)));            \
+          (var);                                                       \
+          (var) = STAILQ_NEXT((var), field))
 
 #define        STAILQ_FOREACH_SAFE(var, head, field, tvar)                     
\
        for ((var) = STAILQ_FIRST((head));                              \
            (var) && ((tvar) = STAILQ_NEXT((var), field), 1);           \
            (var) = (tvar))
 
+#define        STAILQ_FOREACH_FROM_SAFE(var, head, field, tvar)                
\
+       for ((var) = ((var) ? (var) : STAILQ_FIRST((head)));            \
+           (var) && ((tvar) = STAILQ_NEXT((var), field), 1);           \
+           (var) = (tvar))
+
 #define        STAILQ_INIT(head) do {                                          
\
        STAILQ_FIRST((head)) = NULL;                                    \
        (head)->stqh_last = &STAILQ_FIRST((head));                      \
@@ -270,26 +360,31 @@ struct {                                                  
        \
        (head)->stqh_last = &STAILQ_NEXT((elm), field);                 \
 } while (0)
 
-#define        STAILQ_LAST(head, type, field)                                  
\
-       (STAILQ_EMPTY((head)) ?                                         \
-               NULL :                                                  \
-               ((struct type *)                                        \
-               ((char *)((head)->stqh_last) - __offsetof(struct type, field))))
+#define        STAILQ_LAST(head, type, field)                          \
+       (STAILQ_EMPTY((head)) ? NULL :                          \
+           __containerof((head)->stqh_last,                    \
+           QUEUE_TYPEOF(type), field.stqe_next))
 
 #define        STAILQ_NEXT(elm, field) ((elm)->field.stqe_next)
 
 #define        STAILQ_REMOVE(head, elm, type, field) do {                      
\
+       QMD_SAVELINK(oldnext, (elm)->field.stqe_next);                  \
        if (STAILQ_FIRST((head)) == (elm)) {                            \
                STAILQ_REMOVE_HEAD((head), field);                      \
        }                                                               \
        else {                                                          \
-               struct type *curelm = STAILQ_FIRST((head));             \
+               QUEUE_TYPEOF(type) *curelm = STAILQ_FIRST(head);        \
                while (STAILQ_NEXT(curelm, field) != (elm))             \
                        curelm = STAILQ_NEXT(curelm, field);            \
-               if ((STAILQ_NEXT(curelm, field) =                       \
-                    STAILQ_NEXT(STAILQ_NEXT(curelm, field), field)) == NULL)\
-                       (head)->stqh_last = &STAILQ_NEXT((curelm), field);\
+               STAILQ_REMOVE_AFTER(head, curelm, field);               \
        }                                                               \
+       TRASHIT(*oldnext);                                              \
+} while (0)
+
+#define STAILQ_REMOVE_AFTER(head, elm, field) do {                     \
+       if ((STAILQ_NEXT(elm, field) =                                  \
+            STAILQ_NEXT(STAILQ_NEXT(elm, field), field)) == NULL)      \
+               (head)->stqh_last = &STAILQ_NEXT((elm), field);         \
 } while (0)
 
 #define        STAILQ_REMOVE_HEAD(head, field) do {                            
\
@@ -298,11 +393,20 @@ struct {                                                  
        \
                (head)->stqh_last = &STAILQ_FIRST((head));              \
 } while (0)
 
-#define        STAILQ_REMOVE_HEAD_UNTIL(head, elm, field) do {                 
\
-       if ((STAILQ_FIRST((head)) = STAILQ_NEXT((elm), field)) == NULL) \
-               (head)->stqh_last = &STAILQ_FIRST((head));              \
+#define STAILQ_SWAP(head1, head2, type) do {                           \
+       QUEUE_TYPEOF(type) *swap_first = STAILQ_FIRST(head1);           \
+       QUEUE_TYPEOF(type) **swap_last = (head1)->stqh_last;            \
+       STAILQ_FIRST(head1) = STAILQ_FIRST(head2);                      \
+       (head1)->stqh_last = (head2)->stqh_last;                        \
+       STAILQ_FIRST(head2) = swap_first;                               \
+       (head2)->stqh_last = swap_last;                                 \
+       if (STAILQ_EMPTY(head1))                                        \
+               (head1)->stqh_last = &STAILQ_FIRST(head1);              \
+       if (STAILQ_EMPTY(head2))                                        \
+               (head2)->stqh_last = &STAILQ_FIRST(head2);              \
 } while (0)
 
+
 /*
  * List declarations.
  */
@@ -311,6 +415,11 @@ struct name {                                              
                \
        struct type *lh_first;  /* first element */                     \
 }
 
+#define        LIST_CLASS_HEAD(name, type)                                     
\
+struct name {                                                          \
+       class type *lh_first;   /* first element */                     \
+}
+
 #define        LIST_HEAD_INITIALIZER(head)                                     
\
        { NULL }
 
@@ -320,10 +429,58 @@ struct {                                                  
        \
        struct type **le_prev;  /* address of previous next element */  \
 }
 
+#define        LIST_CLASS_ENTRY(type)                                          
\
+struct {                                                               \
+       class type *le_next;    /* next element */                      \
+       class type **le_prev;   /* address of previous next element */  \
+}
+
 /*
  * List functions.
  */
 
+#if (defined(_KERNEL) && defined(INVARIANTS))
+#define        QMD_LIST_CHECK_HEAD(head, field) do {                           
\
+       if (LIST_FIRST((head)) != NULL &&                               \
+           LIST_FIRST((head))->field.le_prev !=                        \
+            &LIST_FIRST((head)))                                       \
+               panic("Bad list head %p first->prev != head", (head));  \
+} while (0)
+
+#define        QMD_LIST_CHECK_NEXT(elm, field) do {                            
\
+       if (LIST_NEXT((elm), field) != NULL &&                          \
+           LIST_NEXT((elm), field)->field.le_prev !=                   \
+            &((elm)->field.le_next))                                   \
+               panic("Bad link elm %p next->prev != elm", (elm));      \
+} while (0)
+
+#define        QMD_LIST_CHECK_PREV(elm, field) do {                            
\
+       if (*(elm)->field.le_prev != (elm))                             \
+               panic("Bad link elm %p prev->next != elm", (elm));      \
+} while (0)
+#else
+#define        QMD_LIST_CHECK_HEAD(head, field)
+#define        QMD_LIST_CHECK_NEXT(elm, field)
+#define        QMD_LIST_CHECK_PREV(elm, field)
+#endif /* (_KERNEL && INVARIANTS) */
+
+#define LIST_CONCAT(head1, head2, type, field) do {                          \
+       QUEUE_TYPEOF(type) *curelm = LIST_FIRST(head1);                       \
+       if (curelm == NULL) {                                                 \
+               if ((LIST_FIRST(head1) = LIST_FIRST(head2)) != NULL) {        \
+                       LIST_FIRST(head2)->field.le_prev =                    \
+                           &LIST_FIRST((head1));                             \
+                       LIST_INIT(head2);                                     \
+               }                                                             \
+       } else if (LIST_FIRST(head2) != NULL) {                               \
+               while (LIST_NEXT(curelm, field) != NULL)                      \
+                       curelm = LIST_NEXT(curelm, field);                    \
+               LIST_NEXT(curelm, field) = LIST_FIRST(head2);                 \
+               LIST_FIRST(head2)->field.le_prev = &LIST_NEXT(curelm, field); \
+               LIST_INIT(head2);                                             \
+       }                                                                     \
+} while (0)
+
 #define        LIST_EMPTY(head)        ((head)->lh_first == NULL)
 
 #define        LIST_FIRST(head)        ((head)->lh_first)
@@ -333,16 +490,27 @@ struct {                                                  
        \
            (var);                                                      \
            (var) = LIST_NEXT((var), field))
 
+#define        LIST_FOREACH_FROM(var, head, field)                             
\
+       for ((var) = ((var) ? (var) : LIST_FIRST((head)));              \
+           (var);                                                      \
+           (var) = LIST_NEXT((var), field))
+
 #define        LIST_FOREACH_SAFE(var, head, field, tvar)                       
\
        for ((var) = LIST_FIRST((head));                                \
            (var) && ((tvar) = LIST_NEXT((var), field), 1);             \
            (var) = (tvar))
 
+#define        LIST_FOREACH_FROM_SAFE(var, head, field, tvar)                  
\
+       for ((var) = ((var) ? (var) : LIST_FIRST((head)));              \
+           (var) && ((tvar) = LIST_NEXT((var), field), 1);             \
+           (var) = (tvar))
+
 #define        LIST_INIT(head) do {                                            
\
        LIST_FIRST((head)) = NULL;                                      \
 } while (0)
 
 #define        LIST_INSERT_AFTER(listelm, elm, field) do {                     
\
+       QMD_LIST_CHECK_NEXT(listelm, field);                            \
        if ((LIST_NEXT((elm), field) = LIST_NEXT((listelm), field)) != NULL)\
                LIST_NEXT((listelm), field)->field.le_prev =            \
                    &LIST_NEXT((elm), field);                           \
@@ -351,6 +519,7 @@ struct {                                                    
        \
 } while (0)
 
 #define        LIST_INSERT_BEFORE(listelm, elm, field) do {                    
\
+       QMD_LIST_CHECK_PREV(listelm, field);                            \
        (elm)->field.le_prev = (listelm)->field.le_prev;                \
        LIST_NEXT((elm), field) = (listelm);                            \
        *(listelm)->field.le_prev = (elm);                              \
@@ -358,6 +527,7 @@ struct {                                                    
        \
 } while (0)
 
 #define        LIST_INSERT_HEAD(head, elm, field) do {                         
\
+       QMD_LIST_CHECK_HEAD((head), field);                             \
        if ((LIST_NEXT((elm), field) = LIST_FIRST((head))) != NULL)     \
                LIST_FIRST((head))->field.le_prev = &LIST_NEXT((elm), field);\
        LIST_FIRST((head)) = (elm);                                     \
@@ -366,11 +536,32 @@ struct {                                                  
        \
 
 #define        LIST_NEXT(elm, field)   ((elm)->field.le_next)
 
+#define        LIST_PREV(elm, head, type, field)                       \
+       ((elm)->field.le_prev == &LIST_FIRST((head)) ? NULL :   \
+           __containerof((elm)->field.le_prev,                 \
+           QUEUE_TYPEOF(type), field.le_next))
+
 #define        LIST_REMOVE(elm, field) do {                                    
\
+       QMD_SAVELINK(oldnext, (elm)->field.le_next);                    \
+       QMD_SAVELINK(oldprev, (elm)->field.le_prev);                    \
+       QMD_LIST_CHECK_NEXT(elm, field);                                \
+       QMD_LIST_CHECK_PREV(elm, field);                                \
        if (LIST_NEXT((elm), field) != NULL)                            \
                LIST_NEXT((elm), field)->field.le_prev =                \
                    (elm)->field.le_prev;                               \
        *(elm)->field.le_prev = LIST_NEXT((elm), field);                \
+       TRASHIT(*oldnext);                                              \
+       TRASHIT(*oldprev);                                              \
+} while (0)
+
+#define LIST_SWAP(head1, head2, type, field) do {                      \
+       QUEUE_TYPEOF(type) *swap_tmp = LIST_FIRST(head1);               \
+       LIST_FIRST((head1)) = LIST_FIRST((head2));                      \
+       LIST_FIRST((head2)) = swap_tmp;                                 \
+       if ((swap_tmp = LIST_FIRST((head1))) != NULL)                   \
+               swap_tmp->field.le_prev = &LIST_FIRST((head1));         \
+       if ((swap_tmp = LIST_FIRST((head2))) != NULL)                   \
+               swap_tmp->field.le_prev = &LIST_FIRST((head2));         \
 } while (0)
 
 /*
@@ -383,8 +574,15 @@ struct name {                                              
                \
        TRACEBUF                                                        \
 }
 
+#define        TAILQ_CLASS_HEAD(name, type)                                    
\
+struct name {                                                          \
+       class type *tqh_first;  /* first element */                     \
+       class type **tqh_last;  /* addr of last next element */         \
+       TRACEBUF                                                        \
+}
+
 #define        TAILQ_HEAD_INITIALIZER(head)                                    
\
-       { NULL, &(head).tqh_first }
+       { NULL, &(head).tqh_first, TRACEBUF_INITIALIZER }
 
 #define        TAILQ_ENTRY(type)                                               
\
 struct {                                                               \
@@ -393,9 +591,47 @@ struct {                                                   
        \
        TRACEBUF                                                        \
 }
 
+#define        TAILQ_CLASS_ENTRY(type)                                         
\
+struct {                                                               \
+       class type *tqe_next;   /* next element */                      \
+       class type **tqe_prev;  /* address of previous next element */  \
+       TRACEBUF                                                        \
+}
+
 /*
  * Tail queue functions.
  */
+#if (defined(_KERNEL) && defined(INVARIANTS))
+#define        QMD_TAILQ_CHECK_HEAD(head, field) do {                          
\
+       if (!TAILQ_EMPTY(head) &&                                       \
+           TAILQ_FIRST((head))->field.tqe_prev !=                      \
+            &TAILQ_FIRST((head)))                                      \
+               panic("Bad tailq head %p first->prev != head", (head)); \
+} while (0)
+
+#define        QMD_TAILQ_CHECK_TAIL(head, field) do {                          
\
+       if (*(head)->tqh_last != NULL)                                  \
+               panic("Bad tailq NEXT(%p->tqh_last) != NULL", (head));  \
+} while (0)
+
+#define        QMD_TAILQ_CHECK_NEXT(elm, field) do {                           
\
+       if (TAILQ_NEXT((elm), field) != NULL &&                         \
+           TAILQ_NEXT((elm), field)->field.tqe_prev !=                 \
+            &((elm)->field.tqe_next))                                  \
+               panic("Bad link elm %p next->prev != elm", (elm));      \
+} while (0)
+
+#define        QMD_TAILQ_CHECK_PREV(elm, field) do {                           
\
+       if (*(elm)->field.tqe_prev != (elm))                            \
+               panic("Bad link elm %p prev->next != elm", (elm));      \
+} while (0)
+#else
+#define        QMD_TAILQ_CHECK_HEAD(head, field)
+#define        QMD_TAILQ_CHECK_TAIL(head, headname)
+#define        QMD_TAILQ_CHECK_NEXT(elm, field)
+#define        QMD_TAILQ_CHECK_PREV(elm, field)
+#endif /* (_KERNEL && INVARIANTS) */
+
 #define        TAILQ_CONCAT(head1, head2, field) do {                          
\
        if (!TAILQ_EMPTY(head2)) {                                      \
                *(head1)->tqh_last = (head2)->tqh_first;                \
@@ -416,21 +652,41 @@ struct {                                                  
        \
            (var);                                                      \
            (var) = TAILQ_NEXT((var), field))
 
+#define        TAILQ_FOREACH_FROM(var, head, field)                            
\
+       for ((var) = ((var) ? (var) : TAILQ_FIRST((head)));             \
+           (var);                                                      \
+           (var) = TAILQ_NEXT((var), field))
+
 #define        TAILQ_FOREACH_SAFE(var, head, field, tvar)                      
\
        for ((var) = TAILQ_FIRST((head));                               \
            (var) && ((tvar) = TAILQ_NEXT((var), field), 1);            \
            (var) = (tvar))
 
+#define        TAILQ_FOREACH_FROM_SAFE(var, head, field, tvar)                 
\
+       for ((var) = ((var) ? (var) : TAILQ_FIRST((head)));             \
+           (var) && ((tvar) = TAILQ_NEXT((var), field), 1);            \
+           (var) = (tvar))
+
 #define        TAILQ_FOREACH_REVERSE(var, head, headname, field)               
\
        for ((var) = TAILQ_LAST((head), headname);                      \
            (var);                                                      \
            (var) = TAILQ_PREV((var), headname, field))
 
+#define        TAILQ_FOREACH_REVERSE_FROM(var, head, headname, field)          
\
+       for ((var) = ((var) ? (var) : TAILQ_LAST((head), headname));    \
+           (var);                                                      \
+           (var) = TAILQ_PREV((var), headname, field))
+
 #define        TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar)    
\
        for ((var) = TAILQ_LAST((head), headname);                      \
            (var) && ((tvar) = TAILQ_PREV((var), headname, field), 1);  \
            (var) = (tvar))
 
+#define        TAILQ_FOREACH_REVERSE_FROM_SAFE(var, head, headname, field, 
tvar) \
+       for ((var) = ((var) ? (var) : TAILQ_LAST((head), headname));    \
+           (var) && ((tvar) = TAILQ_PREV((var), headname, field), 1);  \
+           (var) = (tvar))
+
 #define        TAILQ_INIT(head) do {                                           
\
        TAILQ_FIRST((head)) = NULL;                                     \
        (head)->tqh_last = &TAILQ_FIRST((head));                        \
@@ -438,6 +694,7 @@ struct {                                                    
        \
 } while (0)
 
 #define        TAILQ_INSERT_AFTER(head, listelm, elm, field) do {              
\
+       QMD_TAILQ_CHECK_NEXT(listelm, field);                           \
        if ((TAILQ_NEXT((elm), field) = TAILQ_NEXT((listelm), field)) != NULL)\
                TAILQ_NEXT((elm), field)->field.tqe_prev =              \
                    &TAILQ_NEXT((elm), field);                          \
@@ -448,19 +705,21 @@ struct {                                                  
        \
        TAILQ_NEXT((listelm), field) = (elm);                           \
        (elm)->field.tqe_prev = &TAILQ_NEXT((listelm), field);          \
        QMD_TRACE_ELEM(&(elm)->field);                                  \
-       QMD_TRACE_ELEM(&listelm->field);                                \
+       QMD_TRACE_ELEM(&(listelm)->field);                              \
 } while (0)
 
 #define        TAILQ_INSERT_BEFORE(listelm, elm, field) do {                   
\
+       QMD_TAILQ_CHECK_PREV(listelm, field);                           \
        (elm)->field.tqe_prev = (listelm)->field.tqe_prev;              \
        TAILQ_NEXT((elm), field) = (listelm);                           \
        *(listelm)->field.tqe_prev = (elm);                             \
        (listelm)->field.tqe_prev = &TAILQ_NEXT((elm), field);          \
        QMD_TRACE_ELEM(&(elm)->field);                                  \
-       QMD_TRACE_ELEM(&listelm->field);                                \
+       QMD_TRACE_ELEM(&(listelm)->field);                              \
 } while (0)
 
 #define        TAILQ_INSERT_HEAD(head, elm, field) do {                        
\
+       QMD_TAILQ_CHECK_HEAD(head, field);                              \
        if ((TAILQ_NEXT((elm), field) = TAILQ_FIRST((head))) != NULL)   \
                TAILQ_FIRST((head))->field.tqe_prev =                   \
                    &TAILQ_NEXT((elm), field);                          \
@@ -473,6 +732,7 @@ struct {                                                    
        \
 } while (0)
 
 #define        TAILQ_INSERT_TAIL(head, elm, field) do {                        
\
+       QMD_TAILQ_CHECK_TAIL(head, field);                              \
        TAILQ_NEXT((elm), field) = NULL;                                \
        (elm)->field.tqe_prev = (head)->tqh_last;                       \
        *(head)->tqh_last = (elm);                                      \
@@ -490,6 +750,10 @@ struct {                                                   
        \
        (*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
 
 #define        TAILQ_REMOVE(head, elm, field) do {                             
\
+       QMD_SAVELINK(oldnext, (elm)->field.tqe_next);                   \
+       QMD_SAVELINK(oldprev, (elm)->field.tqe_prev);                   \
+       QMD_TAILQ_CHECK_NEXT(elm, field);                               \
+       QMD_TAILQ_CHECK_PREV(elm, field);                               \
        if ((TAILQ_NEXT((elm), field)) != NULL)                         \
                TAILQ_NEXT((elm), field)->field.tqe_prev =              \
                    (elm)->field.tqe_prev;                              \
@@ -498,55 +762,26 @@ struct {                                                  
        \
                QMD_TRACE_HEAD(head);                                   \
        }                                                               \
        *(elm)->field.tqe_prev = TAILQ_NEXT((elm), field);              \
-       TRASHIT((elm)->field.tqe_next);                                 \
-       TRASHIT((elm)->field.tqe_prev);                                 \
+       TRASHIT(*oldnext);                                              \
+       TRASHIT(*oldprev);                                              \
        QMD_TRACE_ELEM(&(elm)->field);                                  \
 } while (0)
 
-
-#ifdef _KERNEL
-
-/*
- * XXX insque() and remque() are an old way of handling certain queues.
- * They bogusly assumes that all queue heads look alike.
- */
-
-struct quehead {
-       struct quehead *qh_link;
-       struct quehead *qh_rlink;
-};
-
-#ifdef __CC_SUPPORTS___INLINE
-
-static __inline void
-insque(void *a, void *b)
-{
-       struct quehead *element = (struct quehead *)a,
-                *head = (struct quehead *)b;
-
-       element->qh_link = head->qh_link;
-       element->qh_rlink = head;
-       head->qh_link = element;
-       element->qh_link->qh_rlink = element;
-}
-
-static __inline void
-remque(void *a)
-{
-       struct quehead *element = (struct quehead *)a;
-
-       element->qh_link->qh_rlink = element->qh_rlink;
-       element->qh_rlink->qh_link = element->qh_link;
-       element->qh_rlink = 0;
-}
-
-#else /* !__CC_SUPPORTS___INLINE */
-
-void   insque(void *a, void *b);
-void   remque(void *a);
-
-#endif /* __CC_SUPPORTS___INLINE */
-
-#endif /* _KERNEL */
+#define TAILQ_SWAP(head1, head2, type, field) do {                     \
+       QUEUE_TYPEOF(type) *swap_first = (head1)->tqh_first;            \
+       QUEUE_TYPEOF(type) **swap_last = (head1)->tqh_last;             \
+       (head1)->tqh_first = (head2)->tqh_first;                        \
+       (head1)->tqh_last = (head2)->tqh_last;                          \
+       (head2)->tqh_first = swap_first;                                \
+       (head2)->tqh_last = swap_last;                                  \
+       if ((swap_first = (head1)->tqh_first) != NULL)                  \
+               swap_first->field.tqe_prev = &(head1)->tqh_first;       \
+       else                                                            \
+               (head1)->tqh_last = &(head1)->tqh_first;                \
+       if ((swap_first = (head2)->tqh_first) != NULL)                  \
+               swap_first->field.tqe_prev = &(head2)->tqh_first;       \
+       else                                                            \
+               (head2)->tqh_last = &(head2)->tqh_first;                \
+} while (0)
 
 #endif /* !_SYS_QUEUE_H_ */


Other related posts:

  • » [haiku-commits] haiku: hrev52103 - src/libs/compat/freebsd11_network/compat/sys - waddlesplash