Changes in / [071a1ddb:0722869] in mainline

Files:

• kernel/generic/include/ipc/kbox.h (modified) (1 diff)
• kernel/generic/include/ipc/sysipc.h (modified) (1 diff)
• kernel/generic/src/ipc/kbox.c (modified) (3 diffs)
• kernel/generic/src/ipc/sysipc.c (modified) (2 diffs)
• uspace/lib/c/generic/async.c (modified) (1 diff)
• uspace/lib/c/generic/ipc.c (modified) (1 diff)
• uspace/lib/c/include/ipc/ipc.h (modified) (1 diff)

kernel/generic/include/ipc/kbox.h

@@ -50 +50 @@
 } kbox_t;
 
-extern int ipc_connect_kbox(task_id_t);
+extern int ipc_connect_kbox(task_id_t, cap_handle_t *);
 extern void ipc_kbox_cleanup(void);
 

kernel/generic/include/ipc/sysipc.h

@@ -59 +59 @@
 extern sysarg_t sys_ipc_irq_unsubscribe(sysarg_t);
 
-#ifdef __32_BITS__
-
-extern sysarg_t sys_ipc_connect_kbox(sysarg64_t *);
-
-#endif  /* __32_BITS__ */
-
-#ifdef __64_BITS__
-
-extern sysarg_t sys_ipc_connect_kbox(sysarg_t);
-
-#endif  /* __64_BITS__ */
+extern sysarg_t sys_ipc_connect_kbox(task_id_t *, cap_handle_t *);
 
 #endif

kernel/generic/src/ipc/kbox.c

@@ -206 +206 @@
  * cleanup code.
  *
- * @return Phone capability handle on success, or negative error code.
- *
- */
-int ipc_connect_kbox(task_id_t taskid)
+ * @param[out] out_phone  Phone capability handle on success.
+ * @return Error code.
+ *
+ */
+int ipc_connect_kbox(task_id_t taskid, cap_handle_t *out_phone)
 {
         irq_spinlock_lock(&tasks_lock, true);
@@ -231 +232 @@
         }
         
-        if (task->kb.finished != false) {
+        if (task->kb.finished) {
                 mutex_unlock(&task->kb.cleanup_lock);
                 return EINVAL;
         }
         
+        /* Create a kbox thread if necessary. */
+        if (task->kb.thread == NULL) {
+                thread_t *kb_thread = thread_create(kbox_thread_proc, NULL, task,
+                    THREAD_FLAG_NONE, "kbox");
+                
+                if (!kb_thread) {
+                        mutex_unlock(&task->kb.cleanup_lock);
+                        return ENOMEM;
+                }
+                
+                task->kb.thread = kb_thread;
+                thread_ready(kb_thread);
+        }
+        
+        /* Allocate a new phone. */
         cap_handle_t phone_handle = phone_alloc(TASK);
         if (phone_handle < 0) {
@@ -248 +264 @@
         (void) ipc_phone_connect(phone_obj->phone, &task->kb.box);
         
-        if (task->kb.thread != NULL) {
-                mutex_unlock(&task->kb.cleanup_lock);
-                return phone_handle;
-        }
-        
-        /* Create a kbox thread */
-        thread_t *kb_thread = thread_create(kbox_thread_proc, NULL, task,
-            THREAD_FLAG_NONE, "kbox");
-        if (!kb_thread) {
-                mutex_unlock(&task->kb.cleanup_lock);
-                return ENOMEM;
-        }
-        
-        task->kb.thread = kb_thread;
-        thread_ready(kb_thread);
-        
         mutex_unlock(&task->kb.cleanup_lock);
-        
-        return phone_handle;
+        *out_phone = phone_handle;
+        return EOK;
 }
 

kernel/generic/src/ipc/sysipc.c

@@ -897 +897 @@
 }
 
-#ifdef __32_BITS__
-
-/** Syscall connect to a task by ID (32 bits)
- *
- * @return Phone id on success, or negative error code.
- *
- */
-sysarg_t sys_ipc_connect_kbox(sysarg64_t *uspace_taskid)
+/** Syscall connect to a task by ID
+ *
+ * @return Error code.
+ *
+ */
+sysarg_t sys_ipc_connect_kbox(task_id_t *uspace_taskid, cap_handle_t *uspace_phone)
 {
 #ifdef CONFIG_UDEBUG
-        sysarg64_t taskid;
-        int rc = copy_from_uspace(&taskid, uspace_taskid, sizeof(sysarg64_t));
-        if (rc != 0)
-                return (sysarg_t) rc;
-        
-        return ipc_connect_kbox((task_id_t) taskid);
+        task_id_t taskid;
+        cap_handle_t phone;
+        
+        int rc = copy_from_uspace(&taskid, uspace_taskid, sizeof(task_id_t));
+        if (rc == EOK) {
+                rc = ipc_connect_kbox((task_id_t) taskid, &phone);
+        }
+        
+        if (rc == EOK) {
+                rc = copy_to_uspace(uspace_phone, &phone, sizeof(cap_handle_t));
+                if (rc != EOK) {
+                        // Clean up the phone on failure.
+                        sys_ipc_hangup(phone);
+                }
+        }
+        
+        return (sysarg_t) rc;
 #else
         return (sysarg_t) ENOTSUP;
@@ -918 +927 @@
 }
 
-#endif  /* __32_BITS__ */
-
-#ifdef __64_BITS__
-
-/** Syscall connect to a task by ID (64 bits)
- *
- * @return Phone id on success, or negative error code.
- *
- */
-sysarg_t sys_ipc_connect_kbox(sysarg_t taskid)
-{
-#ifdef CONFIG_UDEBUG
-        return ipc_connect_kbox((task_id_t) taskid);
-#else
-        return (sysarg_t) ENOTSUP;
-#endif
-}
-
-#endif  /* __64_BITS__ */
-
 /** @}
  */

uspace/lib/c/generic/async.c

@@ -2398 +2398 @@
         }
         
-        int phone = ipc_connect_kbox(id);
-        if (phone < 0) {
-                errno = phone;
+        cap_handle_t phone;
+        int rc = ipc_connect_kbox(id, &phone);
+        if (rc != EOK) {
+                errno = rc;
                 free(sess);
                 return NULL;

uspace/lib/c/generic/ipc.c

@@ -377 +377 @@
  *
  */
-int ipc_connect_kbox(task_id_t id)
-{
-#ifdef __32_BITS__
-        sysarg64_t arg = (sysarg64_t) id;
-        return __SYSCALL1(SYS_IPC_CONNECT_KBOX, (sysarg_t) &arg);
-#endif
-        
-#ifdef __64_BITS__
-        return __SYSCALL1(SYS_IPC_CONNECT_KBOX, (sysarg_t) id);
-#endif
+int ipc_connect_kbox(task_id_t id, cap_handle_t *phone)
+{
+        return __SYSCALL2(SYS_IPC_CONNECT_KBOX, (sysarg_t) &id, (sysarg_t) phone);
 }
 

uspace/lib/c/include/ipc/ipc.h

@@ -122 +122 @@
     sysarg_t, sysarg_t, sysarg_t, sysarg_t, unsigned int);
 
-extern int ipc_connect_kbox(task_id_t);
+extern int ipc_connect_kbox(task_id_t, cap_handle_t *);
 
 #endif