foo

core/clock.c

@@ -1,4 +1,3 @@
-#include <zinnia/atomic.h>
 #include <zinnia/clock.h>
 #include <zinnia/compiler.h>
 #include <zinnia/print.h>
@@ -9,16 +8,25 @@ static struct clock* active_clock = nullptr;
 static uint64_t counter_base = 0;
 static struct spinlock lock = {};
 
+static uint64_t clock_get_elapsed_ns_locked() {
+    if (__unlikely(!active_clock))
+        return 0;
+
+    return counter_base + active_clock->get_elapsed_ns(active_clock);
+}
+
 bool clock_available() {
-    return active_clock != nullptr;
+    spin_lock(&lock);
+    bool available = active_clock != nullptr;
+    spin_unlock(&lock);
+    return available;
 }
 
 uint64_t clock_get_elapsed_ns() {
-    struct clock* active = atomic_load(&active_clock, ATOMIC_RELAXED);
-    if (__unlikely(!active))
-        return 0;
-
-    return atomic_load(&counter_base, ATOMIC_RELAXED) + active->get_elapsed_ns(active);
+    spin_lock(&lock);
+    uint64_t elapsed = clock_get_elapsed_ns_locked();
+    spin_unlock(&lock);
+    return elapsed;
 }
 
 bool clock_switch(struct clock* clock) {
@@ -33,16 +41,18 @@ bool clock_switch(struct clock* clock) {
 
     log("clock: Switching to clock source \"%s\"\n", clock->name);
 
-    uint64_t elapsed = clock_get_elapsed_ns();
-    counter_base += elapsed;
+    uint64_t elapsed = clock_get_elapsed_ns_locked();
+    clock->reset(clock);
 
+    counter_base = elapsed;
     active_clock = clock;
+
     spin_unlock(&lock);
     return true;
 }
 
 void clock_spin_ns(uint64_t ns) {
-    if (active_clock == nullptr) {
+    if (!clock_available()) {
         log("clock: Unable to sleep for %lu ns, no clock available!\n", ns);
         return;
     }