Changeset 70327bb in mainline

Timestamp:

2018-03-13T18:01:47Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e618885

Parents:

c25a39e

git-author:

Jakub Jermar <jakub@…> (2018-03-04 11:18:52)

git-committer:

Jakub Jermar <jakub@…> (2018-03-13 18:01:47)

Message:

Track number of answers expected by answerbox

Location:

kernel/generic

Files:

• include/ipc/ipc.h (modified) (1 diff)
• src/ipc/ipc.c (modified) (5 diffs)

kernel/generic/include/ipc/ipc.h

@@ -82 +82 @@
         waitq_t wq;
 
+        /**
+         * Number of answers the answerbox is expecting to eventually arrive.
+         */
+        atomic_t active_calls;
+
         /** Phones connected to this answerbox. */
         list_t connected_phones;

kernel/generic/src/ipc/ipc.c

@@ -147 +147 @@
         list_initialize(&box->answers);
         list_initialize(&box->irq_notifs);
+        atomic_set(&box->active_calls, 0);
         box->task = task;
 }
@@ -350 +351 @@
         } else {
                 atomic_inc(&phone->active_calls);
+                atomic_inc(&caller->answerbox.active_calls);
                 kobject_add_ref(phone->kobject);
                 call->sender = caller;
@@ -564 +566 @@
                 list_remove(&request->ab_link);
                 atomic_dec(&request->caller_phone->active_calls);
+                atomic_dec(&box->active_calls);
                 kobject_put(request->caller_phone->kobject);
         } else if (!list_empty(&box->calls)) {
@@ -709 +712 @@
 
         atomic_dec(&call->caller_phone->active_calls);
+        atomic_dec(&TASK->answerbox.active_calls);
         kobject_put(call->caller_phone->kobject);
 
@@ -799 +803 @@
         /*
          * Go through all phones, until they are all free.
-         * Locking is needed as there may be connection handshakes in progress.
          */
         restart = false;
         if (caps_apply_to_kobject_type(TASK, KOBJECT_TYPE_PHONE,
-            phone_cap_wait_cb, &restart)) {
+            phone_cap_wait_cb, &restart) &&
+            atomic_get(&TASK->answerbox.active_calls) == 0) {
                 /* Got into cleanup */
                 return;