Changes in kernel/test/mm/slab1.c [abf6c01:0f4f1b2] in mainline

File:

• kernel/test/mm/slab1.c (modified) (4 diffs)

kernel/test/mm/slab1.c

@@ -31 +31 @@
 #include <proc/thread.h>
 #include <arch.h>
-#include <mem.h>
+#include <memw.h>
 
 #define VAL_COUNT  1024
@@ -121 +121 @@
 static void *thr_data[THREADS][THR_MEM_COUNT];
 static slab_cache_t *thr_cache;
-static semaphore_t thr_sem;
 
 static void slabtest(void *data)
@@ -127 +126 @@
         int offs = (int) (sysarg_t) data;
         int i, j;
-
-        thread_detach(THREAD);
 
         TPRINTF("Starting thread #%" PRIu64 "...\n", THREAD->tid);
@@ -144 +141 @@
 
         TPRINTF("Thread #%" PRIu64 " finished\n", THREAD->tid);
-
-        semaphore_up(&thr_sem);
 }
 
 static void testthreads(void)
 {
-        thread_t *t;
-        int i;
-
         thr_cache = slab_cache_create("thread_cache", THR_MEM_SIZE, 0, NULL, NULL,
             SLAB_CACHE_NOMAGAZINE);
 
-        semaphore_initialize(&thr_sem, 0);
-        for (i = 0; i < THREADS; i++) {
-                if (!(t = thread_create(slabtest, (void *) (sysarg_t) i, TASK, THREAD_FLAG_NONE, "slabtest"))) {
+        thread_t *threads[THREADS] = { };
+
+        for (int i = 0; i < THREADS; i++) {
+                threads[i] = thread_create(slabtest, (void *) (sysarg_t) i,
+                    TASK, THREAD_FLAG_NONE, "slabtest");
+                if (threads[i]) {
+                        thread_start(threads[i]);
+                } else {
                         TPRINTF("Could not create thread %d\n", i);
-                } else
-                        thread_ready(t);
+                }
         }
 
-        for (i = 0; i < THREADS; i++)
-                semaphore_down(&thr_sem);
+        for (int i = 0; i < THREADS; i++) {
+                if (threads[i] != NULL)
+                        thread_join(threads[i]);
+        }
 
         slab_cache_destroy(thr_cache);