Changeset 72ac106 in mainline

Timestamp:

2023-03-21T17:31:07Z (13 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

3118355

Parents:

7cf5ddb

Message:

Add list_swap() for swapping lists

Files:

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

kernel/generic/include/adt/list.h

@@ -315 +315 @@
 _NO_TRACE static inline void headless_list_split_or_concat(link_t *part1, link_t *part2)
 {
+        if (part1 == NULL || part2 == NULL)
+                return;
+
         part1->prev->next = part2;
         part2->prev->next = part1;
@@ -354 +357 @@
 }
 
+/** Swap the contents of two lists.
+ *
+ * @param list1
+ * @param list2
+ */
+static inline void list_swap(list_t *list1, list_t *list2)
+{
+        link_t *first1 = list_first(list1);
+        link_t *first2 = list_first(list2);
+
+        /* Detach both lists from their heads. */
+        headless_list_split(&list1->head, first1);
+        headless_list_split(&list2->head, first2);
+
+        /* Attach both lists to their new heads. */
+        headless_list_concat(&list1->head, first2);
+        headless_list_concat(&list2->head, first1);
+}
+
 /** Concatenate two lists
  *

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

@@ -332 +332 @@
 _NO_TRACE static inline void headless_list_split_or_concat(link_t *part1, link_t *part2)
 {
+        if (part1 == NULL || part2 == NULL)
+                return;
+
         part1->prev->next = part2;
         part2->prev->next = part1;
@@ -371 +374 @@
 }
 
+/** Swap the contents of two lists.
+ *
+ * @param list1
+ * @param list2
+ */
+static inline void list_swap(list_t *list1, list_t *list2)
+{
+        link_t *first1 = list_first(list1);
+        link_t *first2 = list_first(list2);
+
+        /* Detach both lists from their heads. */
+        headless_list_split(&list1->head, first1);
+        headless_list_split(&list2->head, first2);
+
+        /* Attach both lists to their new heads. */
+        headless_list_concat(&list1->head, first2);
+        headless_list_concat(&list2->head, first1);
+}
+
 /** Concatenate two lists
  *