Changeset 7856d09 in mainline

Timestamp:

2013-11-12T09:16:04Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2764497, a0ff947

Parents:

34cb6c8

Message:

Reverse list iteration - list_foreach_rev() and link_used().

Files:

• kernel/generic/include/adt/list.h (modified) (3 diffs)
• uspace/lib/c/include/adt/list.h (modified) (4 diffs)

kernel/generic/include/adt/list.h

@@ -37 +37 @@
 #define KERN_LIST_H_
 
+#include <debug.h>
 #include <typedefs.h>
 #include <trace.h>
@@ -73 +74 @@
             _link != &(list).head; _link = _link->next)
 
+#define list_foreach_rev(list, member, itype, iterator) \
+        for (itype *iterator = NULL; iterator == NULL; iterator = (itype *) 1) \
+            for (link_t *_link = (list).head.prev; \
+            iterator = list_get_instance(_link, itype, member), \
+            _link != &(list).head; _link = _link->prev)
+
 #define assert_link_not_used(link) \
-        ASSERT(((link)->prev == NULL) && ((link)->next == NULL))
+        ASSERT(!link_used(link))
 
 /** Initialize doubly-linked circular list link
@@ -319 +326 @@
 }
 
+/** Determine if link is used.
+ *
+ * @param link Link
+ * @return @c true if link is used, @c false if not.
+ */
+static inline bool link_used(link_t *link)
+{
+        if (link->prev == NULL && link->next == NULL)
+                return false;
+
+        ASSERT(link->prev != NULL && link->next != NULL);
+        return true;
+}
+
 extern int list_member(const link_t *, const list_t *);
 extern void list_concat(list_t *, list_t *);

uspace/lib/c/include/adt/list.h

@@ -38 +38 @@
 
 #include <assert.h>
+#include <stdbool.h>
 #include <unistd.h>
 
@@ -72 +73 @@
             iterator = list_get_instance(_link, itype, member), \
             _link != &(list).head; _link = _link->next)
+
+#define list_foreach_rev(list, member, itype, iterator) \
+        for (itype *iterator = NULL; iterator == NULL; iterator = (itype *) 1) \
+            for (link_t *_link = (list).head.prev; \
+            iterator = list_get_instance(_link, itype, member), \
+            _link != &(list).head; _link = _link->prev)
 
 /** Unlike list_foreach(), allows removing items while traversing a list.
@@ -105 +112 @@
 
 #define assert_link_not_used(link) \
-        assert(((link)->prev == NULL) && ((link)->next == NULL))
+        assert(!link_used(link))
 
 /** Returns true if the link is definitely part of a list. False if not sure. */
@@ -357 +364 @@
 }
 
+/** Determine if link is used.
+ *
+ * @param link Link
+ * @return @c true if link is used, @c false if not.
+ */
+static inline bool link_used(link_t *link)
+{
+        if (link->prev == NULL && link->next == NULL)
+                return false;
+
+        assert(link->prev != NULL && link->next != NULL);
+        return true;
+}
+
 extern int list_member(const link_t *, const list_t *);
 extern void list_concat(list_t *, list_t *);