Changes in uspace/lib/c/generic/thread/thread.c [3fcea34:bd41ac52] in mainline

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