Changeset 86939b1 in mainline

Timestamp:

2012-08-13T14:12:19Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1cb75de

Parents:

cfaa35a

Message:

Maintain task's active calls in the active call list.

• The call is placed on the list when sent and removed when the answer is picked up by the task.

Location:

kernel/generic

Files:

• include/ipc/ipc.h (modified) (1 diff)
• include/proc/task.h (modified) (1 diff)
• src/ipc/ipc.c (modified) (3 diffs)
• src/proc/task.c (modified) (1 diff)

kernel/generic/include/ipc/ipc.h

@@ -106 +106 @@
 
 typedef struct {
+        /** Task link. */
+        link_t ta_link;
+
         /** Answerbox link. */
         link_t ab_link;

kernel/generic/include/proc/task.h

@@ -91 +91 @@
         
         /* IPC stuff */
-        answerbox_t answerbox;  /**< Communication endpoint */
+
+        /** Receiving communication endpoint */
+        answerbox_t answerbox;
+
+        /** Sending communication endpoints */
         phone_t phones[IPC_MAX_PHONES];
-        stats_ipc_t ipc_info;   /**< IPC statistics */
+
+        /** Spinlock protecting the active_calls list. */
+        SPINLOCK_DECLARE(active_calls_lock);
+
+        /**
+         * List of all calls sent by this task that have not yet been
+         * answered.
+         */
+        list_t active_calls;
+
         event_t events[EVENT_TASK_END - EVENT_END];
+
+        /** IPC statistics */
+        stats_ipc_t ipc_info;
         
 #ifdef CONFIG_UDEBUG

kernel/generic/src/ipc/ipc.c

@@ -230 +230 @@
         call->data.phone = phone;
         atomic_inc(&phone->active_calls);
+
+        spinlock_lock(&TASK->active_calls_lock);
+        list_append(&call->ta_link, &TASK->active_calls);
+        spinlock_unlock(&TASK->active_calls_lock);
+
         IPC_SET_RETVAL(call->data, err);
         _ipc_answer_free_call(call, false);
@@ -250 +255 @@
         if (!(call->flags & IPC_CALL_FORWARDED)) {
                 atomic_inc(&phone->active_calls);
+
+                spinlock_lock(&TASK->active_calls_lock);
+                list_append(&call->ta_link, &TASK->active_calls);
+                spinlock_unlock(&TASK->active_calls_lock);
+
                 call->data.phone = phone;
                 call->data.task_id = TASK->taskid;
@@ -419 +429 @@
                 list_remove(&request->ab_link);
                 atomic_dec(&request->data.phone->active_calls);
+
+                /*
+                 * Remove the call from this task's active call list.
+                 */
+                spinlock_lock(&TASK->active_calls_lock);
+                list_remove(&request->ta_link);
+                spinlock_unlock(&TASK->active_calls_lock);
         } else if (!list_empty(&box->calls)) {
                 /* Count received call */

kernel/generic/src/proc/task.c

@@ -162 +162 @@
         for (i = 0; i < IPC_MAX_PHONES; i++)
                 ipc_phone_init(&task->phones[i]);
+
+        spinlock_initialize(&task->active_calls_lock, "active_calls_lock");
+        list_initialize(&task->active_calls);
         
 #ifdef CONFIG_UDEBUG