Changeset 61ae4b0 in mainline

Timestamp:

2022-08-15T17:19:55Z (2 years ago)

Author:

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

Branches:

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

Children:

ab855cd

Parents:

46b305a

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2022-08-15 17:04:19)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2022-08-15 17:19:55)

Message:

A bit of cleanup

Location:

kernel/generic

Files:

• include/cpu.h (modified) (1 diff)
• src/time/timeout.c (modified) (2 diffs)

kernel/generic/include/cpu.h

@@ -74 +74 @@
         size_t missed_clock_ticks;
 
+        /** Can only be accessed when interrupts are disabled. */
         uint64_t current_clock_tick;
 

kernel/generic/src/time/timeout.c

@@ -87 +87 @@
         irq_spinlock_lock(&CPU->timeoutlock, true);
 
+        assert(!link_in_use(&timeout->link));
+
         timeout->cpu = CPU;
         timeout->deadline = CPU->current_clock_tick + us2ticks(time);
@@ -92 +94 @@
         timeout->arg = arg;
 
-        /*
-         * Insert timeout into the active timeouts list according to timeout->deadline.
-         */
-        timeout_t *target = NULL;
-        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);
+        /* Insert timeout into the active timeouts list according to timeout->deadline. */
 
-                if (timeout->deadline < target->deadline)
-                        break;
+        link_t *last = list_last(&CPU->timeout_active_list);
+        if (last == NULL || timeout->deadline >= list_get_instance(last, timeout_t, link)->deadline) {
+                list_append(&timeout->link, &CPU->timeout_active_list);
+        } else {
+                for (link_t *cur = list_first(&CPU->timeout_active_list); cur != NULL;
+                    cur = list_next(cur, &CPU->timeout_active_list)) {
 
-                prev = cur;
+                        if (timeout->deadline < list_get_instance(cur, timeout_t, link)->deadline) {
+                                list_insert_before(&timeout->link, cur);
+                                break;
+                        }
+                }
         }
-
-        if (prev == NULL)
-                list_prepend(&timeout->link, &CPU->timeout_active_list);
-        else
-                list_insert_after(&timeout->link, prev);
 
         irq_spinlock_unlock(&CPU->timeoutlock, true);