Changes in kernel/test/thread/thread1.c [bab75df6:0f4f1b2] in mainline

File:

• kernel/test/thread/thread1.c (modified) (3 diffs)

kernel/test/thread/thread1.c

@@ -30 +30 @@
 #include <test.h>
 #include <atomic.h>
+#include <stdbool.h>
 #include <proc/thread.h>
 
@@ -36 +37 @@
 #define THREADS  5
 
-static atomic_t finish;
-static atomic_t threads_finished;
+static atomic_bool finish;
 
 static void threadtest(void *data)
 {
-        thread_detach(THREAD);
-
         while (atomic_load(&finish)) {
                 TPRINTF("%" PRIu64 " ", THREAD->tid);
                 thread_usleep(100000);
         }
-        atomic_inc(&threads_finished);
 }
 
 const char *test_thread1(void)
 {
-        unsigned int i;
-        size_t total = 0;
+        atomic_store(&finish, true);
 
-        atomic_store(&finish, 1);
-        atomic_store(&threads_finished, 0);
+        thread_t *threads[THREADS] = { };
 
-        for (i = 0; i < THREADS; i++) {
-                thread_t *t;
-                if (!(t = thread_create(threadtest, NULL, TASK,
-                    THREAD_FLAG_NONE, "threadtest"))) {
+        for (int i = 0; i < THREADS; i++) {
+                threads[i] = thread_create(threadtest, NULL,
+                    TASK, THREAD_FLAG_NONE, "threadtest");
+
+                if (threads[i]) {
+                        thread_start(threads[i]);
+                } else {
                         TPRINTF("Could not create thread %d\n", i);
                         break;
                 }
-                thread_ready(t);
-                total++;
         }
 
@@ -72 +68 @@
         thread_sleep(10);
 
-        atomic_store(&finish, 0);
-        while (atomic_load(&threads_finished) < total) {
-                TPRINTF("Threads left: %zu\n", total - atomic_load(&threads_finished));
-                thread_sleep(1);
+        atomic_store(&finish, false);
+
+        for (int i = 0; i < THREADS; i++) {
+                if (threads[i] != NULL)
+                        thread_join(threads[i]);
+
+                TPRINTF("Threads left: %d\n", THREADS - i - 1);
         }