Changeset fc10e1b in mainline for kernel/generic/src/sysinfo/stats.c

Timestamp:

2018-09-07T16:34:11Z (6 years ago)

Author:

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

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d2c91ab

Parents:

508b0df1 (diff), e90cfa6 (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.

Message:

Merge branch 'atomic'

Use more of <stdatomic.h> in kernel. Increment/decrement macros kept because
the are handy. atomic_t currently kept because I'm way too lazy to go through
all uses and think about the most appropriate replacement.

File:

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

kernel/generic/src/sysinfo/stats.c

@@ -239 +239 @@
         stats_task->virtmem = get_task_virtmem(task->as);
         stats_task->resmem = get_task_resmem(task->as);
-        stats_task->threads = atomic_get(&task->refcount);
+        stats_task->threads = atomic_load(&task->refcount);
         task_get_accounting(task, &(stats_task->ucycles),
             &(stats_task->kcycles));
@@ -764 +764 @@
  *
  */
-static inline load_t load_calc(load_t load, load_t exp, atomic_count_t ready)
+static inline load_t load_calc(load_t load, load_t exp, size_t ready)
 {
         load *= exp;
@@ -784 +784 @@
 
         while (true) {
-                atomic_count_t ready = atomic_get(&nrdy);
+                size_t ready = atomic_load(&nrdy);
 
                 /* Mutually exclude with get_stats_load() */