Changeset 05ffb41 in mainline for kernel/generic/src/ipc/ipc.c

Timestamp:

2017-08-17T19:11:14Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1c85bae

Parents:

7e3826d9

Message:

Turn IPC phones into kobjects

File:

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

kernel/generic/src/ipc/ipc.c

@@ -43 +43 @@
 #include <synch/waitq.h>
 #include <ipc/ipc.h>
+#include <ipc/ipcrsc.h>
 #include <abi/ipc/methods.h>
 #include <ipc/kbox.h>
@@ -740 +741 @@
          * Locking is needed as there may be connection handshakes in progress.
          */
-        for (i = 0; i < IPC_MAX_PHONES; i++) {
-                phone_t *phone = &TASK->phones[i];
-
-                mutex_lock(&phone->lock);       
+        for (i = 0; i < MAX_KERNEL_OBJECTS; i++) {
+                phone_t *phone = phone_get_current(i);
+                if (!phone)
+                        continue;
+
+                mutex_lock(&phone->lock);
                 if ((phone->state == IPC_PHONE_HUNGUP) &&
                     (atomic_get(&phone->active_calls) == 0)) {
@@ -784 +787 @@
                 
         /* Got into cleanup */
-        if (i == IPC_MAX_PHONES)
+        if (i == MAX_KERNEL_OBJECTS)
                 return;
                 
@@ -816 +819 @@
 
         /* Disconnect all our phones ('ipc_phone_hangup') */
-        for (size_t i = 0; i < IPC_MAX_PHONES; i++)
-                ipc_phone_hangup(&TASK->phones[i]);
+        for (int i = 0; i < MAX_KERNEL_OBJECTS; i++) {
+                phone_t *phone = phone_get_current(i);
+                if (!phone)
+                        continue;
+                ipc_phone_hangup(phone);
+        }
         
         /* Unsubscribe from any event notifications. */
@@ -903 +910 @@
         irq_spinlock_exchange(&tasks_lock, &task->lock);
         
-        printf("[phone id] [calls] [state\n");
+        printf("[phone cap] [calls] [state\n");
         
         size_t i;
-        for (i = 0; i < IPC_MAX_PHONES; i++) {
-                if (SYNCH_FAILED(mutex_trylock(&task->phones[i].lock))) {
+        for (i = 0; i < MAX_KERNEL_OBJECTS; i++) {
+                phone_t *phone = phone_get(task, i);
+                if (!phone)
+                        continue;
+
+                if (SYNCH_FAILED(mutex_trylock(&phone->lock))) {
                         printf("%-10zu (mutex busy)\n", i);
                         continue;
                 }
                 
-                if (task->phones[i].state != IPC_PHONE_FREE) {
-                        printf("%-10zu %7" PRIun " ", i,
-                            atomic_get(&task->phones[i].active_calls));
+                if (phone->state != IPC_PHONE_FREE) {
+                        printf("%-11zu %7" PRIun " ", i,
+                            atomic_get(&phone->active_calls));
                         
-                        switch (task->phones[i].state) {
+                        switch (phone->state) {
                         case IPC_PHONE_CONNECTING:
                                 printf("connecting");
@@ -922 +933 @@
                         case IPC_PHONE_CONNECTED:
                                 printf("connected to %" PRIu64 " (%s)",
-                                    task->phones[i].callee->task->taskid,
-                                    task->phones[i].callee->task->name);
+                                    phone->callee->task->taskid,
+                                    phone->callee->task->name);
                                 break;
                         case IPC_PHONE_SLAMMED:
-                                printf("slammed by %p",
-                                    task->phones[i].callee);
+                                printf("slammed by %p", phone->callee);
                                 break;
                         case IPC_PHONE_HUNGUP:
-                                printf("hung up by %p",
-                                    task->phones[i].callee);
+                                printf("hung up by %p", phone->callee);
                                 break;
                         default:
@@ -940 +949 @@
                 }
                 
-                mutex_unlock(&task->phones[i].lock);
+                mutex_unlock(&phone->lock);
         }