Changeset 03a8a8e in mainline

Timestamp:

2012-09-15T18:19:04Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e9fe33b

Parents:

c97b086

Message:

Link each phone to its containing task.

This makes it possible to set the call's sender reliably using just the
info stored in the phone used to make the call.

Location:

kernel/generic

Files:

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

kernel/generic/include/ipc/ipc.h

@@ -65 +65 @@
         mutex_t lock;
         link_t link;
+        struct task *caller;
         struct answerbox *callee;
         ipc_phone_state_t state;
@@ -177 +178 @@
 extern void _ipc_answer_free_call(call_t *, bool);
 
-extern void ipc_phone_init(phone_t *);
+extern void ipc_phone_init(phone_t *, struct task *);
 extern bool ipc_phone_connect(phone_t *, answerbox_t *);
 extern int ipc_phone_hangup(phone_t *);

kernel/generic/src/ipc/ipc.c

@@ -76 +76 @@
         call->active = false;
         call->forget = false;
-        call->sender = TASK;
+        call->sender = NULL;
         call->buffer = NULL;
 }
@@ -175 +175 @@
  *
  * @param phone Phone structure to be initialized.
- *
- */
-void ipc_phone_init(phone_t *phone)
+ * @param caller Owning task.
+ *
+ */
+void ipc_phone_init(phone_t *phone, task_t *caller)
 {
         mutex_initialize(&phone->lock, MUTEX_PASSIVE);
+        phone->caller = caller;
         phone->callee = NULL;
         phone->state = IPC_PHONE_FREE;
@@ -265 +267 @@
 void ipc_backsend_err(phone_t *phone, call_t *call, sysarg_t err)
 {
+        task_t *caller = phone->caller;
+
         atomic_inc(&phone->active_calls);
         call->caller_phone = phone;
+        call->sender = caller;
 
         call->active = true;
-        spinlock_lock(&TASK->active_calls_lock);
-        list_append(&call->ta_link, &TASK->active_calls);
-        spinlock_unlock(&TASK->active_calls_lock);
+        spinlock_lock(&caller->active_calls_lock);
+        list_append(&call->ta_link, &caller->active_calls);
+        spinlock_unlock(&caller->active_calls_lock);
 
         call->data.phone = phone;
@@ -288 +293 @@
 static void _ipc_call(phone_t *phone, answerbox_t *box, call_t *call)
 {
+        task_t *caller = phone->caller;
+
         /* Count sent ipc call */
-        irq_spinlock_lock(&TASK->lock, true);
-        TASK->ipc_info.call_sent++;
-        irq_spinlock_unlock(&TASK->lock, true);
+        irq_spinlock_lock(&caller->lock, true);
+        caller->ipc_info.call_sent++;
+        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(&TASK->active_calls_lock);
-                list_append(&call->ta_link, &TASK->active_calls);
-                spinlock_unlock(&TASK->active_calls_lock);
+                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 = TASK->taskid;
+                call->data.task_id = phone->caller->taskid;
         }
         
@@ -559 +567 @@
                         // FIXME: phone can become deallocated at any time now
 
-                        // FIXME: call->sender == TASK
-                        
                         /*
                          * Send one message to the answerbox for each

kernel/generic/src/ipc/kbox.c

@@ -168 +168 @@
         while (!done) {
                 call_t *call = ipc_wait_for_call(&TASK->kb.box, SYNCH_NO_TIMEOUT,
-                        SYNCH_FLAGS_NONE);
+                    SYNCH_FLAGS_NONE);
                 
                 if (call == NULL)

kernel/generic/src/proc/task.c

@@ -161 +161 @@
         size_t i;
         for (i = 0; i < IPC_MAX_PHONES; i++)
-                ipc_phone_init(&task->phones[i]);
+                ipc_phone_init(&task->phones[i], task);
 
         spinlock_initialize(&task->active_calls_lock, "active_calls_lock");