Changeset 46b305a in mainline

Timestamp:

2022-08-15T16:35:04Z (3 years ago)

Author:

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

Branches:

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

Children:

61ae4b0

Parents:

ad58fd2

Message:

Remove redundant timeout→lock

See the previous commit for explanation of why we can.

Location:

kernel/generic

Files:

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

kernel/generic/include/time/timeout.h

@@ -43 +43 @@
 
 typedef struct {
-        IRQ_SPINLOCK_DECLARE(lock);
-
         /** Link to the list of active timeouts on timeout->cpu */
         link_t link;

kernel/generic/src/time/clock.c

@@ -163 +163 @@
                             link);
 
-                        irq_spinlock_lock(&timeout->lock, false);
                         if (current_clock_tick <= timeout->deadline) {
-                                irq_spinlock_unlock(&timeout->lock, false);
                                 break;
                         }
@@ -173 +171 @@
                         void *arg = timeout->arg;
 
-                        irq_spinlock_unlock(&timeout->lock, false);
                         irq_spinlock_unlock(&CPU->timeoutlock, false);
 

kernel/generic/src/time/timeout.c

@@ -66 +66 @@
 void timeout_initialize(timeout_t *timeout)
 {
-        irq_spinlock_initialize(&timeout->lock, "timeout_t_lock");
         link_initialize(&timeout->link);
         timeout->cpu = NULL;
@@ -87 +86 @@
 {
         irq_spinlock_lock(&CPU->timeoutlock, true);
-        irq_spinlock_lock(&timeout->lock, false);
 
         timeout->cpu = CPU;
@@ -103 +101 @@
             cur != NULL; cur = list_next(cur, &CPU->timeout_active_list)) {
                 target = list_get_instance(cur, timeout_t, link);
-                irq_spinlock_lock(&target->lock, false);
 
-                if (timeout->deadline < target->deadline) {
-                        irq_spinlock_unlock(&target->lock, false);
+                if (timeout->deadline < target->deadline)
                         break;
-                }
 
-                irq_spinlock_unlock(&target->lock, false);
                 prev = cur;
         }
@@ -119 +113 @@
                 list_insert_after(&timeout->link, prev);
 
-        irq_spinlock_unlock(&timeout->lock, false);
         irq_spinlock_unlock(&CPU->timeoutlock, true);
 }