Changeset a307beb in mainline

Timestamp:

2010-04-14T14:41:54Z (14 years ago)

Author:

Stanislav Kozina <stanislav.kozina@…>

Branches:

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

Children:

bdfd3c97

Parents:

e43cdac

Message:

IPC statistics measured.

Location:

kernel/generic

Files:

• include/proc/task.h (modified) (1 diff)
• include/ps/taskinfo.h (modified) (2 diffs)
• src/ipc/ipc.c (modified) (6 diffs)
• src/proc/task.c (modified) (1 diff)
• src/ps/ps.c (modified) (1 diff)

kernel/generic/include/proc/task.h

@@ -94 +94 @@
         answerbox_t answerbox;  /**< Communication endpoint */
         phone_t phones[IPC_MAX_PHONES];
+        task_ipc_info_t ipc_info; /**< IPC statistics */
         /**
          * Active asynchronous messages. It is used for limiting uspace to

kernel/generic/include/ps/taskinfo.h

@@ -46 +46 @@
 
 typedef struct {
+        uint64_t call_sent;
+        uint64_t call_recieved;
+        uint64_t answer_sent;
+        uint64_t answer_recieved;
+        uint64_t irq_notif_recieved;
+        uint64_t forwarded;
+} task_ipc_info_t;
+
+typedef struct {
         task_id_t taskid;
         char name[TASK_NAME_BUFLEN];
@@ -52 +61 @@
         uint64_t ucycles;
         uint64_t kcycles;
+        task_ipc_info_t ipc_info;
 } task_info_t;
 

kernel/generic/src/ipc/ipc.c

@@ -219 +219 @@
         bool do_lock = ((!selflocked) || callerbox != (&TASK->answerbox));
 
+        spinlock_lock(&TASK->lock);
+        TASK->ipc_info.answer_sent++;
+        spinlock_unlock(&TASK->lock);
+
         call->flags |= IPC_CALL_ANSWERED;
 
@@ -276 +280 @@
 static void _ipc_call(phone_t *phone, answerbox_t *box, call_t *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 +384 @@
 int ipc_forward(call_t *call, phone_t *newphone, answerbox_t *oldbox, int mode)
 {
+        spinlock_lock(&TASK->lock);
+        TASK->ipc_info.forwarded++;
+        spinlock_unlock(&TASK->lock);
+
         spinlock_lock(&oldbox->lock);
         list_remove(&call->link);
@@ -416 +428 @@
         spinlock_lock(&box->lock);
         if (!list_empty(&box->irq_notifs)) {
+
+                spinlock_lock(&TASK->lock);
+                TASK->ipc_info.irq_notif_recieved++;
+                spinlock_unlock(&TASK->lock);
+
                 ipl = interrupts_disable();
                 spinlock_lock(&box->irq_lock);
@@ -425 +442 @@
                 interrupts_restore(ipl);
         } else if (!list_empty(&box->answers)) {
+                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 +451 @@
                 atomic_dec(&request->data.phone->active_calls);
         } else if (!list_empty(&box->calls)) {
+
+                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);

kernel/generic/src/proc/task.c

@@ -187 +187 @@
         ta->kcycles = 0;
 
+        ta->ipc_info.call_sent = 0;
+        ta->ipc_info.call_recieved = 0;
+        ta->ipc_info.answer_sent = 0;
+        ta->ipc_info.answer_recieved = 0;
+        ta->ipc_info.irq_notif_recieved = 0;
+        ta->ipc_info.forwarded = 0;
+
 #ifdef CONFIG_UDEBUG
         /* Init debugging stuff */

kernel/generic/src/ps/ps.c

@@ -143 +143 @@
         copy_to_uspace(&uspace_info->kcycles, &kcycles, sizeof(uint64_t));
 
+        task_ipc_info_t ipc_info;
+        ipc_info.call_sent = t->ipc_info.call_sent;
+        ipc_info.call_recieved = t->ipc_info.call_recieved;
+        ipc_info.answer_sent = t->ipc_info.answer_sent;
+        ipc_info.answer_recieved = t->ipc_info.answer_recieved;
+        ipc_info.irq_notif_recieved = t->ipc_info.irq_notif_recieved;
+        ipc_info.forwarded = t->ipc_info.forwarded;
+        copy_to_uspace(&uspace_info->ipc_info, &ipc_info, sizeof(task_ipc_info_t));
+
         uint64_t memory = get_task_memory(t->as);
         copy_to_uspace(&uspace_info->virt_mem, &memory, sizeof(memory));