Changeset e5f5ce0 in mainline

Timestamp:

2017-09-04T20:25:18Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9e87562

Parents:

431c402

Message:

Create a slab cache for allocating phone_t structures

Location:

kernel/generic

Files:

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

kernel/generic/include/ipc/ipc.h

@@ -42 +42 @@
 #include <abi/proc/task.h>
 #include <typedefs.h>
+#include <mm/slab.h>
 
 struct answerbox;
@@ -166 +167 @@
 } call_t;
 
+extern slab_cache_t *phone_slab;
+
 extern answerbox_t *ipc_phone_0;
 

kernel/generic/src/ipc/ipc.c

@@ -66 +66 @@
 answerbox_t *ipc_phone_0 = NULL;
 
-static slab_cache_t *ipc_call_slab;
-static slab_cache_t *ipc_answerbox_slab;
+static slab_cache_t *call_slab;
+static slab_cache_t *answerbox_slab;
+
+slab_cache_t *phone_slab = NULL; 
 
 /** Initialize a call structure.
@@ -95 +97 @@
                 if (call->buffer)
                         free(call->buffer);
-                slab_free(ipc_call_slab, call);
+                slab_free(call_slab, call);
         }
 }
@@ -112 +114 @@
 call_t *ipc_call_alloc(unsigned int flags)
 {
-        call_t *call = slab_alloc(ipc_call_slab, flags);
+        call_t *call = slab_alloc(call_slab, flags);
         if (call) {
                 _ipc_call_init(call);
@@ -201 +203 @@
 int ipc_call_sync(phone_t *phone, call_t *request)
 {
-        answerbox_t *mybox = slab_alloc(ipc_answerbox_slab, 0);
+        answerbox_t *mybox = slab_alloc(answerbox_slab, 0);
         ipc_answerbox_init(mybox, TASK);
         
@@ -209 +211 @@
         int rc = ipc_call(phone, request);
         if (rc != EOK) {
-                slab_free(ipc_answerbox_slab, mybox);
+                slab_free(answerbox_slab, mybox);
                 return rc;
         }
@@ -256 +258 @@
         assert(!answer || request == answer);
         
-        slab_free(ipc_answerbox_slab, mybox);
+        slab_free(answerbox_slab, mybox);
         return rc;
 }
@@ -854 +856 @@
 void ipc_init(void)
 {
-        ipc_call_slab = slab_cache_create("call_t", sizeof(call_t), 0, NULL,
+        call_slab = slab_cache_create("call_t", sizeof(call_t), 0, NULL,
             NULL, 0);
-        ipc_answerbox_slab = slab_cache_create("answerbox_t",
-            sizeof(answerbox_t), 0, NULL, NULL, 0);
+        phone_slab = slab_cache_create("phone_t", sizeof(phone_t), 0, NULL,
+            NULL, 0);
+        answerbox_slab = slab_cache_create("answerbox_t", sizeof(answerbox_t),
+            0, NULL, NULL, 0);
 }
 

kernel/generic/src/ipc/ipcrsc.c

@@ -208 +208 @@
         int handle = cap_alloc(task);
         if (handle >= 0) {
-                phone_t *phone = malloc(sizeof(phone_t), FRAME_ATOMIC);
+                phone_t *phone = slab_alloc(phone_slab, FRAME_ATOMIC);
                 if (!phone) {
                         cap_free(TASK, handle);
@@ -248 +248 @@
         assert(phone->state == IPC_PHONE_CONNECTING);
         
-        free(phone);
+        slab_free(phone_slab, phone);
         cap_free(TASK, handle);
 }