Changeset 036e97c in mainline for kernel/generic/src

Timestamp:

2018-09-07T15:52:40Z (7 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:

e3306d04

Parents:

e9d2905

Message:

Convert atomic_t to atomic_size_t (3): Use atomic_load instead of atomic_get

Location:

kernel/generic/src

Files:

• adt/cht.c (modified) (4 diffs)
• console/chardev.c (modified) (1 diff)
• console/console.c (modified) (1 diff)
• ipc/ipc.c (modified) (4 diffs)
• ipc/sysipc.c (modified) (1 diff)
• lib/halt.c (modified) (1 diff)
• log/log.c (modified) (1 diff)
• mm/slab.c (modified) (2 diffs)
• proc/scheduler.c (modified) (8 diffs)
• proc/task.c (modified) (2 diffs)
• smp/smp_call.c (modified) (1 diff)
• synch/rcu.c (modified) (1 diff)
• sysinfo/stats.c (modified) (2 diffs)

kernel/generic/src/adt/cht.c

@@ -618 +618 @@
 
         /* You must clear the table of items. Otherwise cht_destroy will leak. */
-        assert(atomic_get(&h->item_cnt) == 0);
+        assert(atomic_load(&h->item_cnt) == 0);
 }
 
@@ -625 +625 @@
 {
         /* Wait for resize to complete. */
-        while (0 < atomic_get(&h->resize_reqs)) {
+        while (0 < atomic_load(&h->resize_reqs)) {
                 rcu_barrier();
         }
@@ -2160 +2160 @@
         /* Make resize_reqs visible. */
         read_barrier();
-        assert(0 < atomic_get(&h->resize_reqs));
+        assert(0 < atomic_load(&h->resize_reqs));
 #endif
 
@@ -2168 +2168 @@
                 /* Load the most recent h->item_cnt. */
                 read_barrier();
-                size_t cur_items = (size_t) atomic_get(&h->item_cnt);
+                size_t cur_items = (size_t) atomic_load(&h->item_cnt);
                 size_t bucket_cnt = (1 << h->b->order);
                 size_t max_items = h->max_load * bucket_cnt;

kernel/generic/src/console/chardev.c

@@ -94 +94 @@
 wchar_t indev_pop_character(indev_t *indev)
 {
-        if (atomic_get(&haltstate)) {
+        if (atomic_load(&haltstate)) {
                 /*
                  * If we are here, we are hopefully on the processor that

kernel/generic/src/console/console.c

@@ -292 +292 @@
 void kio_update(void *event)
 {
-        if (!atomic_get(&kio_inited))
+        if (!atomic_load(&kio_inited))
                 return;
 

kernel/generic/src/ipc/ipc.c

@@ -783 +783 @@
 static void ipc_wait_for_all_answered_calls(void)
 {
-        while (atomic_get(&TASK->answerbox.active_calls) != 0) {
+        while (atomic_load(&TASK->answerbox.active_calls) != 0) {
                 call_t *call = NULL;
                 if (ipc_wait_for_call(&TASK->answerbox,
@@ -873 +873 @@
         ipc_wait_for_all_answered_calls();
 
-        assert(atomic_get(&TASK->answerbox.active_calls) == 0);
+        assert(atomic_load(&TASK->answerbox.active_calls) == 0);
 }
 
@@ -928 +928 @@
         if (phone->state != IPC_PHONE_FREE) {
                 printf("%-11d %7" PRIun " ", (int) CAP_HANDLE_RAW(cap->handle),
-                    atomic_get(&phone->active_calls));
+                    atomic_load(&phone->active_calls));
 
                 switch (phone->state) {
@@ -981 +981 @@
 
         printf("Active calls: %" PRIun "\n",
-            atomic_get(&task->answerbox.active_calls));
+            atomic_load(&task->answerbox.active_calls));
 
 #ifdef __32_BITS__

kernel/generic/src/ipc/sysipc.c

@@ -341 +341 @@
 static int check_call_limit(phone_t *phone)
 {
-        if (atomic_get(&phone->active_calls) >= IPC_MAX_ASYNC_CALLS)
+        if (atomic_load(&phone->active_calls) >= IPC_MAX_ASYNC_CALLS)
                 return -1;
 

kernel/generic/src/lib/halt.c

@@ -56 +56 @@
         bool rundebugger = false;
 
-        if (!atomic_get(&haltstate)) {
+        if (!atomic_load(&haltstate)) {
                 atomic_set(&haltstate, 1);
                 rundebugger = true;

kernel/generic/src/log/log.c

@@ -190 +190 @@
 static void log_update(void *event)
 {
-        if (!atomic_get(&log_inited))
+        if (!atomic_load(&log_inited))
                 return;
 

kernel/generic/src/mm/slab.c

@@ -690 +690 @@
          * endless loop
          */
-        atomic_count_t magcount = atomic_get(&cache->magazine_counter);
+        atomic_count_t magcount = atomic_load(&cache->magazine_counter);
 
         slab_magazine_t *mag;
@@ -876 +876 @@
                 size_t size = cache->size;
                 size_t objects = cache->objects;
-                long allocated_slabs = atomic_get(&cache->allocated_slabs);
-                long cached_objs = atomic_get(&cache->cached_objs);
-                long allocated_objs = atomic_get(&cache->allocated_objs);
+                long allocated_slabs = atomic_load(&cache->allocated_slabs);
+                long cached_objs = atomic_load(&cache->cached_objs);
+                long allocated_objs = atomic_load(&cache->allocated_objs);
                 unsigned int flags = cache->flags;
 

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();
 
@@ -531 +531 @@
             "cpu%u: tid %" PRIu64 " (priority=%d, ticks=%" PRIu64
             ", nrdy=%zu)", CPU->id, THREAD->tid, THREAD->priority,
-            THREAD->ticks, atomic_get(&CPU->nrdy));
+            THREAD->ticks, atomic_load(&CPU->nrdy));
 #endif
 
@@ -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)
@@ -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.
@@ -740 +740 @@
 
                 printf("cpu%u: address=%p, nrdy=%zu, needs_relink=%zu\n",
-                    cpus[cpu].id, &cpus[cpu], atomic_get(&cpus[cpu].nrdy),
+                    cpus[cpu].id, &cpus[cpu], atomic_load(&cpus[cpu].nrdy),
                     cpus[cpu].needs_relink);
 

kernel/generic/src/proc/task.c

@@ -620 +620 @@
         if (*additional)
                 printf("%-8" PRIu64 " %9zu", task->taskid,
-                    atomic_get(&task->refcount));
+                    atomic_load(&task->refcount));
         else
                 printf("%-8" PRIu64 " %-14s %-5" PRIu32 " %10p %10p"
@@ -632 +632 @@
                 printf("%-8" PRIu64 " %9" PRIu64 "%c %9" PRIu64 "%c "
                     "%9zu\n", task->taskid, ucycles, usuffix, kcycles,
-                    ksuffix, atomic_get(&task->refcount));
+                    ksuffix, atomic_load(&task->refcount));
         else
                 printf("%-8" PRIu64 " %-14s %-5" PRIu32 " %18p %18p\n",

kernel/generic/src/smp/smp_call.c

@@ -271 +271 @@
                  */
                 memory_barrier();
-        } while (atomic_get(&call_info->pending));
+        } while (atomic_load(&call_info->pending));
 }
 

kernel/generic/src/synch/rcu.c

@@ -1477 +1477 @@
 static bool wait_for_delaying_cpus(void)
 {
-        int delaying_cpu_cnt = atomic_get(&rcu.delaying_cpu_cnt);
+        int delaying_cpu_cnt = atomic_load(&rcu.delaying_cpu_cnt);
 
         for (int i = 0; i < delaying_cpu_cnt; ++i) {

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));
@@ -784 +784 @@
 
         while (true) {
-                atomic_count_t ready = atomic_get(&nrdy);
+                atomic_count_t ready = atomic_load(&nrdy);
 
                 /* Mutually exclude with get_stats_load() */