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

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/proc

Files:

• scheduler.c (modified) (1 diff)
• task.c (modified) (4 diffs)
• thread.c (modified) (8 diffs)

kernel/generic/src/proc/scheduler.c

@@ -163 +163 @@
                         irq_spinlock_unlock(&CPU->lock, false);
                         THREAD->saved_fpu_context =
-                            (fpu_context_t *) slab_alloc(fpu_context_slab, 0);
+                            (fpu_context_t *) slab_alloc(fpu_context_cache, 0);
                         
                         /* We may have switched CPUs during slab_alloc */

kernel/generic/src/proc/task.c

@@ -79 +79 @@
 static task_id_t task_counter = 0;
 
-static slab_cache_t *task_slab;
+static slab_cache_t *task_cache;
 
 /* Forward declarations. */
@@ -93 +93 @@
         TASK = NULL;
         avltree_create(&tasks_tree);
-        task_slab = slab_cache_create("task_t", sizeof(task_t), 0,
+        task_cache = slab_cache_create("task_t", sizeof(task_t), 0,
             tsk_constructor, tsk_destructor, 0);
 }
@@ -206 +206 @@
 task_t *task_create(as_t *as, const char *name)
 {
-        task_t *task = (task_t *) slab_alloc(task_slab, 0);
+        task_t *task = (task_t *) slab_alloc(task_cache, 0);
         task_create_arch(task);
         
@@ -295 +295 @@
         as_release(task->as);
         
-        slab_free(task_slab, task);
+        slab_free(task_cache, task);
 }
 

kernel/generic/src/proc/thread.c

@@ -103 +103 @@
 static thread_id_t last_tid = 0;
 
-static slab_cache_t *thread_slab;
+static slab_cache_t *thread_cache;
 
 #ifdef CONFIG_FPU
-slab_cache_t *fpu_context_slab;
+slab_cache_t *fpu_context_cache;
 #endif
 
@@ -169 +169 @@
         thread->saved_fpu_context = NULL;
 #else /* CONFIG_FPU_LAZY */
-        thread->saved_fpu_context = slab_alloc(fpu_context_slab, kmflags);
+        thread->saved_fpu_context = slab_alloc(fpu_context_cache, kmflags);
         if (!thread->saved_fpu_context)
                 return -1;
@@ -199 +199 @@
 #ifdef CONFIG_FPU
                 if (thread->saved_fpu_context)
-                        slab_free(fpu_context_slab, thread->saved_fpu_context);
+                        slab_free(fpu_context_cache, thread->saved_fpu_context);
 #endif
                 return -1;
@@ -225 +225 @@
 #ifdef CONFIG_FPU
         if (thread->saved_fpu_context)
-                slab_free(fpu_context_slab, thread->saved_fpu_context);
+                slab_free(fpu_context_cache, thread->saved_fpu_context);
 #endif
         
@@ -241 +241 @@
         
         atomic_set(&nrdy, 0);
-        thread_slab = slab_cache_create("thread_t", sizeof(thread_t), 0,
+        thread_cache = slab_cache_create("thread_t", sizeof(thread_t), 0,
             thr_constructor, thr_destructor, 0);
         
 #ifdef CONFIG_FPU
-        fpu_context_slab = slab_cache_create("fpu_context_t",
+        fpu_context_cache = slab_cache_create("fpu_context_t",
             sizeof(fpu_context_t), FPU_CONTEXT_ALIGN, NULL, NULL, 0);
 #endif
@@ -341 +341 @@
     thread_flags_t flags, const char *name)
 {
-        thread_t *thread = (thread_t *) slab_alloc(thread_slab, 0);
+        thread_t *thread = (thread_t *) slab_alloc(thread_cache, 0);
         if (!thread)
                 return NULL;
@@ -457 +457 @@
          */
         task_release(thread->task);
-        slab_free(thread_slab, thread);
+        slab_free(thread_cache, thread);
 }
 
@@ -974 +974 @@
                                  * We can safely deallocate it.
                                  */
-                                slab_free(thread_slab, thread);
+                                slab_free(thread_cache, thread);
                                 free(kernel_uarg);