Changeset 88dea9d in mainline for kernel/generic/src/ipc/ipc.c

Timestamp:

2010-04-17T16:28:49Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

30a5470

Parents:

5ba201d (diff), 95319bd (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 from measuring branch

File:

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

kernel/generic/src/ipc/ipc.c

@@ -219 +219 @@
         bool do_lock = ((!selflocked) || callerbox != (&TASK->answerbox));
 
+        /* Count sent answer */
+        spinlock_lock(&TASK->lock);
+        TASK->ipc_info.answer_sent++;
+        spinlock_unlock(&TASK->lock);
+
         call->flags |= IPC_CALL_ANSWERED;
 
@@ -276 +281 @@
 static void _ipc_call(phone_t *phone, answerbox_t *box, call_t *call)
 {
+        /* Count sent ipc call */
+        spinlock_lock(&TASK->lock);
+        TASK->ipc_info.call_sent++;
+        spinlock_unlock(&TASK->lock);
+
         if (!(call->flags & IPC_CALL_FORWARDED)) {
                 atomic_inc(&phone->active_calls);
@@ -376 +386 @@
 int ipc_forward(call_t *call, phone_t *newphone, answerbox_t *oldbox, int mode)
 {
+        /* Count forwarded calls */
+        spinlock_lock(&TASK->lock);
+        TASK->ipc_info.forwarded++;
+        spinlock_unlock(&TASK->lock);
+
         spinlock_lock(&oldbox->lock);
         list_remove(&call->link);
@@ -416 +431 @@
         spinlock_lock(&box->lock);
         if (!list_empty(&box->irq_notifs)) {
+
+                /* Count recieved IRQ notification */
+                spinlock_lock(&TASK->lock);
+                TASK->ipc_info.irq_notif_recieved++;
+                spinlock_unlock(&TASK->lock);
+
                 ipl = interrupts_disable();
                 spinlock_lock(&box->irq_lock);
@@ -425 +446 @@
                 interrupts_restore(ipl);
         } else if (!list_empty(&box->answers)) {
+                /* Count recieved answer */
+                spinlock_lock(&TASK->lock);
+                TASK->ipc_info.answer_recieved++;
+                spinlock_unlock(&TASK->lock);
+
                 /* Handle asynchronous answers */
                 request = list_get_instance(box->answers.next, call_t, link);
@@ -430 +456 @@
                 atomic_dec(&request->data.phone->active_calls);
         } else if (!list_empty(&box->calls)) {
+                /* Count recieved call */
+                spinlock_lock(&TASK->lock);
+                TASK->ipc_info.call_recieved++;
+                spinlock_unlock(&TASK->lock);
+
                 /* Handle requests */
                 request = list_get_instance(box->calls.next, call_t, link);