Changeset 036e97c in mainline for kernel/test

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/test

Files:

• atomic/atomic1.c (modified) (1 diff)
• mm/falloc2.c (modified) (1 diff)
• synch/rcu1.c (modified) (2 diffs)
• synch/workq-test-core.h (modified) (2 diffs)
• thread/thread1.c (modified) (2 diffs)

kernel/test/atomic/atomic1.c

@@ -37 +37 @@
 
         atomic_set(&a, 10);
-        if (atomic_get(&a) != 10)
-                return "Failed atomic_set()/atomic_get()";
+        if (atomic_load(&a) != 10)
+                return "Failed atomic_set()/atomic_load()";
 
         if (atomic_postinc(&a) != 10)
                 return "Failed atomic_postinc()";
-        if (atomic_get(&a) != 11)
-                return "Failed atomic_get() after atomic_postinc()";
+        if (atomic_load(&a) != 11)
+                return "Failed atomic_load() after atomic_postinc()";
 
         if (atomic_postdec(&a) != 11)
                 return "Failed atomic_postdec()";
-        if (atomic_get(&a) != 10)
-                return "Failed atomic_get() after atomic_postdec()";
+        if (atomic_load(&a) != 10)
+                return "Failed atomic_load() after atomic_postdec()";
 
         if (atomic_preinc(&a) != 11)
                 return "Failed atomic_preinc()";
-        if (atomic_get(&a) != 11)
-                return "Failed atomic_get() after atomic_preinc()";
+        if (atomic_load(&a) != 11)
+                return "Failed atomic_load() after atomic_preinc()";
 
         if (atomic_predec(&a) != 10)
                 return "Failed atomic_predec()";
-        if (atomic_get(&a) != 10)
-                return "Failed atomic_get() after atomic_predec()";
+        if (atomic_load(&a) != 10)
+                return "Failed atomic_load() after atomic_predec()";
 
         return NULL;

kernel/test/mm/falloc2.c

@@ -130 +130 @@
         }
 
-        while (atomic_get(&thread_count) > 0) {
+        while (atomic_load(&thread_count) > 0) {
                 TPRINTF("Threads left: %zu\n",
-                    atomic_get(&thread_count));
+                    atomic_load(&thread_count));
                 thread_sleep(1);
         }
 
-        if (atomic_get(&thread_fail) == 0)
+        if (atomic_load(&thread_fail) == 0)
                 return NULL;
 

kernel/test/synch/rcu1.c

@@ -282 +282 @@
         size_t loop_cnt = 0, max_loops = 15;
 
-        while (exp_cnt != atomic_get(&nop_callbacks_cnt) && loop_cnt < max_loops) {
+        while (exp_cnt != atomic_load(&nop_callbacks_cnt) && loop_cnt < max_loops) {
                 ++loop_cnt;
                 TPRINTF(".");
@@ -840 +840 @@
         rcu_barrier();
 
-        if (1 == atomic_get(&barrier->done)) {
+        if (1 == atomic_load(&barrier->done)) {
                 free(barrier);
                 return true;

kernel/test/synch/workq-test-core.h

@@ -179 +179 @@
 
         for (int i = 0; i < WAVES; ++i) {
-                while (atomic_get(&call_cnt[i]) < exp_call_cnt &&
+                while (atomic_load(&call_cnt[i]) < exp_call_cnt &&
                     sleep_cnt < max_sleep_cnt) {
                         TPRINTF(".");
@@ -190 +190 @@
 
         for (int i = 0; i < WAVES; ++i) {
-                if (atomic_get(&call_cnt[i]) == exp_call_cnt) {
+                if (atomic_load(&call_cnt[i]) == exp_call_cnt) {
                         TPRINTF("Ok: %zu calls in wave %d, as expected.\n",
-                            atomic_get(&call_cnt[i]), i);
+                            atomic_load(&call_cnt[i]), i);
                 } else {
                         success = false;
                         TPRINTF("Error: %zu calls in wave %d, but %zu expected.\n",
-                            atomic_get(&call_cnt[i]), i, exp_call_cnt);
+                            atomic_load(&call_cnt[i]), i, exp_call_cnt);
                 }
         }

kernel/test/thread/thread1.c

@@ -46 +46 @@
         thread_detach(THREAD);
 
-        while (atomic_get(&finish)) {
+        while (atomic_load(&finish)) {
                 TPRINTF("%" PRIu64 " ", THREAD->tid);
                 thread_usleep(100000);
@@ -76 +76 @@
 
         atomic_set(&finish, 0);
-        while (atomic_get(&threads_finished) < total) {
-                TPRINTF("Threads left: %zu\n", total - atomic_get(&threads_finished));
+        while (atomic_load(&threads_finished) < total) {
+                TPRINTF("Threads left: %zu\n", total - atomic_load(&threads_finished));
                 thread_sleep(1);
         }