Changeset 2541646 in mainline

Timestamp:

2012-09-03T22:23:30Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c33f39f

Parents:

9c9bbaf

Message:

Do not slam phones of potentially long gone forwarder tasks.
Instead, slam the caller's phone, if it is still connected.

File:

• kernel/generic/src/ipc/sysipc.c (modified) (1 diff)

kernel/generic/src/ipc/sysipc.c

@@ -199 +199 @@
 
         if ((native_t) IPC_GET_RETVAL(answer->data) == EHANGUP) {
-                /* In case of forward, hangup the forwared phone,
-                 * not the originator
-                 */
-                mutex_lock(&answer->data.phone->lock);
-                irq_spinlock_lock(&TASK->answerbox.lock, true);
-                if (answer->data.phone->state == IPC_PHONE_CONNECTED) {
-                        list_remove(&answer->data.phone->link);
-                        answer->data.phone->state = IPC_PHONE_SLAMMED;
+                phone_t *phone = answer->caller_phone;
+                mutex_lock(&phone->lock);
+                if (phone->state == IPC_PHONE_CONNECTED) {
+                        irq_spinlock_lock(&phone->callee->lock, true);
+                        list_remove(&phone->link);
+                        phone->state = IPC_PHONE_SLAMMED;
+                        irq_spinlock_unlock(&phone->callee->lock, true);
                 }
-                irq_spinlock_unlock(&TASK->answerbox.lock, true);
-                mutex_unlock(&answer->data.phone->lock);
+                mutex_unlock(&phone->lock);
         }