Changes in kernel/generic/src/ipc/ipc.c [170332d:c713aa56] in mainline

File:

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

kernel/generic/src/ipc/ipc.c

@@ -218 +218 @@
         answerbox_t *callerbox = call->callerbox;
         bool do_lock = ((!selflocked) || callerbox != (&TASK->answerbox));
-        ipl_t ipl;
-
-        /* Count sent answer */
-        ipl = interrupts_disable();
-        spinlock_lock(&TASK->lock);
-        TASK->ipc_info.answer_sent++;
-        spinlock_unlock(&TASK->lock);
-        interrupts_restore(ipl);
 
         call->flags |= IPC_CALL_ANSWERED;
@@ -284 +276 @@
 static void _ipc_call(phone_t *phone, answerbox_t *box, call_t *call)
 {
-        ipl_t ipl;
-
-        /* Count sent ipc call */
-        ipl = interrupts_disable();
-        spinlock_lock(&TASK->lock);
-        TASK->ipc_info.call_sent++;
-        spinlock_unlock(&TASK->lock);
-        interrupts_restore(ipl);
-
         if (!(call->flags & IPC_CALL_FORWARDED)) {
                 atomic_inc(&phone->active_calls);
@@ -393 +376 @@
 int ipc_forward(call_t *call, phone_t *newphone, answerbox_t *oldbox, int mode)
 {
-        ipl_t ipl;
-
-        /* Count forwarded calls */
-        ipl = interrupts_disable();
-        spinlock_lock(&TASK->lock);
-        TASK->ipc_info.forwarded++;
-        spinlock_unlock(&TASK->lock);
-        interrupts_restore(ipl);
-
         spinlock_lock(&oldbox->lock);
         list_remove(&call->link);
@@ -433 +407 @@
         call_t *request;
         ipl_t ipl;
-        uint64_t irq_cnt = 0;
-        uint64_t answer_cnt = 0;
-        uint64_t call_cnt = 0;
         int rc;
 
@@ -445 +416 @@
         spinlock_lock(&box->lock);
         if (!list_empty(&box->irq_notifs)) {
-                /* Count recieved IRQ notification */
-                irq_cnt++;      
-
                 ipl = interrupts_disable();
                 spinlock_lock(&box->irq_lock);
@@ -457 +425 @@
                 interrupts_restore(ipl);
         } else if (!list_empty(&box->answers)) {
-                /* Count recieved answer */
-                answer_cnt++;
-
                 /* Handle asynchronous answers */
                 request = list_get_instance(box->answers.next, call_t, link);
@@ -465 +430 @@
                 atomic_dec(&request->data.phone->active_calls);
         } else if (!list_empty(&box->calls)) {
-                /* Count recieved call */
-                call_cnt++;
-
                 /* Handle requests */
                 request = list_get_instance(box->calls.next, call_t, link);
@@ -479 +441 @@
         }
         spinlock_unlock(&box->lock);
-        
-        ipl = interrupts_disable();
-        spinlock_lock(&TASK->lock);
-        TASK->ipc_info.irq_notif_recieved += irq_cnt;
-        TASK->ipc_info.answer_recieved += answer_cnt;
-        TASK->ipc_info.call_recieved += call_cnt;
-        spinlock_unlock(&TASK->lock);
-        interrupts_restore(ipl);
-
         return request;
 }
@@ -691 +644 @@
         call_t *call;
         link_t *tmp;
-        ipl_t ipl;
         
-        ipl = interrupts_disable();
         spinlock_lock(&tasks_lock);
         task = task_find_by_id(taskid);
@@ -699 +650 @@
                 spinlock_lock(&task->lock);
         spinlock_unlock(&tasks_lock);
-        if (!task) {
-                interrupts_restore(ipl);
+        if (!task)
                 return;
-        }
 
         /* Print opened phones & details */
@@ -785 +734 @@
         spinlock_unlock(&task->answerbox.lock);
         spinlock_unlock(&task->lock);
-        interrupts_restore(ipl);
 }