Skip to content

X
xv6-public
提交 c7b284b3 创建 作者: Nickolai Zeldovich's avatar Nickolai Zeldovich
浏览文件
操作

kalloc.h -> kalloc.hh

上级 d678eac0
隐藏空白字符变更
内嵌 并排
正在显示 包含 21 行增加 和 27 行删除
kernel/bootdata.c
浏览文件 @ c7b284b3
#include "types.h" #include "types.h"
#include "mmu.h" #include "mmu.h"
#include "spinlock.h" #include "spinlock.h"
#include "kalloc.h"
#include "syscall.h" #include "syscall.h"
#include "kern_c.h" #include "kern_c.h"
...@@ -27,24 +26,6 @@ struct segdesc __attribute__((aligned(16))) bootgdt[NSEGS] = { ...@@ -27,24 +26,6 @@ struct segdesc __attribute__((aligned(16))) bootgdt[NSEGS] = {
[7]=SEGDESC(0, 0, SEG_R|SEG_CODE|SEG_S|SEG_DPL(3)|SEG_P|SEG_L|SEG_G), [7]=SEGDESC(0, 0, SEG_R|SEG_CODE|SEG_S|SEG_DPL(3)|SEG_P|SEG_L|SEG_G),
}; };
struct kmem slabmem[slab_type_max][NCPU] = {
[slab_stack][0 ... NCPU-1] = {
.name = " kstack",
.size = KSTACKSIZE,
.ninit = CPUKSTACKS,
},
[slab_perf][0 ... NCPU-1] = {
.name = " kperf",
.size = PERFSIZE,
.ninit = 1,
},
[slab_kshared][0 ... NCPU-1] = {
.name = " kshared",
.size = KSHAREDSIZE,
.ninit = CPUKSTACKS,
},
};
#define SYSCALL(name) [SYS_##name] = (void*)sys_##name #define SYSCALL(name) [SYS_##name] = (void*)sys_##name
long (*syscalls[])(u64, u64, u64, u64, u64, u64) = { long (*syscalls[])(u64, u64, u64, u64, u64, u64) = {
......
kernel/hwvm.cc
浏览文件 @ c7b284b3
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include "kernel.hh" #include "kernel.hh"
#include "bits.hh" #include "bits.hh"
#include "spinlock.h" #include "spinlock.h"
#include "kalloc.h" #include "kalloc.hh"
#include "queue.h" #include "queue.h"
#include "condvar.h" #include "condvar.h"
#include "proc.hh" #include "proc.hh"
......
kernel/kalloc.cc
浏览文件 @ c7b284b3
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "mmu.h" #include "mmu.h"
#include "kernel.hh" #include "kernel.hh"
#include "spinlock.h" #include "spinlock.h"
#include "kalloc.h" #include "kalloc.hh"
#include "mtrace.h" #include "mtrace.h"
#include "cpu.hh" #include "cpu.hh"
#include "multiboot.hh" #include "multiboot.hh"
...@@ -16,6 +16,7 @@ static struct Mbmem mem[128]; ...@@ -16,6 +16,7 @@ static struct Mbmem mem[128];
static u64 nmem; static u64 nmem;
static u64 membytes; static u64 membytes;
struct kmem kmems[NCPU]; struct kmem kmems[NCPU];
struct kmem slabmem[slab_type_max][NCPU];
extern char end[]; // first address after kernel loaded from ELF file extern char end[]; // first address after kernel loaded from ELF file
char *newend; char *newend;
...@@ -247,7 +248,19 @@ initkalloc(u64 mbaddr) ...@@ -247,7 +248,19 @@ initkalloc(u64 mbaddr)
k = (((uptr)p) - KBASE); k = (((uptr)p) - KBASE);
for (int c = 0; c < NCPU; c++) { for (int c = 0; c < NCPU; c++) {
// Fill slab allocators // Fill slab allocators
for (int i = 0; i < NELEM(slabmem); i++) strncpy(slabmem[slab_stack][c].name, " kstack", MAXNAME);
slabmem[slab_stack][c].size = KSTACKSIZE;
slabmem[slab_stack][c].ninit = CPUKSTACKS;
strncpy(slabmem[slab_perf][c].name, " kperf", MAXNAME);
slabmem[slab_perf][c].size = PERFSIZE;
slabmem[slab_perf][c].ninit = 1;
strncpy(slabmem[slab_kshared][c].name, " kshared", MAXNAME);
slabmem[slab_kshared][c].size = KSHAREDSIZE;
slabmem[slab_kshared][c].ninit = CPUKSTACKS;
for (int i = 0; i < slab_type_max; i++)
slabinit(&slabmem[i][c], &p, &k); slabinit(&slabmem[i][c], &p, &k);
// The rest goes to the page allocator // The rest goes to the page allocator
......
kernel/kmalloc.cc
浏览文件 @ c7b284b3
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include "mmu.h" #include "mmu.h"
#include "kernel.hh" #include "kernel.hh"
#include "spinlock.h" #include "spinlock.h"
#include "kalloc.h" #include "kalloc.hh"
#include "mtrace.h" #include "mtrace.h"
#include "cpu.hh" #include "cpu.hh"
......
kernel/main.cc
浏览文件 @ c7b284b3
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "multiboot.hh" #include "multiboot.hh"
#include "kernel.hh" #include "kernel.hh"
#include "spinlock.h" #include "spinlock.h"
#include "kalloc.h" #include "kalloc.hh"
#include "cpu.hh" #include "cpu.hh"
#include "amd64.h" #include "amd64.h"
#include "hwvm.hh" #include "hwvm.hh"
......
kernel/proc.cc
浏览文件 @ c7b284b3
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include "bits.hh" #include "bits.hh"
#include "kmtrace.hh" #include "kmtrace.hh"
#include "sched.hh" #include "sched.hh"
#include "kalloc.h" #include "kalloc.hh"
#include "vm.hh" #include "vm.hh"
#include "ns.hh" #include "ns.hh"
......
kernel/sampler.cc
浏览文件 @ c7b284b3
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include "condvar.h" #include "condvar.h"
#include "fs.h" #include "fs.h"
#include "stat.h" #include "stat.h"
#include "kalloc.h" #include "kalloc.hh"
#include "file.hh" #include "file.hh"
#include "bits.hh" #include "bits.hh"
#include "amd64.h" #include "amd64.h"
......
kernel/vm.cc
浏览文件 @ c7b284b3
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include "kernel.hh" #include "kernel.hh"
#include "bits.hh" #include "bits.hh"
#include "spinlock.h" #include "spinlock.h"
#include "kalloc.h" #include "kalloc.hh"
#include "queue.h" #include "queue.h"
#include "condvar.h" #include "condvar.h"
#include "proc.hh" #include "proc.hh"
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论