Changeset f2cb80a in mainline for kernel/generic/src/time/clock.c

Timestamp:

2024-02-23T17:57:23Z (11 months ago)

Author:

GitHub <noreply@…>

Children:

192019f

Parents:

86f862c (diff), 90ba06c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-02-23 17:57:23)

git-committer:

GitHub <noreply@…> (2024-02-23 17:57:23)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

• kernel/generic/src/time/clock.c (modified) (3 diffs)

kernel/generic/src/time/clock.c

@@ -123 +123 @@
 static void cpu_update_accounting(void)
 {
+        // FIXME: get_cycle() is unimplemented on several platforms
         uint64_t now = get_cycle();
-        atomic_time_increment(&CPU->busy_cycles, now - CPU->last_cycle);
-        CPU->last_cycle = now;
+        atomic_time_increment(&CPU->busy_cycles, now - CPU_LOCAL->last_cycle);
+        CPU_LOCAL->last_cycle = now;
 }
 
@@ -137 +138 @@
 void clock(void)
 {
-        size_t missed_clock_ticks = CPU->missed_clock_ticks;
-        CPU->missed_clock_ticks = 0;
-
-        CPU->current_clock_tick += missed_clock_ticks + 1;
-        uint64_t current_clock_tick = CPU->current_clock_tick;
+        size_t missed_clock_ticks = CPU_LOCAL->missed_clock_ticks;
+        CPU_LOCAL->missed_clock_ticks = 0;
+
+        CPU_LOCAL->current_clock_tick += missed_clock_ticks + 1;
+        uint64_t current_clock_tick = CPU_LOCAL->current_clock_tick;
         clock_update_counters(current_clock_tick);
 
@@ -186 +187 @@
 
         if (THREAD) {
-                if (current_clock_tick >= CPU->preempt_deadline && PREEMPTION_ENABLED) {
-                        scheduler();
+                if (current_clock_tick >= CPU_LOCAL->preempt_deadline && PREEMPTION_ENABLED) {
+                        thread_yield();
 #ifdef CONFIG_UDEBUG
                         /*