Changeset 111b9b9 in mainline for kernel/generic/src/time/timeout.c

Timestamp:

2023-02-11T19:13:44Z (20 months ago)

Author:

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

Branches:

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

Children:

4777e02

Parents:

76e17d7c

git-author:

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

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-02-11 19:13:44)

Message:

Reimplement waitq using thread_wait/wakeup

This adds a few functions to the thread API which can be
summarized as "stop running until woken up by others".
The ordering and context-switching concerns are thus yeeted
to this abstraction and waitq only deals with maintaining
the queues. Overall, this makes the control flow in waitq
much easier to navigate.

File:

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

kernel/generic/src/time/timeout.c

@@ -71 +71 @@
 }
 
-/** Register timeout
- *
- * Insert timeout handler f (with argument arg)
- * to timeout list and make it execute in
- * time microseconds (or slightly more).
- *
- * @param timeout Timeout structure.
- * @param time    Number of usec in the future to execute the handler.
- * @param handler Timeout handler function.
- * @param arg     Timeout handler argument.
- *
- */
-void timeout_register(timeout_t *timeout, uint64_t time,
+/* Only call when interrupts are disabled. */
+deadline_t timeout_deadline_in_usec(uint32_t usec)
+{
+        if (usec == 0)
+                return 0;
+
+        return CPU->current_clock_tick + us2ticks(usec);
+}
+
+static void timeout_register_deadline_locked(timeout_t *timeout, deadline_t deadline,
     timeout_handler_t handler, void *arg)
 {
-        irq_spinlock_lock(&CPU->timeoutlock, true);
-
         assert(!link_in_use(&timeout->link));
 
         *timeout = (timeout_t) {
                 .cpu = CPU,
-                .deadline = CPU->current_clock_tick + us2ticks(time),
+                .deadline = deadline,
                 .handler = handler,
                 .arg = arg,
@@ -113 +108 @@
                 }
         }
+}
 
+/** Register timeout
+ *
+ * Insert timeout handler f (with argument arg)
+ * to timeout list and make it execute in
+ * time microseconds (or slightly more).
+ *
+ * @param timeout Timeout structure.
+ * @param time    Number of usec in the future to execute the handler.
+ * @param handler Timeout handler function.
+ * @param arg     Timeout handler argument.
+ *
+ */
+void timeout_register(timeout_t *timeout, uint64_t time,
+    timeout_handler_t handler, void *arg)
+{
+        irq_spinlock_lock(&CPU->timeoutlock, true);
+        timeout_register_deadline_locked(timeout, timeout_deadline_in_usec(time), handler, arg);
+        irq_spinlock_unlock(&CPU->timeoutlock, true);
+}
+
+void timeout_register_deadline(timeout_t *timeout, deadline_t deadline,
+    timeout_handler_t handler, void *arg)
+{
+        irq_spinlock_lock(&CPU->timeoutlock, true);
+        timeout_register_deadline_locked(timeout, deadline, handler, arg);
         irq_spinlock_unlock(&CPU->timeoutlock, true);
 }