Changeset c33f39f in mainline for kernel/generic/src/ipc/ipc.c

Timestamp:

2012-09-04T21:12:43Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

983cabe8

Parents:

2541646

Message:

Do not establish callback connections after the answerbox enters cleanup.

File:

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

kernel/generic/src/ipc/ipc.c

@@ -137 +137 @@
  * @param phone Initialized phone structure.
  * @param box   Initialized answerbox structure.
- *
- */
-void ipc_phone_connect(phone_t *phone, answerbox_t *box)
-{
+ * @return      True if the phone was connected, false otherwise.
+ */
+bool ipc_phone_connect(phone_t *phone, answerbox_t *box)
+{
+        bool active;
+
         mutex_lock(&phone->lock);
-        
-        phone->state = IPC_PHONE_CONNECTED;
-        phone->callee = box;
-        
         irq_spinlock_lock(&box->lock, true);
-        list_append(&phone->link, &box->connected_phones);
+
+        active = box->active;
+        if (active) {
+                phone->state = IPC_PHONE_CONNECTED;
+                phone->callee = box;
+                list_append(&phone->link, &box->connected_phones);
+        }
+
         irq_spinlock_unlock(&box->lock, true);
-        
         mutex_unlock(&phone->lock);
+
+        return active;
 }
 
@@ -684 +690 @@
 void ipc_cleanup(void)
 {
+        /*
+         * Mark the answerbox as inactive.
+         *
+         * The main purpose for doing this is to prevent any pending callback
+         * connections from getting established beyond this point.
+         */
+        irq_spinlock_lock(&TASK->answerbox.lock, true);
+        TASK->answerbox.active = false;
+        irq_spinlock_unlock(&TASK->answerbox.lock, true);
+
         /* Disconnect all our phones ('ipc_phone_hangup') */
         for (size_t i = 0; i < IPC_MAX_PHONES; i++)