Changeset 5c90e3e in mainline for kernel/generic/src/ipc/ipc.c

Timestamp:

2012-10-18T22:38:27Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

508fff8

Parents:

b801f2d (diff), 7d248e3 (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.

Message:

merge mainline changes

File:

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

kernel/generic/src/ipc/ipc.c

@@ -255 +255 @@
 }
 
-/** Simulate sending back a message.
- *
- * Most errors are better handled by forming a normal backward
- * message and sending it as a normal answer.
- *
- * @param phone Phone structure the call should appear to come from.
- * @param call  Call structure to be answered.
- * @param err   Return value to be used for the answer.
- *
- */
-void ipc_backsend_err(phone_t *phone, call_t *call, sysarg_t err)
+static void _ipc_call_actions_internal(phone_t *phone, call_t *call)
 {
         task_t *caller = phone->caller;
@@ -279 +269 @@
 
         call->data.phone = phone;
-
+        call->data.task_id = caller->taskid;
+}
+
+/** Simulate sending back a message.
+ *
+ * Most errors are better handled by forming a normal backward
+ * message and sending it as a normal answer.
+ *
+ * @param phone Phone structure the call should appear to come from.
+ * @param call  Call structure to be answered.
+ * @param err   Return value to be used for the answer.
+ *
+ */
+void ipc_backsend_err(phone_t *phone, call_t *call, sysarg_t err)
+{
+        _ipc_call_actions_internal(phone, call);
         IPC_SET_RETVAL(call->data, err);
         _ipc_answer_free_call(call, false);
@@ -300 +305 @@
         irq_spinlock_unlock(&caller->lock, true);
         
-        if (!(call->flags & IPC_CALL_FORWARDED)) {
-                atomic_inc(&phone->active_calls);
-                call->caller_phone = phone;
-                call->sender = caller;
-
-                call->active = true;
-                spinlock_lock(&caller->active_calls_lock);
-                list_append(&call->ta_link, &caller->active_calls);
-                spinlock_unlock(&caller->active_calls_lock);
-
-                call->data.phone = phone;
-                call->data.task_id = caller->taskid;
-        }
+        if (!(call->flags & IPC_CALL_FORWARDED))
+                _ipc_call_actions_internal(phone, call);
         
         irq_spinlock_lock(&box->lock, true);
@@ -518 +512 @@
 
                 irq_spinlock_unlock(&box->lock, true);
+
+                if (lst == &box->calls)
+                        SYSIPC_OP(request_process, call, box);
 
                 ipc_data_t old = call->data;
@@ -643 +640 @@
         atomic_dec(&call->caller_phone->active_calls);
 
-        sysipc_ops_t *ops = sysipc_ops_get(call->request_method);
-        if (ops->request_forget)
-                ops->request_forget(call);
+        SYSIPC_OP(request_forget, call);
 
         ipc_call_release(call);
@@ -713 +708 @@
             SYNCH_FLAGS_NONE);
         ASSERT(call->flags & (IPC_CALL_ANSWERED | IPC_CALL_NOTIF));
+
+        SYSIPC_OP(answer_process, call);
+
         ipc_call_free(call);
         goto restart;
@@ -754 +752 @@
         
         /* Answer all messages in 'calls' and 'dispatched_calls' queues */
+        ipc_cleanup_call_list(&TASK->answerbox, &TASK->answerbox.calls);
         ipc_cleanup_call_list(&TASK->answerbox,
             &TASK->answerbox.dispatched_calls);
-        ipc_cleanup_call_list(&TASK->answerbox, &TASK->answerbox.calls);
 
         ipc_forget_all_active_calls();