Changeset b9a2725 in mainline

Timestamp:

2018-11-09T22:03:24Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

c222816

Parents:

c0ea739

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-09 20:54:46)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-09 22:03:24)

Message:

Allocate call for ipc_phone_hangup() ahead of time

Location:

kernel/generic

Files:

• include/ipc/ipc.h (modified) (3 diffs)
• src/ipc/ipc.c (modified) (3 diffs)
• src/ipc/ipcrsc.c (modified) (2 diffs)

kernel/generic/include/ipc/ipc.h

@@ -47 +47 @@
 struct answerbox;
 struct task;
+struct call;
 
 typedef enum {
@@ -67 +68 @@
         struct task *caller;
         struct answerbox *callee;
+        /* A call prepared for hangup ahead of time, so that it cannot fail. */
+        struct call *hangup_call;
         ipc_phone_state_t state;
         atomic_t active_calls;
@@ -172 +175 @@
 
 extern call_t *ipc_call_alloc(unsigned int);
-extern void ipc_call_free(call_t *);
-extern void ipc_call_hold(call_t *);
-extern void ipc_call_release(call_t *);
 
 extern errno_t ipc_call_sync(phone_t *, call_t *);

kernel/generic/src/ipc/ipc.c

@@ -116 +116 @@
 call_t *ipc_call_alloc(unsigned int flags)
 {
+        // TODO: Allocate call and kobject in single allocation
+
         call_t *call = slab_alloc(call_cache, flags);
         if (!call)
@@ -483 +485 @@
                 kobject_put(phone->kobject);
 
-                call_t *call = ipc_call_alloc(0);
+                call_t *call = phone->hangup_call;
+                phone->hangup_call = NULL;
+                assert(call);
+
                 IPC_SET_IMETHOD(call->data, IPC_M_PHONE_HUNGUP);
                 call->request_method = IPC_M_PHONE_HUNGUP;
@@ -685 +690 @@
                          * to exist as soon as we release it.
                          */
-                        call_t *call = ipc_call_alloc(0);
+                        call_t *call = phone->hangup_call;
+                        phone->hangup_call = NULL;
+                        assert(call);
+
                         IPC_SET_IMETHOD(call->data, IPC_M_PHONE_HUNGUP);
                         call->request_method = IPC_M_PHONE_HUNGUP;

kernel/generic/src/ipc/ipcrsc.c

@@ -46 +46 @@
 {
         phone_t *phone = (phone_t *) arg;
+        if (phone->hangup_call)
+                kobject_put(phone->hangup_call->kobject);
         slab_free(phone_cache, phone);
 }
@@ -79 +81 @@
                         return ENOMEM;
                 }
+                call_t *hcall = ipc_call_alloc(FRAME_ATOMIC);
+                if (!hcall) {
+                        cap_free(TASK, handle);
+                        slab_free(phone_cache, phone);
+                        free(kobj);
+                        return ENOMEM;
+                }
 
                 ipc_phone_init(phone, task);
                 phone->state = IPC_PHONE_CONNECTING;
+                phone->hangup_call = hcall;
 
                 kobject_initialize(kobj, KOBJECT_TYPE_PHONE, phone,