Changes in kernel/generic/include/time/timeout.h [111b9b9:a6e55886] in mainline

File:

• kernel/generic/include/time/timeout.h (modified) (2 diffs)

kernel/generic/include/time/timeout.h

@@ -42 +42 @@
 typedef void (*timeout_handler_t)(void *arg);
 
-typedef uint64_t deadline_t;
-#define DEADLINE_NEVER ((deadline_t) UINT64_MAX)
+typedef struct {
+        IRQ_SPINLOCK_DECLARE(lock);
 
-typedef struct {
-        /** Link to the list of active timeouts on timeout->cpu */
+        /** Link to the list of active timeouts on CURRENT->cpu */
         link_t link;
-        /** Timeout will be activated when current clock tick reaches this value. */
-        deadline_t deadline;
+        /** Timeout will be activated in this amount of clock() ticks. */
+        uint64_t ticks;
         /** Function that will be called on timeout activation. */
         timeout_handler_t handler;
@@ -56 +55 @@
         /** On which processor is this timeout registered. */
         cpu_t *cpu;
-        /** Used to synchronize with the handler callback. */
-        atomic_bool finished;
 } timeout_t;
 
 #define us2ticks(us)  ((uint64_t) (((uint32_t) (us) / (1000000 / HZ))))
 
-extern deadline_t timeout_deadline_in_usec(uint32_t us);
-
 extern void timeout_init(void);
 extern void timeout_initialize(timeout_t *);
+extern void timeout_reinitialize(timeout_t *);
 extern void timeout_register(timeout_t *, uint64_t, timeout_handler_t, void *);
-extern void timeout_register_deadline(timeout_t *, deadline_t, timeout_handler_t, void *);
 extern bool timeout_unregister(timeout_t *);