Changeset fc10e1b in mainline for kernel/generic/src/proc/scheduler.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/proc/scheduler.c (modified) (9 diffs)

kernel/generic/src/proc/scheduler.c

@@ -205 +205 @@
 loop:
 
-        if (atomic_get(&CPU->nrdy) == 0) {
+        if (atomic_load(&CPU->nrdy) == 0) {
                 /*
                  * For there was nothing to run, the CPU goes to sleep
@@ -327 +327 @@
         ipl = interrupts_disable();
 
-        if (atomic_get(&haltstate))
+        if (atomic_load(&haltstate))
                 halt();
 
@@ -530 +530 @@
         log(LF_OTHER, LVL_DEBUG,
             "cpu%u: tid %" PRIu64 " (priority=%d, ticks=%" PRIu64
-            ", nrdy=%" PRIua ")", CPU->id, THREAD->tid, THREAD->priority,
-            THREAD->ticks, atomic_get(&CPU->nrdy));
+            ", nrdy=%zu)", CPU->id, THREAD->tid, THREAD->priority,
+            THREAD->ticks, atomic_load(&CPU->nrdy));
 #endif
 
@@ -566 +566 @@
 void kcpulb(void *arg)
 {
-        atomic_count_t average;
-        atomic_count_t rdy;
+        size_t average;
+        size_t rdy;
 
         /*
@@ -587 +587 @@
          *
          */
-        average = atomic_get(&nrdy) / config.cpu_active + 1;
-        rdy = atomic_get(&CPU->nrdy);
+        average = atomic_load(&nrdy) / config.cpu_active + 1;
+        rdy = atomic_load(&CPU->nrdy);
 
         if (average <= rdy)
                 goto satisfied;
 
-        atomic_count_t count = average - rdy;
+        size_t count = average - rdy;
 
         /*
@@ -616 +616 @@
                                 continue;
 
-                        if (atomic_get(&cpu->nrdy) <= average)
+                        if (atomic_load(&cpu->nrdy) <= average)
                                 continue;
 
@@ -678 +678 @@
                                     "kcpulb%u: TID %" PRIu64 " -> cpu%u, "
                                     "nrdy=%ld, avg=%ld", CPU->id, t->tid,
-                                    CPU->id, atomic_get(&CPU->nrdy),
-                                    atomic_get(&nrdy) / config.cpu_active);
+                                    CPU->id, atomic_load(&CPU->nrdy),
+                                    atomic_load(&nrdy) / config.cpu_active);
 #endif
 
@@ -705 +705 @@
         }
 
-        if (atomic_get(&CPU->nrdy)) {
+        if (atomic_load(&CPU->nrdy)) {
                 /*
                  * Be a little bit light-weight and let migrated threads run.
@@ -739 +739 @@
                 irq_spinlock_lock(&cpus[cpu].lock, true);
 
-                printf("cpu%u: address=%p, nrdy=%" PRIua ", needs_relink=%zu\n",
-                    cpus[cpu].id, &cpus[cpu], atomic_get(&cpus[cpu].nrdy),
+                printf("cpu%u: address=%p, nrdy=%zu, needs_relink=%zu\n",
+                    cpus[cpu].id, &cpus[cpu], atomic_load(&cpus[cpu].nrdy),
                     cpus[cpu].needs_relink);