Changeset f2cb80a in mainline for kernel/generic/src/interrupt/interrupt.c

Timestamp:

2024-02-23T17:57:23Z (15 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/interrupt/interrupt.c (modified) (2 diffs)

kernel/generic/src/interrupt/interrupt.c

@@ -114 +114 @@
 
         /* Account user cycles */
-        if (THREAD) {
-                irq_spinlock_lock(&THREAD->lock, false);
+        if (THREAD)
                 thread_update_accounting(true);
-                irq_spinlock_unlock(&THREAD->lock, false);
-        }
 
         /* Account CPU usage if it woke up from sleep */
-        if (CPU && CPU->idle) {
+        if (CPU && CPU_LOCAL->idle) {
                 uint64_t now = get_cycle();
-                atomic_time_increment(&CPU->idle_cycles, now - CPU->last_cycle);
-                CPU->last_cycle = now;
-                CPU->idle = false;
+                atomic_time_increment(&CPU->idle_cycles, now - CPU_LOCAL->last_cycle);
+                CPU_LOCAL->last_cycle = now;
+                CPU_LOCAL->idle = false;
         }
 
@@ -155 +152 @@
 
         /* Do not charge THREAD for exception cycles */
-        if (THREAD) {
-                irq_spinlock_lock(&THREAD->lock, false);
+        if (THREAD)
                 THREAD->last_cycle = end_cycle;
-                irq_spinlock_unlock(&THREAD->lock, false);
-        }
 #else
         panic("No space for any exception handler, yet we want to handle some exception.");