Changeset f97f1e51 in mainline

Timestamp:

2012-06-20T11:45:35Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

abfc9f3

Parents:

22cec678

Message:

unify slab cache naming scheme (according to the type name)

Location:

kernel

Files:

• genarch/src/mm/as_ht.c (modified) (1 diff)
• generic/src/adt/btree.c (modified) (1 diff)
• generic/src/ipc/ipc.c (modified) (1 diff)
• generic/src/lib/ra.c (modified) (1 diff)
• generic/src/mm/as.c (modified) (1 diff)
• generic/src/mm/slab.c (modified) (2 diffs)
• generic/src/proc/task.c (modified) (1 diff)
• generic/src/proc/thread.c (modified) (1 diff)
• generic/src/sysinfo/sysinfo.c (modified) (1 diff)
• test/mm/slab2.c (modified) (2 diffs)

kernel/genarch/src/mm/as_ht.c

@@ -78 +78 @@
                 hash_table_create(&page_ht, PAGE_HT_ENTRIES, 2, &ht_operations);
                 mutex_initialize(&page_ht_lock, MUTEX_PASSIVE);
-                pte_cache = slab_cache_create("pte_cache", sizeof(pte_t), 0, NULL, NULL,
-                    SLAB_CACHE_MAGDEFERRED);
+                pte_cache = slab_cache_create("pte_t", sizeof(pte_t), 0,
+                    NULL, NULL, SLAB_CACHE_MAGDEFERRED);
         }
         

kernel/generic/src/adt/btree.c

@@ -71 +71 @@
 void btree_init(void)
 {
-        btree_node_slab = slab_cache_create("btree_node_slab",
+        btree_node_slab = slab_cache_create("btree_node_t",
             sizeof(btree_node_t), 0, NULL, NULL, SLAB_CACHE_MAGDEFERRED);
 }

kernel/generic/src/ipc/ipc.c

@@ -670 +670 @@
 void ipc_init(void)
 {
-        ipc_call_slab = slab_cache_create("ipc_call", sizeof(call_t), 0, NULL,
+        ipc_call_slab = slab_cache_create("call_t", sizeof(call_t), 0, NULL,
             NULL, 0);
-        ipc_answerbox_slab = slab_cache_create("ipc_answerbox",
+        ipc_answerbox_slab = slab_cache_create("answerbox_t",
             sizeof(answerbox_t), 0, NULL, NULL, 0);
 }

kernel/generic/src/lib/ra.c

@@ -424 +424 @@
 void ra_init(void)
 {
-        ra_segment_cache = slab_cache_create("segment_cache",
+        ra_segment_cache = slab_cache_create("ra_segment_t",
             sizeof(ra_segment_t), 0, NULL, NULL, SLAB_CACHE_MAGDEFERRED);
 }

kernel/generic/src/mm/as.c

@@ -130 +130 @@
         as_arch_init();
         
-        as_slab = slab_cache_create("as_slab", sizeof(as_t), 0,
+        as_slab = slab_cache_create("as_t", sizeof(as_t), 0,
             as_constructor, as_destructor, SLAB_CACHE_MAGDEFERRED);
         

kernel/generic/src/mm/slab.c

@@ -891 +891 @@
 {
         /* Initialize magazine cache */
-        _slab_cache_create(&mag_cache, "slab_magazine",
+        _slab_cache_create(&mag_cache, "slab_magazine_t",
             sizeof(slab_magazine_t) + SLAB_MAG_SIZE * sizeof(void*),
             sizeof(uintptr_t), NULL, NULL, SLAB_CACHE_NOMAGAZINE |
@@ -897 +897 @@
         
         /* Initialize slab_cache cache */
-        _slab_cache_create(&slab_cache_cache, "slab_cache",
+        _slab_cache_create(&slab_cache_cache, "slab_cache_cache",
             sizeof(slab_cache_cache), sizeof(uintptr_t), NULL, NULL,
             SLAB_CACHE_NOMAGAZINE | SLAB_CACHE_SLINSIDE);
         
         /* Initialize external slab cache */
-        slab_extern_cache = slab_cache_create("slab_extern", sizeof(slab_t), 0,
+        slab_extern_cache = slab_cache_create("slab_t", sizeof(slab_t), 0,
             NULL, NULL, SLAB_CACHE_SLINSIDE | SLAB_CACHE_MAGDEFERRED);
         

kernel/generic/src/proc/task.c

@@ -90 +90 @@
         TASK = NULL;
         avltree_create(&tasks_tree);
-        task_slab = slab_cache_create("task_slab", sizeof(task_t), 0,
+        task_slab = slab_cache_create("task_t", sizeof(task_t), 0,
             tsk_constructor, NULL, 0);
 }

kernel/generic/src/proc/thread.c

@@ -236 +236 @@
         
         atomic_set(&nrdy, 0);
-        thread_slab = slab_cache_create("thread_slab", sizeof(thread_t), 0,
+        thread_slab = slab_cache_create("thread_t", sizeof(thread_t), 0,
             thr_constructor, thr_destructor, 0);
         
 #ifdef CONFIG_FPU
-        fpu_context_slab = slab_cache_create("fpu_slab", sizeof(fpu_context_t),
-            FPU_CONTEXT_ALIGN, NULL, NULL, 0);
+        fpu_context_slab = slab_cache_create("fpu_context_t",
+            sizeof(fpu_context_t), FPU_CONTEXT_ALIGN, NULL, NULL, 0);
 #endif
         

kernel/generic/src/sysinfo/sysinfo.c

@@ -97 +97 @@
 void sysinfo_init(void)
 {
-        sysinfo_item_slab = slab_cache_create("sysinfo_item_slab",
+        sysinfo_item_slab = slab_cache_create("sysinfo_item_t",
             sizeof(sysinfo_item_t), 0, sysinfo_item_constructor,
             sysinfo_item_destructor, SLAB_CACHE_MAGDEFERRED);

kernel/test/mm/slab2.c

@@ -52 +52 @@
         void *olddata1 = NULL, *olddata2 = NULL;
         
-        cache1 = slab_cache_create("cache1_tst", ITEM_SIZE, 0, NULL, NULL, 0);
-        cache2 = slab_cache_create("cache2_tst", ITEM_SIZE, 0, NULL, NULL, 0);
+        cache1 = slab_cache_create("test_cache1", ITEM_SIZE, 0, NULL, NULL, 0);
+        cache2 = slab_cache_create("test_cache2", ITEM_SIZE, 0, NULL, NULL, 0);
         
         TPRINTF("Allocating...");
@@ -210 +210 @@
         thr_cache = slab_cache_create("thread_cache", size, 0, NULL, NULL, 0);
         semaphore_initialize(&thr_sem,0);
-        for (i = 0; i < THREADS; i++) {  
+        for (i = 0; i < THREADS; i++) {
                 if (!(t = thread_create(slabtest, NULL, TASK, 0, "slabtest", false))) {
                         TPRINTF("Could not create thread %d\n", i);