Changeset 25a76ab8 in mainline for kernel/generic/src/ipc/ipc.c

Timestamp:

2010-05-08T07:53:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (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 mainline changes.

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;
@@ -281 +284 @@
 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)) {
@@ -386 +393 @@
 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);
@@ -422 +433 @@
         call_t *request;
         ipl_t ipl;
+        uint64_t irq_cnt = 0;
+        uint64_t answer_cnt = 0;
+        uint64_t call_cnt = 0;
         int rc;
 
@@ -431 +445 @@
         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);
+                irq_cnt++;      
 
                 ipl = interrupts_disable();
@@ -447 +458 @@
         } else if (!list_empty(&box->answers)) {
                 /* Count recieved answer */
-                spinlock_lock(&TASK->lock);
-                TASK->ipc_info.answer_recieved++;
-                spinlock_unlock(&TASK->lock);
+                answer_cnt++;
 
                 /* Handle asynchronous answers */
@@ -457 +466 @@
         } else if (!list_empty(&box->calls)) {
                 /* Count recieved call */
-                spinlock_lock(&TASK->lock);
-                TASK->ipc_info.call_recieved++;
-                spinlock_unlock(&TASK->lock);
+                call_cnt++;
 
                 /* Handle requests */
@@ -472 +479 @@
         }
         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;
 }
@@ -675 +691 @@
         call_t *call;
         link_t *tmp;
+        ipl_t ipl;
         
+        ipl = interrupts_disable();
         spinlock_lock(&tasks_lock);
         task = task_find_by_id(taskid);
@@ -681 +699 @@
                 spinlock_lock(&task->lock);
         spinlock_unlock(&tasks_lock);
-        if (!task)
+        if (!task) {
+                interrupts_restore(ipl);
                 return;
+        }
 
         /* Print opened phones & details */
@@ -765 +785 @@
         spinlock_unlock(&task->answerbox.lock);
         spinlock_unlock(&task->lock);
+        interrupts_restore(ipl);
 }