Changeset 82d515e9 in mainline for kernel/generic/src/cap/cap.c

Timestamp:

2017-12-05T11:30:02Z (6 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.

File:

• kernel/generic/src/cap/cap.c (modified) (5 diffs)

kernel/generic/src/cap/cap.c

@@ -87 +87 @@
 #define CAPS_LAST       (CAPS_SIZE - 1)
 
-static slab_cache_t *cap_slab;
+static slab_cache_t *cap_cache;
 
 static size_t caps_hash(const ht_link_t *item)
@@ -116 +116 @@
 void caps_init(void)
 {
-        cap_slab = slab_cache_create("cap_t", sizeof(cap_t), 0, NULL,
+        cap_cache = slab_cache_create("cap_t", sizeof(cap_t), 0, NULL,
             NULL, 0);
 }
@@ -277 +277 @@
          */
         if (!cap) {
-                cap = slab_alloc(cap_slab, FRAME_ATOMIC);
+                cap = slab_alloc(cap_cache, FRAME_ATOMIC);
                 if (!cap) {
                         mutex_unlock(&task->cap_info->lock);
@@ -284 +284 @@
                 uintptr_t hbase;
                 if (!ra_alloc(task->cap_info->handles, 1, 1, &hbase)) {
-                        slab_free(cap_slab, cap);
+                        slab_free(cap_cache, cap);
                         mutex_unlock(&task->cap_info->lock);
                         return ENOMEM;
@@ -371 +371 @@
         hash_table_remove_item(&task->cap_info->caps, &cap->caps_link);
         ra_free(task->cap_info->handles, handle, 1);
-        slab_free(cap_slab, cap);
+        slab_free(cap_cache, cap);
         mutex_unlock(&task->cap_info->lock);
 }