Changeset f2cb80a in mainline for kernel/test/mm/slab1.c

Timestamp:

2024-02-23T17:57:23Z (15 months ago)

Author:

GitHub <noreply@…>

Children:

192019f

Parents:

86f862c (diff), 90ba06c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-02-23 17:57:23)

git-committer:

GitHub <noreply@…> (2024-02-23 17:57:23)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

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

kernel/test/mm/slab1.c

@@ -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)
@@ -142 +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);