Changeset 716185d in mainline

Timestamp:

2012-10-03T20:37:07Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

466e95f7

Parents:

190976f

Message:

Call request_process() callback for incoming calls during IPC cleanup.

Location:

kernel/generic

Files:

• include/ipc/sysipc_ops.h (modified) (3 diffs)
• src/ipc/ipc.c (modified) (2 diffs)
• src/ipc/kbox.c (modified) (1 diff)
• src/ipc/ops/concttome.c (modified) (2 diffs)

kernel/generic/include/ipc/sysipc_ops.h

@@ -70 +70 @@
  * the call is request_forget().
  *
- * The request_process() callback will be skipped if the callee terminates
- * before picking up the request. In this case, the terminating task will
- * cleanup its incoming calls list and so the next callback invoked on the call
- * will usually be answer_preprocess(). If, in the meantime, the caller
- * terminates too, it may happen that the call will be forgotten instead of
- * answered, in which case the kernel will invoke the request_forget() and
- * answer_cleanup() callbacks instead. The order in which they are invoked is
- * not defined. 
- *
  * The comments for each callback type describe the specifics of each callback
  * such as the context in which it is invoked and various constraints.
@@ -112 +103 @@
          * Caller alive:        no guarantee
          * Races with:          request_forget()
-         * Invoked on:          calls that are explicitly received by the callee
+         * Invoked on:          all calls delivered to the callee
          */     
         int (* request_process)(call_t *, answerbox_t *);
@@ -144 +135 @@
          * Caller alive:        guaranteed
          * Races with:          N/A
-         * Invoked on:          answered calls explicitly received by the caller
+         * Invoked on:          all answered calls
          */
         int (* answer_process)(call_t *);

kernel/generic/src/ipc/ipc.c

@@ -513 +513 @@
                 irq_spinlock_unlock(&box->lock, true);
 
+                if (lst == &box->calls) {
+                        sysipc_ops_t *ops;
+
+                        ops = sysipc_ops_get(call->request_method);
+                        if (ops->request_process)
+                                (void) ops->request_process(call, box);
+                }
+
                 ipc_data_t old = call->data;
                 IPC_SET_RETVAL(call->data, EHANGUP);
@@ -753 +761 @@
         
         /* 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();

kernel/generic/src/ipc/kbox.c

@@ -96 +96 @@
         
         /* Answer all messages in 'calls' and 'dispatched_calls' queues. */
+        ipc_cleanup_call_list(&TASK->kb.box, &TASK->kb.box.calls);
         ipc_cleanup_call_list(&TASK->kb.box, &TASK->kb.box.dispatched_calls);
-        ipc_cleanup_call_list(&TASK->kb.box, &TASK->kb.box.calls);
 }
 

kernel/generic/src/ipc/ops/concttome.c

@@ -39 +39 @@
 #include <abi/errno.h>
 #include <arch.h>
-
-static int request_preprocess(call_t *call, phone_t *phone)
-{
-        /* Start with the assumption that there is no allocated phoneid. */
-        IPC_SET_ARG5(call->data, -1);
-        return EOK;
-}
 
 static int request_process(call_t *call, answerbox_t *box)
@@ -91 +84 @@
 
 sysipc_ops_t ipc_m_connect_to_me_ops = {
-        .request_preprocess = request_preprocess,
+        .request_preprocess = null_request_preprocess,
         .request_forget = null_request_forget,
         .request_process = request_process,