Changes in kernel/generic/src/proc/task.c [b2e121a:82d515e9] in mainline

File:

• kernel/generic/src/proc/task.c (modified) (13 diffs)

kernel/generic/src/proc/task.c

@@ -56 +56 @@
 #include <print.h>
 #include <errno.h>
-#include <halt.h>
+#include <func.h>
 #include <str.h>
 #include <syscall/copy.h>
@@ -83 +83 @@
 /* Forward declarations. */
 static void task_kill_internal(task_t *);
-static errno_t tsk_constructor(void *, unsigned int);
+static int tsk_constructor(void *, unsigned int);
 static size_t tsk_destructor(void *obj);
 
@@ -158 +158 @@
 }
 
-errno_t tsk_constructor(void *obj, unsigned int kmflags)
+int tsk_constructor(void *obj, unsigned int kmflags)
 {
         task_t *task = (task_t *) obj;
 
-        errno_t rc = caps_task_alloc(task);
+        int rc = caps_task_alloc(task);
         if (rc != EOK)
                 return rc;
@@ -185 +185 @@
 #endif
         
-        return EOK;
+        return 0;
 }
 
@@ -207 +207 @@
 {
         task_t *task = (task_t *) slab_alloc(task_cache, 0);
-        if (task == NULL) {
-                return NULL;
-        }
-        
         task_create_arch(task);
         
@@ -245 +241 @@
         if ((ipc_phone_0) &&
             (container_check(ipc_phone_0->task->container, task->container))) {
-                cap_handle_t phone_handle;
-                errno_t rc = phone_alloc(task, &phone_handle);
-                if (rc != EOK) {
-                        task->as = NULL;
-                        task_destroy_arch(task);
-                        slab_free(task_cache, task);
-                        return NULL;
-                }
-                
+                cap_handle_t phone_handle = phone_alloc(task);
                 kobject_t *phone_obj = kobject_get(task, phone_handle,
                     KOBJECT_TYPE_PHONE);
@@ -345 +333 @@
  *
  */
-sys_errno_t sys_task_get_id(sysarg64_t *uspace_taskid)
+sysarg_t sys_task_get_id(sysarg64_t *uspace_taskid)
 {
         /*
@@ -351 +339 @@
          * the lifespan of the task.
          */
-        return (sys_errno_t) copy_to_uspace(uspace_taskid, &TASK->taskid,
+        return (sysarg_t) copy_to_uspace(uspace_taskid, &TASK->taskid,
             sizeof(TASK->taskid));
 }
@@ -385 +373 @@
  *
  */
-sys_errno_t sys_task_set_name(const char *uspace_name, size_t name_len)
+sysarg_t sys_task_set_name(const char *uspace_name, size_t name_len)
 {
         char namebuf[TASK_NAME_BUFLEN];
@@ -393 +381 @@
                 name_len = TASK_NAME_BUFLEN - 1;
         
-        errno_t rc = copy_from_uspace(namebuf, uspace_name, name_len);
-        if (rc != EOK)
-                return (sys_errno_t) rc;
+        int rc = copy_from_uspace(namebuf, uspace_name, name_len);
+        if (rc != 0)
+                return (sysarg_t) rc;
         
         namebuf[name_len] = '\0';
@@ -426 +414 @@
  *
  */
-sys_errno_t sys_task_kill(task_id_t *uspace_taskid)
+sysarg_t sys_task_kill(task_id_t *uspace_taskid)
 {
         task_id_t taskid;
-        errno_t rc = copy_from_uspace(&taskid, uspace_taskid, sizeof(taskid));
-        if (rc != EOK)
-                return (sys_errno_t) rc;
-        
-        return (sys_errno_t) task_kill(taskid);
+        int rc = copy_from_uspace(&taskid, uspace_taskid, sizeof(taskid));
+        if (rc != 0)
+                return (sysarg_t) rc;
+        
+        return (sysarg_t) task_kill(taskid);
 }
 
@@ -539 +527 @@
  *
  */
-errno_t task_kill(task_id_t id)
+int task_kill(task_id_t id)
 {
         if (id == 1)
@@ -596 +584 @@
  *
  */
-sys_errno_t sys_task_exit(sysarg_t notify)
+sysarg_t sys_task_exit(sysarg_t notify)
 {
         task_kill_self(notify);