Changeset 742f95ec in mainline

Timestamp:

2022-08-15T14:20:53Z (3 years ago)

Author:

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

Branches:

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

Children:

ad58fd2

Parents:

d9dda26

git-author:

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

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2022-08-15 14:20:53)

Message:

Replace timeout→ticks with timeout→deadline

Instead of counting down in the structure, use a fixed deadline number.
This simplifies the code significantly.

Location:

kernel/generic

Files:

• include/time/timeout.h (modified) (1 diff)
• src/time/clock.c (modified) (1 diff)
• src/time/timeout.c (modified) (5 diffs)

kernel/generic/include/time/timeout.h

@@ -47 +47 @@
         /** Link to the list of active timeouts on CURRENT->cpu */
         link_t link;
-        /** Timeout will be activated in this amount of clock() ticks. */
-        uint64_t ticks;
+        /** Timeout will be activated when current clock tick reaches this value. */
+        uint64_t deadline;
         /** Function that will be called on timeout activation. */
         timeout_handler_t handler;

kernel/generic/src/time/clock.c

@@ -164 +164 @@
 
                         irq_spinlock_lock(&timeout->lock, false);
-                        if (timeout->ticks-- != 0) {
+                        if (current_clock_tick <= timeout->deadline) {
                                 irq_spinlock_unlock(&timeout->lock, false);
                                 break;

kernel/generic/src/time/timeout.c

@@ -67 +67 @@
 {
         timeout->cpu = NULL;
-        timeout->ticks = 0;
+        timeout->deadline = 0;
         timeout->handler = NULL;
         timeout->arg = NULL;
@@ -108 +108 @@
 
         timeout->cpu = CPU;
-        timeout->ticks = us2ticks(time);
-
+        timeout->deadline = CPU->current_clock_tick + us2ticks(time);
         timeout->handler = handler;
         timeout->arg = arg;
 
         /*
-         * Insert timeout into the active timeouts list according to timeout->ticks.
+         * Insert timeout into the active timeouts list according to timeout->deadline.
          */
-        uint64_t sum = 0;
         timeout_t *target = NULL;
         link_t *cur, *prev;
@@ -125 +123 @@
                 irq_spinlock_lock(&target->lock, false);
 
-                if (timeout->ticks < sum + target->ticks) {
+                if (timeout->deadline < target->deadline) {
                         irq_spinlock_unlock(&target->lock, false);
                         break;
                 }
 
-                sum += target->ticks;
                 irq_spinlock_unlock(&target->lock, false);
                 prev = cur;
@@ -139 +136 @@
         else
                 list_insert_after(&timeout->link, prev);
-
-        /*
-         * Adjust timeout->ticks according to ticks
-         * accumulated in target's predecessors.
-         */
-        timeout->ticks -= sum;
-
-        /*
-         * Decrease ticks of timeout's immediate succesor by timeout->ticks.
-         */
-        if (cur != NULL) {
-                irq_spinlock_lock(&target->lock, false);
-                target->ticks -= timeout->ticks;
-                irq_spinlock_unlock(&target->lock, false);
-        }
 
         irq_spinlock_unlock(&timeout->lock, false);
@@ -195 +177 @@
                 timeout_t *tmp = list_get_instance(cur, timeout_t, link);
                 irq_spinlock_lock(&tmp->lock, false);
-                tmp->ticks += timeout->ticks;
                 irq_spinlock_unlock(&tmp->lock, false);
         }