Changeset 82d515e9 in mainline for kernel/generic/src/ipc

Timestamp:

2017-12-05T11:30:02Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9af1c61

Parents:

9a09212

git-author:

Jakub Jermar <jakub@…> (2017-12-05 11:25:41)

git-committer:

Jakub Jermar <jakub@…> (2017-12-05 11:30:02)

Message:

Fix terminology

Objects of slab_cache_t type are caches, not slabs.

Location:

kernel/generic/src/ipc

Files:

• ipc.c (modified) (7 diffs)
• ipcrsc.c (modified) (3 diffs)
• irq.c (modified) (3 diffs)

kernel/generic/src/ipc/ipc.c

@@ -66 +66 @@
 answerbox_t *ipc_phone_0 = NULL;
 
-static slab_cache_t *call_slab;
-static slab_cache_t *answerbox_slab;
-
-slab_cache_t *phone_slab = NULL; 
+static slab_cache_t *call_cache;
+static slab_cache_t *answerbox_cache;
+
+slab_cache_t *phone_cache = NULL; 
 
 /** Initialize a call structure.
@@ -95 +95 @@
         if (call->caller_phone)
                 kobject_put(call->caller_phone->kobject);
-        slab_free(call_slab, call);
+        slab_free(call_cache, call);
 }
 
@@ -115 +115 @@
 call_t *ipc_call_alloc(unsigned int flags)
 {
-        call_t *call = slab_alloc(call_slab, flags);
+        call_t *call = slab_alloc(call_cache, flags);
         if (!call)
                 return NULL;
         kobject_t *kobj = (kobject_t *) malloc(sizeof(kobject_t), flags);
         if (!kobj) {
-                slab_free(call_slab, call);
+                slab_free(call_cache, call);
                 return NULL;
         }
@@ -210 +210 @@
 int ipc_call_sync(phone_t *phone, call_t *request)
 {
-        answerbox_t *mybox = slab_alloc(answerbox_slab, 0);
+        answerbox_t *mybox = slab_alloc(answerbox_cache, 0);
         ipc_answerbox_init(mybox, TASK);
         
@@ -218 +218 @@
         int rc = ipc_call(phone, request);
         if (rc != EOK) {
-                slab_free(answerbox_slab, mybox);
+                slab_free(answerbox_cache, mybox);
                 return rc;
         }
@@ -265 +265 @@
         assert(!answer || request == answer);
         
-        slab_free(answerbox_slab, mybox);
+        slab_free(answerbox_cache, mybox);
         return rc;
 }
@@ -906 +906 @@
 void ipc_init(void)
 {
-        call_slab = slab_cache_create("call_t", sizeof(call_t), 0, NULL,
+        call_cache = slab_cache_create("call_t", sizeof(call_t), 0, NULL,
             NULL, 0);
-        phone_slab = slab_cache_create("phone_t", sizeof(phone_t), 0, NULL,
+        phone_cache = slab_cache_create("phone_t", sizeof(phone_t), 0, NULL,
             NULL, 0);
-        answerbox_slab = slab_cache_create("answerbox_t", sizeof(answerbox_t),
+        answerbox_cache = slab_cache_create("answerbox_t", sizeof(answerbox_t),
             0, NULL, NULL, 0);
 }

kernel/generic/src/ipc/ipcrsc.c

@@ -153 +153 @@
 {
         phone_t *phone = (phone_t *) arg;
-        slab_free(phone_slab, phone);
+        slab_free(phone_cache, phone);
 }
 
@@ -173 +173 @@
         cap_handle_t handle = cap_alloc(task);
         if (handle >= 0) {
-                phone_t *phone = slab_alloc(phone_slab, FRAME_ATOMIC);
+                phone_t *phone = slab_alloc(phone_cache, FRAME_ATOMIC);
                 if (!phone) {
                         cap_free(TASK, handle);
@@ -181 +181 @@
                 if (!kobject) {
                         cap_free(TASK, handle);
-                        slab_free(phone_slab, phone);
+                        slab_free(phone_cache, phone);
                         return ENOMEM;
                 }

kernel/generic/src/ipc/irq.c

@@ -294 +294 @@
         /* Free up the IRQ code and associated structures. */
         code_free(irq->notif_cfg.code);
-        slab_free(irq_slab, irq);
+        slab_free(irq_cache, irq);
 }
 
@@ -333 +333 @@
                 return handle;
         
-        irq_t *irq = (irq_t *) slab_alloc(irq_slab, FRAME_ATOMIC);
+        irq_t *irq = (irq_t *) slab_alloc(irq_cache, FRAME_ATOMIC);
         if (!irq) {
                 cap_free(TASK, handle);
@@ -342 +342 @@
         if (!kobject) {
                 cap_free(TASK, handle);
-                slab_free(irq_slab, irq);
+                slab_free(irq_cache, irq);
                 return ENOMEM;
         }