Changeset f2cb80a in mainline for kernel/generic/src/ipc/kbox.c

Timestamp:

2024-02-23T17:57:23Z (11 months ago)

Author:

GitHub <noreply@…>

Children:

192019f

Parents:

86f862c (diff), 90ba06c (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-02-23 17:57:23)

git-committer:

GitHub <noreply@…> (2024-02-23 17:57:23)

Message:

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

File:

• kernel/generic/src/ipc/kbox.c (modified) (6 diffs)

kernel/generic/src/ipc/kbox.c

@@ -90 +90 @@
                 LOG("Join kb.thread.");
                 thread_join(TASK->kb.thread);
-                thread_put(TASK->kb.thread);
                 LOG("...join done.");
                 TASK->kb.thread = NULL;
@@ -201 +200 @@
 /** Connect phone to a task kernel-box specified by id.
  *
- * Note that this is not completely atomic. For optimisation reasons, the task
- * might start cleaning up kbox after the phone has been connected and before
- * a kbox thread has been created. This must be taken into account in the
- * cleanup code.
- *
  * @param[out] out_phone  Phone capability handle on success.
  * @return Error code.
@@ -212 +206 @@
 errno_t ipc_connect_kbox(task_id_t taskid, cap_phone_handle_t *out_phone)
 {
-        irq_spinlock_lock(&tasks_lock, true);
-
         task_t *task = task_find_by_id(taskid);
-        if (task == NULL) {
-                irq_spinlock_unlock(&tasks_lock, true);
+        if (!task)
                 return ENOENT;
-        }
-
-        atomic_inc(&task->refcount);
-
-        irq_spinlock_unlock(&tasks_lock, true);
 
         mutex_lock(&task->kb.cleanup_lock);
-
-        if (atomic_predec(&task->refcount) == 0) {
-                mutex_unlock(&task->kb.cleanup_lock);
-                task_destroy(task);
-                return ENOENT;
-        }
 
         if (task->kb.finished) {
                 mutex_unlock(&task->kb.cleanup_lock);
+                task_release(task);
                 return EINVAL;
         }
@@ -244 +225 @@
                 if (!kb_thread) {
                         mutex_unlock(&task->kb.cleanup_lock);
+                        task_release(task);
                         return ENOMEM;
                 }
 
-                task->kb.thread = thread_ref(kb_thread);
-                thread_ready(kb_thread);
+                task->kb.thread = kb_thread;
+                thread_start(kb_thread);
         }
 
@@ -256 +238 @@
         if (rc != EOK) {
                 mutex_unlock(&task->kb.cleanup_lock);
+                task_release(task);
                 return rc;
         }
@@ -266 +249 @@
 
         mutex_unlock(&task->kb.cleanup_lock);
+        task_release(task);
         *out_phone = phone_handle;
         return EOK;