Changeset f2cb80a in mainline for kernel/test/thread/thread1.c

Timestamp:

2024-02-23T17:57:23Z (11 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/thread/thread1.c (modified) (3 diffs)

kernel/test/thread/thread1.c

@@ -38 +38 @@
 
 static atomic_bool finish;
-static atomic_size_t threads_finished;
 
 static void threadtest(void *data)
@@ -46 +45 @@
                 thread_usleep(100000);
         }
-        atomic_inc(&threads_finished);
 }
 
 const char *test_thread1(void)
 {
-        unsigned int i;
-        size_t total = 0;
+        atomic_store(&finish, true);
 
-        atomic_store(&finish, true);
-        atomic_store(&threads_finished, 0);
+        thread_t *threads[THREADS] = { };
 
-        for (i = 0; i < THREADS; i++) {
-                thread_t *t;
-                if (!(t = thread_create(threadtest, NULL, TASK,
-                    THREAD_FLAG_NONE, "threadtest"))) {
+        for (int i = 0; i < THREADS; i++) {
+                threads[i] = thread_create(threadtest, NULL,
+                    TASK, THREAD_FLAG_NONE, "threadtest");
+
+                if (threads[i]) {
+                        thread_start(threads[i]);
+                } else {
                         TPRINTF("Could not create thread %d\n", i);
                         break;
                 }
-                thread_ready(t);
-                total++;
         }
 
@@ -72 +69 @@
 
         atomic_store(&finish, false);
-        while (atomic_load(&threads_finished) < total) {
-                TPRINTF("Threads left: %zu\n", total - atomic_load(&threads_finished));
-                thread_sleep(1);
+
+        for (int i = 0; i < THREADS; i++) {
+                if (threads[i] != NULL)
+                        thread_join(threads[i]);
+
+                TPRINTF("Threads left: %d\n", THREADS - i - 1);
         }