Changeset 95c675b in mainline for uspace/lib/c/include/adt/list.h

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline

File:

• uspace/lib/c/include/adt/list.h (modified) (16 diffs)

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

@@ -40 +40 @@
 #include <stdbool.h>
 #include <stddef.h>
+#include <trace.h>
 
 /** Doubly linked list link. */
@@ -51 +52 @@
         link_t head;  /**< List head. Does not have any data. */
 } list_t;
+
+extern bool list_member(const link_t *, const list_t *);
+extern void list_splice(list_t *, link_t *);
+extern unsigned long list_count(const list_t *);
 
 /** Declare and initialize statically allocated list.
@@ -88 +93 @@
 #define list_foreach(list, member, itype, iterator) \
         for (itype *iterator = NULL; iterator == NULL; iterator = (itype *) 1) \
-            for (link_t *_link = (list).head.next; \
-            iterator = list_get_instance(_link, itype, member), \
-            _link != &(list).head; _link = _link->next)
+                for (link_t *_link = (list).head.next; \
+                    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)
+                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.
@@ -125 +130 @@
 #define list_foreach_safe(list, iterator, next_iter) \
         for (link_t *iterator = (list).head.next, \
-                *next_iter = iterator->next; \
-                iterator != &(list).head; \
-                iterator = next_iter, next_iter = iterator->next)
+            *next_iter = iterator->next; \
+            iterator != &(list).head; \
+            iterator = next_iter, next_iter = iterator->next)
 
 #define assert_link_not_used(link) \
@@ -145 +150 @@
  *
  */
-static inline void link_initialize(link_t *link)
+NO_TRACE static inline void link_initialize(link_t *link)
 {
         link->prev = NULL;
@@ -158 +163 @@
  *
  */
-static inline void list_initialize(list_t *list)
+NO_TRACE static inline void list_initialize(list_t *list)
 {
         list->head.prev = &list->head;
@@ -194 +199 @@
  *
  */
-static inline void list_prepend(link_t *link, list_t *list)
+NO_TRACE static inline void list_prepend(link_t *link, list_t *list)
 {
         list_insert_after(link, &list->head);
@@ -207 +212 @@
  *
  */
-static inline void list_append(link_t *link, list_t *list)
+NO_TRACE static inline void list_append(link_t *link, list_t *list)
 {
         list_insert_before(link, &list->head);
@@ -220 +225 @@
  *
  */
-static inline void list_remove(link_t *link)
+NO_TRACE static inline void list_remove(link_t *link)
 {
         if ((link->prev != NULL) && (link->next != NULL)) {
@@ -237 +242 @@
  *
  */
-static inline bool list_empty(const list_t *list)
+NO_TRACE static inline bool list_empty(const list_t *list)
 {
         return (list->head.next == &list->head);
@@ -274 +279 @@
  *
  * @return Next item or NULL if @a link is the last item.
- *
  */
 static inline link_t *list_next(const link_t *link, const list_t *list)
@@ -287 +291 @@
  *
  * @return Previous item or NULL if @a link is the first item.
- *
  */
 static inline link_t *list_prev(const link_t *link, const list_t *list)
@@ -307 +310 @@
  *
  */
-static inline void headless_list_split_or_concat(link_t *part1, link_t *part2)
+NO_TRACE static inline void headless_list_split_or_concat(link_t *part1, link_t *part2)
 {
         part1->prev->next = part2;
@@ -328 +331 @@
  *
  */
-static inline void headless_list_split(link_t *part1, link_t *part2)
+NO_TRACE static inline void headless_list_split(link_t *part1, link_t *part2)
 {
         headless_list_split_or_concat(part1, part2);
@@ -343 +346 @@
  *
  */
-static inline void headless_list_concat(link_t *part1, link_t *part2)
+NO_TRACE static inline void headless_list_concat(link_t *part1, link_t *part2)
 {
         headless_list_split_or_concat(part1, part2);
+}
+
+/** Concatenate two lists
+ *
+ * Concatenate lists @a list1 and @a list2, producing a single
+ * list @a list1 containing items from both (in @a list1, @a list2
+ * order) and empty list @a list2.
+ *
+ * @param list1         First list and concatenated output
+ * @param list2         Second list and empty output.
+ *
+ */
+NO_TRACE static inline void list_concat(list_t *list1, list_t *list2)
+{
+        list_splice(list2, list1->head.prev);
 }
 
@@ -396 +414 @@
 }
 
-extern bool list_member(const link_t *, const list_t *);
-extern void list_concat(list_t *, list_t *);
-extern unsigned long list_count(const list_t *);
-
 #endif