Changes in kernel/test/mm/falloc2.c [31e15be:0f4f1b2] in mainline

File:

• kernel/test/mm/falloc2.c (modified) (5 diffs)

kernel/test/mm/falloc2.c

@@ -35 +35 @@
 #include <atomic.h>
 #include <proc/thread.h>
-#include <mem.h>
+#include <memw.h>
 #include <arch.h>
 
@@ -43 +43 @@
 #define THREADS      8
 
-static atomic_size_t thread_cnt;
 static atomic_size_t thread_fail;
 
@@ -56 +55 @@
                     "Unable to allocate frames\n", THREAD->tid, CPU->id);
                 atomic_inc(&thread_fail);
-                atomic_dec(&thread_cnt);
                 return;
         }
-
-        thread_detach(THREAD);
 
         for (unsigned int run = 0; run < THREAD_RUNS; run++) {
@@ -110 +106 @@
         TPRINTF("Thread #%" PRIu64 " (cpu%u): Exiting\n",
             THREAD->tid, CPU->id);
-        atomic_dec(&thread_cnt);
 }
 
 const char *test_falloc2(void)
 {
-        atomic_store(&thread_cnt, THREADS);
         atomic_store(&thread_fail, 0);
+
+        thread_t *threads[THREADS] = { };
 
         for (unsigned int i = 0; i < THREADS; i++) {
@@ -125 +121 @@
                         break;
                 }
-                thread_ready(thrd);
+                thread_start(thrd);
+                threads[i] = thrd;
         }
 
-        while (atomic_load(&thread_cnt) > 0) {
-                TPRINTF("Threads left: %zu\n",
-                    atomic_load(&thread_cnt));
-                thread_sleep(1);
+        for (unsigned int i = 0; i < THREADS; i++) {
+                if (threads[i] != NULL)
+                        thread_join(threads[i]);
+
+                TPRINTF("Threads left: %u\n", THREADS - i - 1);
         }