Changes in kernel/generic/src/sysinfo/stats.c [dfa4be62:169815e] in mainline

File:

• kernel/generic/src/sysinfo/stats.c (modified) (3 diffs)

kernel/generic/src/sysinfo/stats.c

@@ -299 +299 @@
 {
         assert(interrupts_disabled());
+        assert(irq_spinlock_locked(&thread->lock));
 
         stats_thread->thread_id = thread->tid;
         stats_thread->task_id = thread->task->taskid;
-        stats_thread->state = atomic_get_unordered(&thread->state);
-        stats_thread->priority = atomic_get_unordered(&thread->priority);
-        stats_thread->ucycles = atomic_time_read(&thread->ucycles);
-        stats_thread->kcycles = atomic_time_read(&thread->kcycles);
-
-        cpu_t *cpu = atomic_get_unordered(&thread->cpu);
-
-        if (cpu != NULL) {
+        stats_thread->state = thread->state;
+        stats_thread->priority = thread->priority;
+        stats_thread->ucycles = thread->ucycles;
+        stats_thread->kcycles = thread->kcycles;
+
+        if (thread->cpu != NULL) {
                 stats_thread->on_cpu = true;
-                stats_thread->cpu = cpu->id;
+                stats_thread->cpu = thread->cpu->id;
         } else
                 stats_thread->on_cpu = false;
@@ -362 +361 @@
         thread_t *thread = thread_first();
         while (thread != NULL) {
+                /* Interrupts are already disabled */
+                irq_spinlock_lock(&thread->lock, false);
+
                 /* Record the statistics and increment the index */
                 produce_stats_thread(thread, &stats_threads[i]);
                 i++;
+
+                irq_spinlock_unlock(&thread->lock, false);
 
                 thread = thread_next(thread);
@@ -620 +624 @@
                 ret.data.size = sizeof(stats_thread_t);
 
+                /*
+                 * Replaced hand-over-hand locking with regular nested sections
+                 * to avoid weak reference leak issues.
+                 */
+                irq_spinlock_lock(&thread->lock, false);
                 produce_stats_thread(thread, stats_thread);
+                irq_spinlock_unlock(&thread->lock, false);
 
                 irq_spinlock_unlock(&threads_lock, true);