Changeset 5a77550 in mainline

Timestamp:

2012-08-28T23:13:18Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9c9903a

Parents:

f39d5c2

Message:

Always remember the original caller phone in a call.

Location:

kernel/generic

Files:

• include/ipc/ipc.h (modified) (2 diffs)
• src/ipc/ipc.c (modified) (7 diffs)

kernel/generic/include/ipc/ipc.h

@@ -141 +141 @@
         struct task *sender;
         
+        /** Phone which was used to send the call. */
+        phone_t *caller_phone;
+        
         /** Private data to internal IPC. */
         sysarg_t priv;
@@ -152 +155 @@
         /** Buffer for IPC_M_DATA_WRITE and IPC_M_DATA_READ. */
         uint8_t *buffer;
-        
-        /*
-         * The forward operation can masquerade the caller phone. For those
-         * cases, we must keep it aside so that the answer is processed
-         * correctly.
-         */
-        phone_t *caller_phone;
 } call_t;
 

kernel/generic/src/ipc/ipc.c

@@ -165 +165 @@
 }
 
-/** Demasquerade the caller phone. */
-static void ipc_caller_phone_demasquerade(call_t *call)
-{
-        if (call->flags & IPC_CALL_FORWARDED) {
-                if (call->caller_phone) {
-                        call->data.phone = call->caller_phone;
-                }
-        }
-}
-
 /** Answer a message which was not dispatched and is not listed in any queue.
  *
@@ -213 +203 @@
         call->flags |= IPC_CALL_ANSWERED;
         
-        ipc_caller_phone_demasquerade(call);
-
         call->data.task_id = TASK->taskid;
         
@@ -257 +245 @@
 void ipc_backsend_err(phone_t *phone, call_t *call, sysarg_t err)
 {
+        call->caller_phone = phone;
         call->data.phone = phone;
         atomic_inc(&phone->active_calls);
@@ -285 +274 @@
                 atomic_inc(&phone->active_calls);
 
+                call->caller_phone = phone;
                 call->active = true;
 
@@ -401 +391 @@
         
         if (mode & IPC_FF_ROUTE_FROM_ME) {
-                if (!call->caller_phone)
-                        call->caller_phone = call->data.phone;
                 call->data.phone = newphone;
                 call->data.task_id = TASK->taskid;
@@ -459 +447 @@
                     call_t, ab_link);
                 list_remove(&request->ab_link);
-                atomic_dec(&request->data.phone->active_calls);
+                atomic_dec(&request->caller_phone->active_calls);
         } else if (!list_empty(&box->calls)) {
                 /* Count received call */
@@ -605 +593 @@
         list_remove(&call->ta_link);
 
-        ipc_caller_phone_demasquerade(call);
-        atomic_dec(&call->data.phone->active_calls);
-
         spinlock_unlock(&call->forget_lock);
         spinlock_unlock(&TASK->active_calls_lock);
+
+        atomic_dec(&call->caller_phone->active_calls);
 
         sysipc_ops_t *ops = sysipc_ops_get(call->request_method);