Changes in kernel/generic/src/proc/thread.c [a53ed3a:82d515e9] in mainline

File:

• kernel/generic/src/proc/thread.c (modified) (18 diffs)

kernel/generic/src/proc/thread.c

@@ -153 +153 @@
  *
  */
-static errno_t thr_constructor(void *obj, unsigned int kmflags)
+static int thr_constructor(void *obj, unsigned int kmflags)
 {
         thread_t *thread = (thread_t *) obj;
@@ -171 +171 @@
         thread->saved_fpu_context = slab_alloc(fpu_context_cache, kmflags);
         if (!thread->saved_fpu_context)
-                return ENOMEM;
+                return -1;
 #endif /* CONFIG_FPU_LAZY */
 #endif /* CONFIG_FPU */
@@ -201 +201 @@
                         slab_free(fpu_context_cache, thread->saved_fpu_context);
 #endif
-                return ENOMEM;
+                return -1;
         }
         
@@ -210 +210 @@
 #endif
         
-        return EOK;
+        return 0;
 }
 
@@ -548 +548 @@
  * 
  * Threads that are blocked waiting for a synchronization primitive 
- * are woken up with a return code of EINTR if the
+ * are woken up with a return code of ESYNCH_INTERRUPTED if the
  * blocking call was interruptable. See waitq_sleep_timeout().
  * 
@@ -639 +639 @@
  *
  */
-errno_t thread_join_timeout(thread_t *thread, uint32_t usec, unsigned int flags)
+int thread_join_timeout(thread_t *thread, uint32_t usec, unsigned int flags)
 {
         if (thread == THREAD)
@@ -653 +653 @@
         irq_spinlock_unlock(&thread->lock, true);
         
-        return waitq_sleep_timeout(&thread->join_wq, usec, flags, NULL);
+        return waitq_sleep_timeout(&thread->join_wq, usec, flags);
 }
 
@@ -700 +700 @@
         waitq_initialize(&wq);
         
-        (void) waitq_sleep_timeout(&wq, usec, SYNCH_FLAGS_NON_BLOCKING, NULL);
+        (void) waitq_sleep_timeout(&wq, usec, SYNCH_FLAGS_NON_BLOCKING);
 }
 
@@ -930 +930 @@
  *
  */
-sys_errno_t sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name,
+sysarg_t sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name,
     size_t name_len, thread_id_t *uspace_thread_id)
 {
@@ -937 +937 @@
         
         char namebuf[THREAD_NAME_BUFLEN];
-        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;
@@ -951 +951 @@
         
         rc = copy_from_uspace(kernel_uarg, uspace_uarg, sizeof(uspace_arg_t));
-        if (rc != EOK) {
+        if (rc != 0) {
                 free(kernel_uarg);
-                return (sys_errno_t) rc;
+                return (sysarg_t) rc;
         }
         
@@ -962 +962 @@
                         rc = copy_to_uspace(uspace_thread_id, &thread->tid,
                             sizeof(thread->tid));
-                        if (rc != EOK) {
+                        if (rc != 0) {
                                 /*
                                  * We have encountered a failure, but the thread
@@ -977 +977 @@
                                 free(kernel_uarg);
                                 
-                                return (sys_errno_t) rc;
+                                return (sysarg_t) rc;
                          }
                 }
@@ -999 +999 @@
                 free(kernel_uarg);
         
-        return (sys_errno_t) ENOMEM;
+        return (sysarg_t) ENOMEM;
 }
 
@@ -1005 +1005 @@
  *
  */
-sys_errno_t sys_thread_exit(int uspace_status)
+sysarg_t sys_thread_exit(int uspace_status)
 {
         thread_exit();
+        
+        /* Unreachable */
+        return 0;
 }
 
@@ -1018 +1021 @@
  *
  */
-sys_errno_t sys_thread_get_id(thread_id_t *uspace_thread_id)
+sysarg_t sys_thread_get_id(thread_id_t *uspace_thread_id)
 {
         /*
@@ -1025 +1028 @@
          *
          */
-        return (sys_errno_t) copy_to_uspace(uspace_thread_id, &THREAD->tid,
+        return (sysarg_t) copy_to_uspace(uspace_thread_id, &THREAD->tid,
             sizeof(THREAD->tid));
 }
 
 /** Syscall wrapper for sleeping. */
-sys_errno_t sys_thread_usleep(uint32_t usec)
+sysarg_t sys_thread_usleep(uint32_t usec)
 {
         thread_usleep(usec);
@@ -1036 +1039 @@
 }
 
-sys_errno_t sys_thread_udelay(uint32_t usec)
+sysarg_t sys_thread_udelay(uint32_t usec)
 {
         delay(usec);