Changes in kernel/test/mm/slab2.c [bab75df6:0f4f1b2] in mainline

File:

• kernel/test/mm/slab2.c (modified) (6 diffs)

kernel/test/mm/slab2.c

@@ -32 +32 @@
 #include <arch.h>
 #include <mm/frame.h>
-#include <mem.h>
+#include <memw.h>
 #include <synch/condvar.h>
 #include <synch/mutex.h>
@@ -127 +127 @@
 
 static slab_cache_t *thr_cache;
-static semaphore_t thr_sem;
 static condvar_t thread_starter;
 static mutex_t starter_mutex;
@@ -136 +135 @@
 {
         void *data = NULL, *new;
-
-        thread_detach(THREAD);
 
         mutex_lock(&starter_mutex);
@@ -190 +187 @@
         if (!test_quiet)
                 slab_print_list();
-
-        semaphore_up(&thr_sem);
 }
 
@@ -200 +195 @@
          * then release everything, then again allocate, then release
          */
-        thread_t *t;
-        int i;
 
         TPRINTF("Running stress test with size %d\n", size);
@@ -209 +202 @@
 
         thr_cache = slab_cache_create("thread_cache", size, 0, NULL, NULL, 0);
-        semaphore_initialize(&thr_sem, 0);
-        for (i = 0; i < THREADS; i++) {
-                if (!(t = thread_create(slabtest, NULL, TASK, THREAD_FLAG_NONE, "slabtest"))) {
+
+        thread_t *threads[THREADS] = { };
+
+        for (int i = 0; i < THREADS; i++) {
+                threads[i] = thread_create(slabtest, NULL,
+                    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);
-        }
+                }
+        }
+
         thread_sleep(1);
         condvar_broadcast(&thread_starter);
 
-        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);