Changeset 119c335 in mainline

Timestamp:

2008-09-25T18:17:00Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e436cfe

Parents:

0993087

Message:

Add comments documenting our treatment of the task's active call counter.

Location:

kernel/generic/src/ipc

Files:

• ipc.c (modified) (2 diffs)
• sysipc.c (modified) (1 diff)

kernel/generic/src/ipc/ipc.c

@@ -509 +509 @@
 
         /* Free unused call */
-        if (call) ipc_call_free(call);
+        if (call)
+                ipc_call_free(call);
 }
 
@@ -574 +575 @@
                 ASSERT(!(call->flags & IPC_CALL_STATIC_ALLOC));
                 
+                /*
+                 * Record the receipt of this call in the current task's counter
+                 * of active calls. IPC_M_PHONE_HUNGUP calls do not contribute
+                 * to this counter so do not record answers to them either.
+                 */
                 if (!(call->flags & IPC_CALL_DISCARD_ANSWER))
                         atomic_dec(&TASK->active_calls);

kernel/generic/src/ipc/sysipc.c

@@ -823 +823 @@
                 ASSERT(! (call->flags & IPC_CALL_STATIC_ALLOC));
 
-                if (!(call->flags & IPC_CALL_DISCARD_ANSWER))
-                        atomic_dec(&TASK->active_calls);
-
                 if (call->flags & IPC_CALL_DISCARD_ANSWER) {
                         ipc_call_free(call);
                         goto restart;
+                } else {
+                        /*
+                         * Decrement the counter of active calls only if the
+                         * call is not an answer to IPC_M_PHONE_HUNGUP,
+                         * which doesn't contribute to the counter.
+                         */
+                        atomic_dec(&TASK->active_calls);
                 }