Changeset ff48a15 in mainline

Timestamp:

2008-05-28T20:47:45Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

33c058d3

Parents:

10ef329a

Message:

Turn phone→lock into mutex.

Location:

kernel/generic

Files:

• include/ipc/ipc.h (modified) (2 diffs)
• src/ipc/ipc.c (modified) (13 diffs)
• src/ipc/sysipc.c (modified) (2 diffs)

kernel/generic/include/ipc/ipc.h

@@ -206 +206 @@
 #define IPC_MAX_PHONES  16
 
+#include <synch/spinlock.h>
+#include <synch/mutex.h>
 #include <synch/waitq.h>
 
@@ -226 +228 @@
 /** Structure identifying phone (in TASK structure) */
 typedef struct {
-        SPINLOCK_DECLARE(lock);
+        mutex_t lock;
         link_t link;
         struct answerbox *callee;

kernel/generic/src/ipc/ipc.c

@@ -38 +38 @@
  */
 
+#include <synch/synch.h>
 #include <synch/spinlock.h>
+#include <synch/mutex.h>
 #include <synch/waitq.h>
 #include <synch/synch.h>
@@ -141 +143 @@
 void ipc_phone_connect(phone_t *phone, answerbox_t *box)
 {
-        spinlock_lock(&phone->lock);
+        mutex_lock(&phone->lock);
 
         phone->state = IPC_PHONE_CONNECTED;
@@ -150 +152 @@
         spinlock_unlock(&box->lock);
 
-        spinlock_unlock(&phone->lock);
+        mutex_unlock(&phone->lock);
 }
 
@@ -159 +161 @@
 void ipc_phone_init(phone_t *phone)
 {
-        spinlock_initialize(&phone->lock, "phone_lock");
+        mutex_initialize(&phone->lock);
         phone->callee = NULL;
         phone->state = IPC_PHONE_FREE;
@@ -262 +264 @@
         answerbox_t *box;
 
-        spinlock_lock(&phone->lock);
+        mutex_lock(&phone->lock);
         if (phone->state != IPC_PHONE_CONNECTED) {
-                spinlock_unlock(&phone->lock);
+                mutex_unlock(&phone->lock);
                 if (call->flags & IPC_CALL_FORWARDED) {
                         IPC_SET_RETVAL(call->data, EFORWARD);
@@ -279 +281 @@
         _ipc_call(phone, box, call);
         
-        spinlock_unlock(&phone->lock);
+        mutex_unlock(&phone->lock);
         return 0;
 }
@@ -298 +300 @@
         call_t *call;
         
-        spinlock_lock(&phone->lock);
+        mutex_lock(&phone->lock);
         if (phone->state == IPC_PHONE_FREE ||
             phone->state == IPC_PHONE_HUNGUP ||
             phone->state == IPC_PHONE_CONNECTING) {
-                spinlock_unlock(&phone->lock);
+                mutex_unlock(&phone->lock);
                 return -1;
         }
@@ -321 +323 @@
 
         phone->state = IPC_PHONE_HUNGUP;
-        spinlock_unlock(&phone->lock);
+        mutex_unlock(&phone->lock);
 
         return 0;
@@ -450 +452 @@
                 phone = list_get_instance(TASK->answerbox.connected_phones.next,
                     phone_t, link);
-                if (!spinlock_trylock(&phone->lock)) {
+                if (SYNCH_FAILED(mutex_trylock(&phone->lock))) {
                         spinlock_unlock(&TASK->answerbox.lock);
                         DEADLOCK_PROBE(p_phonelck, DEADLOCK_THRESHOLD);
@@ -461 +463 @@
                 list_remove(&phone->link);
 
-                spinlock_unlock(&phone->lock);
+                mutex_unlock(&phone->lock);
         }
 
@@ -536 +538 @@
         printf("PHONE:\n");
         for (i = 0; i < IPC_MAX_PHONES; i++) {
-                spinlock_lock(&task->phones[i].lock);
+                if (SYNCH_FAILED(mutex_trylock(&task->phones[i].lock))) {
+                        printf("%d: mutex busy\n", i);
+                        continue;
+                }
                 if (task->phones[i].state != IPC_PHONE_FREE) {
                         printf("%d: ", i);
@@ -561 +566 @@
                             atomic_get(&task->phones[i].active_calls));
                 }
-                spinlock_unlock(&task->phones[i].lock);
+                mutex_unlock(&task->phones[i].lock);
         }
 
@@ -580 +585 @@
         /* Print answerbox - calls */
         printf("ABOX - DISPATCHED CALLS:\n");
-        for (tmp=task->answerbox.dispatched_calls.next; 
+        for (tmp = task->answerbox.dispatched_calls.next; 
              tmp != &task->answerbox.dispatched_calls; 
              tmp = tmp->next) {

kernel/generic/src/ipc/sysipc.c

@@ -169 +169 @@
                  * not the originator
                  */
-                spinlock_lock(&answer->data.phone->lock);
+                mutex_lock(&answer->data.phone->lock);
                 spinlock_lock(&TASK->answerbox.lock);
                 if (answer->data.phone->state == IPC_PHONE_CONNECTED) {
@@ -176 +176 @@
                 }
                 spinlock_unlock(&TASK->answerbox.lock);
-                spinlock_unlock(&answer->data.phone->lock);
+                mutex_unlock(&answer->data.phone->lock);
         }