Changeset 0f4f1b2 in mainline for kernel/test/mm

Timestamp:

2024-01-15T17:10:27Z (21 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master

Children:

e82879c

Parents:

a064d4f

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2024-01-15 16:37:22)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2024-01-15 17:10:27)

Message:

Add (and use) functions thread_start() and thread_detach()

Mostly cosmetic, with thread_start() replacing calls to thread_ready(),
but not consuming the passed reference, and thread_detach() being
synonym for thread_put(). Makes the code's function more obvious.

Also modify some threaded tests to use thread_join() for waiting,
instead of counting threads with atomics or semaphores.

Location:

kernel/test/mm

Files:

• falloc2.c (modified) (4 diffs)
• slab1.c (modified) (2 diffs)
• slab2.c (modified) (4 diffs)

kernel/test/mm/falloc2.c

@@ -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;
         }
@@ -108 +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++) {
@@ -123 +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);
         }
 

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);

kernel/test/mm/slab2.c

@@ -127 +127 @@
 
 static slab_cache_t *thr_cache;
-static semaphore_t thr_sem;
 static condvar_t thread_starter;
 static mutex_t starter_mutex;
@@ -188 +187 @@
         if (!test_quiet)
                 slab_print_list();
-
-        semaphore_up(&thr_sem);
 }
 
@@ -198 +195 @@
          * then release everything, then again allocate, then release
          */
-        thread_t *t;
-        int i;
 
         TPRINTF("Running stress test with size %d\n", size);
@@ -207 +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);