Changeset 583c2a3 in mainline for kernel/generic/src/time/timeout.c

Timestamp:

2020-07-06T22:58:19Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

37d4c91, ee2f0beb

Parents:

762f989

Message:

Avoid most cases of direct used of list_t.prev/next in kernel

File:

• kernel/generic/src/time/timeout.c (modified) (4 diffs)

kernel/generic/src/time/timeout.c

@@ -118 +118 @@
         uint64_t sum = 0;
         timeout_t *target = NULL;
-        link_t *cur;
-        for (cur = CPU->timeout_active_list.head.next;
-            cur != &CPU->timeout_active_list.head; cur = cur->next) {
+        link_t *cur, *prev;
+        prev = NULL;
+        for (cur = list_first(&CPU->timeout_active_list);
+            cur != NULL; cur = list_next(cur, &CPU->timeout_active_list)) {
                 target = list_get_instance(cur, timeout_t, link);
                 irq_spinlock_lock(&target->lock, false);
@@ -131 +132 @@
                 sum += target->ticks;
                 irq_spinlock_unlock(&target->lock, false);
-        }
-
-        /* Avoid using cur->prev directly */
-        link_t *prev = cur->prev;
-        list_insert_after(&timeout->link, prev);
+                prev = cur;
+        }
+
+        if (prev == NULL)
+                list_prepend(&timeout->link, &CPU->timeout_active_list);
+        else
+                list_insert_after(&timeout->link, prev);
 
         /*
@@ -146 +149 @@
          * Decrease ticks of timeout's immediate succesor by timeout->ticks.
          */
-        if (cur != &CPU->timeout_active_list.head) {
+        if (cur != NULL) {
                 irq_spinlock_lock(&target->lock, false);
                 target->ticks -= timeout->ticks;
@@ -187 +190 @@
          */
 
-        link_t *cur = timeout->link.next;
-        if (cur != &timeout->cpu->timeout_active_list.head) {
+        link_t *cur = list_next(&timeout->link,
+            &timeout->cpu->timeout_active_list);
+        if (cur != NULL) {
                 timeout_t *tmp = list_get_instance(cur, timeout_t, link);
                 irq_spinlock_lock(&tmp->lock, false);