Changeset bf1fb9f in mainline for kernel/generic/src/ipc/sysipc.c

Timestamp:

2009-06-03T18:45:53Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

bbdbf86

Parents:

40313e4

Message:

Streamline locking of phones during cloning.

File:

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

kernel/generic/src/ipc/sysipc.c

@@ -337 +337 @@
 }
 
+static void phones_lock(phone_t *p1, phone_t *p2)
+{
+        if (p1 < p2) {
+                mutex_lock(&p1->lock);
+                mutex_lock(&p2->lock);
+        } else if (p1 > p2) {
+                mutex_lock(&p2->lock);
+                mutex_lock(&p1->lock);
+        } else {
+                mutex_lock(&p1->lock);
+        }
+}
+
+static void phones_unlock(phone_t *p1, phone_t *p2)
+{
+        mutex_unlock(&p1->lock);
+        if (p1 != p2)
+                mutex_unlock(&p2->lock);
+}
+
 /** Called before the request is sent.
  *
@@ -356 +376 @@
                 GET_CHECK_PHONE(cloned_phone, IPC_GET_ARG1(call->data),
                     return ENOENT);
-                if (cloned_phone < phone) {
-                        mutex_lock(&cloned_phone->lock);
-                        mutex_lock(&phone->lock);
-                } else if (cloned_phone > phone) {
-                        mutex_lock(&phone->lock);
-                        mutex_lock(&cloned_phone->lock);
-                } else {
-                        mutex_lock(&phone->lock);
-                }
+                phones_lock(cloned_phone, phone);
                 if ((cloned_phone->state != IPC_PHONE_CONNECTED) ||
                     phone->state != IPC_PHONE_CONNECTED) {
-                        if (cloned_phone != phone)
-                                mutex_unlock(&cloned_phone->lock);
-                        mutex_unlock(&phone->lock);
+                        phones_unlock(cloned_phone, phone);
                         return EINVAL;
                 }
@@ -380 +390 @@
                 newphid = phone_alloc(phone->callee->task);
                 if (newphid < 0) {
-                        if (cloned_phone != phone)
-                                mutex_unlock(&cloned_phone->lock);
-                        mutex_unlock(&phone->lock);
+                        phones_unlock(cloned_phone, phone);
                         return ELIMIT;
                 }
                 ipc_phone_connect(&phone->callee->task->phones[newphid],
                     cloned_phone->callee);
-                if (cloned_phone != phone)
-                        mutex_unlock(&cloned_phone->lock);
-                mutex_unlock(&phone->lock);
+                phones_unlock(cloned_phone, phone);
                 /* Set the new phone for the callee. */
                 IPC_SET_ARG1(call->data, newphid);