X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=lib%2Flist.h;h=0da082e51ba467823ababbce60303a39b381b23b;hb=e379e4d167e31d1cd5f7b86fff091a2e09ff6e45;hp=0481477ae0934a4f32c6302e6282a25137f94811;hpb=4e8e4213a815a30216e855a805a8bcd5b8c5a886;p=sliver-openvswitch.git

diff --git a/lib/list.h b/lib/list.h
index 0481477ae..0da082e51 100644
--- a/lib/list.h
+++ b/lib/list.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2013 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@ struct list {
 #define LIST_INITIALIZER(LIST) { LIST, LIST }
 
 void list_init(struct list *);
+void list_poison(struct list *);
 
 /* List insertion. */
 void list_insert(struct list *, struct list *);
@@ -39,6 +40,7 @@ void list_push_front(struct list *, struct list *);
 void list_push_back(struct list *, struct list *);
 void list_replace(struct list *, const struct list *);
 void list_moved(struct list *);
+void list_move(struct list *dst, struct list *src);
 
 /* List removal. */
 struct list *list_remove(struct list *);
@@ -46,25 +48,36 @@ struct list *list_pop_front(struct list *);
 struct list *list_pop_back(struct list *);
 
 /* List elements. */
-struct list *list_front(struct list *);
-struct list *list_back(struct list *);
+struct list *list_front(const struct list *);
+struct list *list_back(const struct list *);
 
 /* List properties. */
 size_t list_size(const struct list *);
 bool list_is_empty(const struct list *);
+bool list_is_singleton(const struct list *);
+bool list_is_short(const struct list *);
 
 #define LIST_FOR_EACH(ITER, MEMBER, LIST)                               \
-    for (ITER = OBJECT_CONTAINING((LIST)->next, ITER, MEMBER);          \
+    for (ASSIGN_CONTAINER(ITER, (LIST)->next, MEMBER);                  \
          &(ITER)->MEMBER != (LIST);                                     \
-         ITER = OBJECT_CONTAINING((ITER)->MEMBER.next, ITER, MEMBER))
+         ASSIGN_CONTAINER(ITER, (ITER)->MEMBER.next, MEMBER))
+#define LIST_FOR_EACH_CONTINUE(ITER, MEMBER, LIST)                      \
+    for (ASSIGN_CONTAINER(ITER, (ITER)->MEMBER.next, MEMBER);           \
+         &(ITER)->MEMBER != (LIST);                                     \
+         ASSIGN_CONTAINER(ITER, (ITER)->MEMBER.next, MEMBER))
 #define LIST_FOR_EACH_REVERSE(ITER, MEMBER, LIST)                       \
-    for (ITER = OBJECT_CONTAINING((LIST)->prev, ITER, MEMBER);          \
+    for (ASSIGN_CONTAINER(ITER, (LIST)->prev, MEMBER);                  \
+         &(ITER)->MEMBER != (LIST);                                     \
+         ASSIGN_CONTAINER(ITER, (ITER)->MEMBER.prev, MEMBER))
+#define LIST_FOR_EACH_REVERSE_CONTINUE(ITER, MEMBER, LIST)              \
+    for (ASSIGN_CONTAINER(ITER, (ITER)->MEMBER.prev, MEMBER);           \
          &(ITER)->MEMBER != (LIST);                                     \
-         ITER = OBJECT_CONTAINING((ITER)->MEMBER.prev, ITER, MEMBER))
-#define LIST_FOR_EACH_SAFE(ITER, NEXT, MEMBER, LIST)                    \
-    for (ITER = OBJECT_CONTAINING((LIST)->next, ITER, MEMBER);          \
-         (NEXT = OBJECT_CONTAINING((ITER)->MEMBER.next, ITER, MEMBER),  \
-          &(ITER)->MEMBER != (LIST));                                   \
-         ITER = NEXT)
+         ASSIGN_CONTAINER(ITER, (ITER)->MEMBER.prev, MEMBER))
+#define LIST_FOR_EACH_SAFE(ITER, NEXT, MEMBER, LIST)               \
+    for (ASSIGN_CONTAINER(ITER, (LIST)->next, MEMBER);             \
+         (&(ITER)->MEMBER != (LIST)                                \
+          ? ASSIGN_CONTAINER(NEXT, (ITER)->MEMBER.next, MEMBER), 1 \
+          : 0);                                                    \
+         (ITER) = (NEXT))
 
 #endif /* list.h */