Changeset 11909ce3 in mainline for kernel/generic/src/proc/thread.c

Timestamp:

2024-01-21T15:48:43Z (4 months ago)

Author:

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

Branches:

master

Children:

515f1b1

Parents:

33e15a0

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-03-29 10:25:36)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2024-01-21 15:48:43)

Message:

Make thread cycle statistics atomic

File:

• kernel/generic/src/proc/thread.c (modified) (4 diffs)

kernel/generic/src/proc/thread.c

@@ -258 +258 @@
         thread->thread_code = func;
         thread->thread_arg = arg;
-        thread->ucycles = 0;
-        thread->kcycles = 0;
+        thread->ucycles = ATOMIC_TIME_INITIALIZER();
+        thread->kcycles = ATOMIC_TIME_INITIALIZER();
         thread->uncounted =
             ((flags & THREAD_FLAG_UNCOUNTED) == THREAD_FLAG_UNCOUNTED);
@@ -333 +333 @@
 
         if (!thread->uncounted) {
-                thread->task->ucycles += thread->ucycles;
-                thread->task->kcycles += thread->kcycles;
+                thread->task->ucycles += atomic_time_read(&thread->ucycles);
+                thread->task->kcycles += atomic_time_read(&thread->kcycles);
         }
 
@@ -682 +682 @@
         uint64_t ucycles, kcycles;
         char usuffix, ksuffix;
-        order_suffix(thread->ucycles, &ucycles, &usuffix);
-        order_suffix(thread->kcycles, &kcycles, &ksuffix);
+        order_suffix(atomic_time_read(&thread->ucycles), &ucycles, &usuffix);
+        order_suffix(atomic_time_read(&thread->kcycles), &kcycles, &ksuffix);
 
         state_t state = atomic_get_unordered(&thread->state);
@@ -788 +788 @@
 void thread_update_accounting(bool user)
 {
+        assert(interrupts_disabled());
+
         uint64_t time = get_cycle();
 
-        assert(interrupts_disabled());
-        assert(irq_spinlock_locked(&THREAD->lock));
-
         if (user)
-                THREAD->ucycles += time - THREAD->last_cycle;
+                atomic_time_increment(&THREAD->ucycles, time - THREAD->last_cycle);
         else
-                THREAD->kcycles += time - THREAD->last_cycle;
+                atomic_time_increment(&THREAD->kcycles, time - THREAD->last_cycle);
 
         THREAD->last_cycle = time;