Changes in kernel/test/synch/rcu1.c [8848276:7850dda] in mainline

File:

• kernel/test/synch/rcu1.c (modified) (13 diffs)

kernel/test/synch/rcu1.c

@@ -27 +27 @@
  */
 
+#include <assert.h>
 #include <test.h>
 #include <arch.h>
@@ -81 +82 @@
 static void run_thread(size_t k, void (*func)(void*), void *arg)
 {
-        ASSERT(thread[k] == NULL);
+        assert(thread[k] == NULL);
         
         thread[k] = thread_create(func, arg, TASK, THREAD_FLAG_NONE, 
@@ -130 +131 @@
 static void run_one(void (*func)(void*), void *arg)
 {
-        ASSERT(one_idx < MAX_THREADS);
+        assert(one_idx < MAX_THREADS);
         run_thread(one_idx, func, arg);
         ++one_idx;
@@ -138 +139 @@
 static void join_one(void)
 {
-        ASSERT(0 < one_idx && one_idx <= MAX_THREADS);
+        assert(0 < one_idx && one_idx <= MAX_THREADS);
 
         --one_idx;
@@ -168 +169 @@
 static void get_seq(size_t from, size_t to, size_t steps, size_t *seq)
 {
-        ASSERT(0 < steps && from <= to && 0 < to);
+        assert(0 < steps && from <= to && 0 < to);
         size_t inc = (to - from) / (steps - 1);
         
@@ -304 +305 @@
 static void one_cb_done(rcu_item_t *item)
 {
-        ASSERT( ((item_w_cookie_t *)item)->cookie == magic_cookie);
+        assert( ((item_w_cookie_t *)item)->cookie == magic_cookie);
         one_cb_is_done = 1;
         TPRINTF("Callback()\n");
@@ -388 +389 @@
 static void seq_func(void *arg)
 {
+        /*
+         * Temporarily workaround GCC 7.1.0 internal
+         * compiler error when compiling for riscv64.
+         */
+#ifndef KARCH_riscv64
         seq_work_t *work = (seq_work_t*)arg;
         
@@ -434 +440 @@
                 }
                 
-        } 
+        }
+#else
+        (void) seq_cb;
+#endif
 }
 
@@ -560 +569 @@
 {
         preempt_t *p = (preempt_t*)arg;
-        ASSERT(!p->e.exited);
+        assert(!p->e.exited);
 
         TPRINTF("reader_prev{ ");
@@ -580 +589 @@
 {
         preempt_t *p = (preempt_t*)arg;
-        ASSERT(!p->e.exited);
+        assert(!p->e.exited);
         
         TPRINTF("reader_inside_cur{ ");
@@ -605 +614 @@
 {
         preempt_t *p = (preempt_t*)arg;
-        ASSERT(!p->e.exited);
+        assert(!p->e.exited);
         
         TPRINTF("reader_cur{ ");
@@ -627 +636 @@
 {
         preempt_t *p = (preempt_t*)arg;
-        ASSERT(!p->e.exited);
+        assert(!p->e.exited);
         
         TPRINTF("reader_next1{ ");
@@ -649 +658 @@
 {
         preempt_t *p = (preempt_t*)arg;
-        ASSERT(!p->e.exited);
+        assert(!p->e.exited);
         
         TPRINTF("reader_next2{ ");