Changeset 05ffb41 in mainline for kernel/generic/include

Timestamp:

2017-08-17T19:11:14Z (8 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

Location:

kernel/generic/include

Files:

• ipc/ipc.h (modified) (1 diff)
• ipc/ipcrsc.h (modified) (1 diff)
• kobject/kobject.h (modified) (2 diffs)
• proc/task.h (modified) (1 diff)

kernel/generic/include/ipc/ipc.h

@@ -43 +43 @@
 #include <typedefs.h>
 
-#define IPC_MAX_PHONES  64
-
 struct answerbox;
 struct task;

kernel/generic/include/ipc/ipcrsc.h

@@ -40 +40 @@
 
 extern call_t *get_call(sysarg_t);
-extern int phone_get(sysarg_t, phone_t **);
+extern phone_t *phone_get_current(int);
+extern phone_t *phone_get(task_t *, int);
 extern int phone_alloc(task_t *);
 extern bool phone_connect(int, answerbox_t *);

kernel/generic/include/kobject/kobject.h

@@ -37 +37 @@
 
 #include <typedefs.h>
+#include <ipc/ipc.h>
 
 #define MAX_KERNEL_OBJECTS  64
@@ -44 +45 @@
 typedef enum {
         KOBJECT_TYPE_INVALID,
-        KOBJECT_TYPE_ALLOCATED
+        KOBJECT_TYPE_ALLOCATED,
+        KOBJECT_TYPE_PHONE
 } kobject_type_t;
 
-typedef struct {
+typedef struct kobject {
         kobject_type_t type;
+        bool (* can_reclaim)(struct kobject *);
+
         union {
+                phone_t phone;
         };
 } kobject_t;
 
-extern kobject_t *kobject_get_local(int, kobject_type_t);
+struct task;
 
-struct task;
+extern void kobject_init(kobject_t *);
+extern kobject_t *kobject_get(struct task *, int, kobject_type_t);
+extern kobject_t *kobject_get_current(int, kobject_type_t);
 extern int kobject_alloc(struct task *);
 extern void kobject_free(struct task *, int);

kernel/generic/include/proc/task.h

@@ -105 +105 @@
         answerbox_t answerbox;
 
-        /** Sending communication endpoints */
-        phone_t phones[IPC_MAX_PHONES];
-
         /** Spinlock protecting the active_calls list. */
         SPINLOCK_DECLARE(active_calls_lock);