Changeset ebb1489 in mainline for uspace/lib/c/generic/thread/thread.c

Timestamp:

2024-10-13T08:23:40Z (8 weeks ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (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-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

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

File:

• uspace/lib/c/generic/thread/thread.c (modified) (6 diffs)

uspace/lib/c/generic/thread/thread.c

@@ -37 +37 @@
 #include <stdlib.h>
 #include <libarch/faddr.h>
-#include <abi/proc/uarg.h>
 #include <fibril.h>
 #include <stack.h>
@@ -54 +53 @@
  * and exit when thread returns back.
  *
- * @param uarg Pointer to userspace argument structure.
+ * @param arg Fibril pointer.
  *
  */
-void __thread_main(uspace_arg_t *uarg)
+static void __thread_main(void *arg)
 {
+        fibril_t *fibril = arg;
+
         assert(!__tcb_is_set());
-
-        fibril_t *fibril = uarg->uspace_thread_arg;
         assert(fibril);
 
         __tcb_set(fibril->tcb);
 
-        uarg->uspace_thread_function(fibril->arg);
+        fibril->func(fibril->arg);
         /*
          * XXX: we cannot free the userspace stack while running on it
@@ -90 +89 @@
  * @return Zero on success or a code from @ref errno.h on failure.
  */
-errno_t thread_create(void (*function)(void *), void *arg, const char *name,
-    thread_id_t *tid)
+errno_t thread_create(errno_t (*func)(void *), void *arg, const char *name)
 {
-        uspace_arg_t *uarg = calloc(1, sizeof(uspace_arg_t));
-        if (!uarg)
+        fibril_t *fibril = fibril_alloc();
+        if (!fibril)
                 return ENOMEM;
 
-        fibril_t *fibril = fibril_alloc();
-        if (!fibril) {
-                free(uarg);
-                return ENOMEM;
-        }
+        fibril->func = func;
+        fibril->arg = arg;
 
         size_t stack_size = stack_size_get();
@@ -109 +104 @@
         if (stack == AS_MAP_FAILED) {
                 fibril_teardown(fibril);
-                free(uarg);
                 return ENOMEM;
         }
 
-        fibril->arg = arg;
-        uarg->uspace_entry = (void *) FADDR(__thread_entry);
-        uarg->uspace_stack = stack;
-        uarg->uspace_stack_size = stack_size;
-        uarg->uspace_thread_function = function;
-        uarg->uspace_thread_arg = fibril;
-        uarg->uspace_uarg = uarg;
+        uintptr_t sp = arch_thread_prepare(stack, stack_size, __thread_main,
+            fibril);
 
-        errno_t rc = (errno_t) __SYSCALL4(SYS_THREAD_CREATE, (sysarg_t) uarg,
-            (sysarg_t) name, (sysarg_t) str_size(name), (sysarg_t) tid);
+        errno_t rc = (errno_t) __SYSCALL4(SYS_THREAD_CREATE,
+            (sysarg_t) FADDR(__thread_entry), sp,
+            (sysarg_t) name, (sysarg_t) str_size(name));
 
         if (rc != EOK) {
@@ -130 +120 @@
                  */
                 as_area_destroy(stack);
-                free(uarg);
         }
 
@@ -148 +137 @@
         while (true)
                 ;
-}
-
-/** Detach thread.
- *
- * Currently not implemented.
- *
- * @param thread TID.
- */
-void thread_detach(thread_id_t thread)
-{
 }