Changeset e7ac23d0 in mainline for kernel/generic/src/ipc/ipc.c

Timestamp:

2017-08-20T14:53:21Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3f74275

Parents:

49115ac

Message:

Hide kobject implementation details

File:

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

kernel/generic/src/ipc/ipc.c

@@ -735 +735 @@
 {
         call_t *call;
-        size_t i;
+        bool all_clean;
 
 restart:
@@ -742 +742 @@
          * Locking is needed as there may be connection handshakes in progress.
          */
-        for (i = 0; i < MAX_KERNEL_OBJECTS; i++) {
-                phone_t *phone = phone_get_current(i);
-                if (!phone)
-                        continue;
+        all_clean = true;
+        for_each_kobject_current(kobj, KOBJECT_TYPE_PHONE) {
+                phone_t *phone = &kobj->phone;
 
                 mutex_lock(&phone->lock);
@@ -781 +780 @@
                 if (phone->state != IPC_PHONE_FREE) {
                         mutex_unlock(&phone->lock);
+                        all_clean = false;
                         break;
                 }
@@ -788 +788 @@
                 
         /* Got into cleanup */
-        if (i == MAX_KERNEL_OBJECTS)
+        if (all_clean)
                 return;
                 
@@ -820 +820 @@
 
         /* Disconnect all our phones ('ipc_phone_hangup') */
-        for (int i = 0; i < MAX_KERNEL_OBJECTS; i++) {
-                phone_t *phone = phone_get_current(i);
-                if (!phone)
-                        continue;
+        for_each_kobject_current(kobj, KOBJECT_TYPE_PHONE) {
+                phone_t *phone = &kobj->phone;
                 ipc_phone_hangup(phone);
         }
@@ -913 +911 @@
         printf("[phone cap] [calls] [state\n");
         
-        size_t i;
-        for (i = 0; i < MAX_KERNEL_OBJECTS; i++) {
-                phone_t *phone = phone_get(task, i);
-                if (!phone)
+        for_each_kobject(task, kobj, KOBJECT_TYPE_PHONE) {
+                phone_t *phone = &kobj->phone;
+                int cap = kobject_to_cap(task, kobj);
+
+                if (SYNCH_FAILED(mutex_trylock(&phone->lock))) {
+                        printf("%-11d (mutex busy)\n", cap);
                         continue;
-
-                if (SYNCH_FAILED(mutex_trylock(&phone->lock))) {
-                        printf("%-10zu (mutex busy)\n", i);
-                        continue;
                 }
                 
                 if (phone->state != IPC_PHONE_FREE) {
-                        printf("%-11zu %7" PRIun " ", i,
+                        printf("%-11d %7" PRIun " ", cap,
                             atomic_get(&phone->active_calls));