Skip to content

X
xv6-public
提交 44c215b1 创建 作者: Austin Clements's avatar Austin Clements
浏览文件
操作

Record type names of kmalloc'd memory and pass names to mtrace

上级 1efb8580
隐藏空白字符变更
内嵌 并排
正在显示 包含 15 行增加 和 15 行删除
include/cpputil.hh
浏览文件 @ 44c215b1
...@@ -133,7 +133,7 @@ extern void *__dso_handle; ...@@ -133,7 +133,7 @@ extern void *__dso_handle;
#define NEW_DELETE_OPS(classname) \ #define NEW_DELETE_OPS(classname) \
static void* operator new(unsigned long nbytes) { \ static void* operator new(unsigned long nbytes) { \
assert(nbytes == sizeof(classname)); \ assert(nbytes == sizeof(classname)); \
return kmalloc(sizeof(classname)); \ return kmalloc(sizeof(classname), #classname); \
} \ } \
\ \
static void* operator new(unsigned long nbytes, classname *buf) { \ static void* operator new(unsigned long nbytes, classname *buf) { \
......
include/kernel.hh
浏览文件 @ 44c215b1
...@@ -129,9 +129,9 @@ char* kalloc(void); ...@@ -129,9 +129,9 @@ char* kalloc(void);
void kfree(void*); void kfree(void*);
void* ksalloc(int slabtype); void* ksalloc(int slabtype);
void ksfree(int slabtype, void*); void ksfree(int slabtype, void*);
void* kmalloc(u64 nbytes); void* kmalloc(u64 nbytes, const char *name);
void kmfree(void*, u64 nbytes); void kmfree(void*, u64 nbytes);
int kmalign(void **p, int align, u64 size); int kmalign(void **p, int align, u64 size, const char *name);
void kmalignfree(void *, int align, u64 size); void kmalignfree(void *, int align, u64 size);
void verifyfree(char *ptr, u64 nbytes); void verifyfree(char *ptr, u64 nbytes);
void kminit(void); void kminit(void);
......
include/wq.hh
浏览文件 @ 44c215b1
...@@ -35,7 +35,7 @@ struct cwork : public work { ...@@ -35,7 +35,7 @@ struct cwork : public work {
#define xmalloc(n) malloc(n) #define xmalloc(n) malloc(n)
#define xfree(p, sz) free(p) #define xfree(p, sz) free(p)
#elif defined(XV6_KERNEL) #elif defined(XV6_KERNEL)
#define xmalloc(n) kmalloc(n) #define xmalloc(n) kmalloc(n, "xmalloc")
#define xfree(p, sz) kmfree(p, sz) #define xfree(p, sz) kmfree(p, sz)
#else #else
#define xmalloc(n) malloc(n) #define xmalloc(n) malloc(n)
......
kernel/cpprt.cc
浏览文件 @ 44c215b1
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
void * void *
operator new[](unsigned long nbytes) operator new[](unsigned long nbytes)
{ {
u64 *x = (u64*) kmalloc(nbytes + sizeof(u64)); u64 *x = (u64*) kmalloc(nbytes + sizeof(u64), "array");
*x = nbytes + sizeof(u64); *x = nbytes + sizeof(u64);
return x+1; return x+1;
} }
......
kernel/kmalloc.cc
浏览文件 @ 44c215b1
...@@ -78,7 +78,7 @@ bucket(u64 nbytes) ...@@ -78,7 +78,7 @@ bucket(u64 nbytes)
} }
void * void *
kmalloc(u64 nbytes) kmalloc(u64 nbytes, const char *name)
{ {
int b = bucket(nbytes); int b = bucket(nbytes);
...@@ -106,7 +106,7 @@ kmalloc(u64 nbytes) ...@@ -106,7 +106,7 @@ kmalloc(u64 nbytes)
if (ALLOC_MEMSET) if (ALLOC_MEMSET)
memset(h, 4, (1<<b)); memset(h, 4, (1<<b));
mtlabel(mtrace_label_heap, (void*) h, nbytes, "kmalloc'ed", sizeof("kmalloc'ed")); mtlabel(mtrace_label_heap, (void*) h, nbytes, name, strlen(name));
return h; return h;
} }
...@@ -132,9 +132,9 @@ kmfree(void *ap, u64 nbytes) ...@@ -132,9 +132,9 @@ kmfree(void *ap, u64 nbytes)
} }
int int
kmalign(void **p, int align, u64 size) kmalign(void **p, int align, u64 size, const char *name)
{ {
void *mem = kmalloc(size + (align-1) + sizeof(void*)); void *mem = kmalloc(size + (align-1) + sizeof(void*), name);
char *amem = ((char*)mem) + sizeof(void*); char *amem = ((char*)mem) + sizeof(void*);
amem += align - ((uptr)amem & (align - 1)); amem += align - ((uptr)amem & (align - 1));
((void**)amem)[-1] = mem; ((void**)amem)[-1] = mem;
......
kernel/net.cc
浏览文件 @ 44c215b1
...@@ -278,7 +278,7 @@ netbind(int sock, void *xaddr, int xaddrlen) ...@@ -278,7 +278,7 @@ netbind(int sock, void *xaddr, int xaddrlen)
void *addr; void *addr;
long r; long r;
addr = kmalloc(xaddrlen); addr = kmalloc(xaddrlen, "sockaddr");
if (addr == nullptr) if (addr == nullptr)
return -1; return -1;
...@@ -314,7 +314,7 @@ netaccept(int sock, void *xaddr, void *xaddrlen) ...@@ -314,7 +314,7 @@ netaccept(int sock, void *xaddr, void *xaddrlen)
if (umemcpy(&len, lenptr, sizeof(*lenptr))) if (umemcpy(&len, lenptr, sizeof(*lenptr)))
return -1; return -1;
addr = kmalloc(len); addr = kmalloc(len, "sockaddr");
if (addr == nullptr) if (addr == nullptr)
return -1; return -1;
......
kernel/pipe.cc
浏览文件 @ 44c215b1
...@@ -30,7 +30,7 @@ pipealloc(struct file **f0, struct file **f1) ...@@ -30,7 +30,7 @@ pipealloc(struct file **f0, struct file **f1)
*f0 = *f1 = 0; *f0 = *f1 = 0;
if((*f0 = file::alloc()) == 0 || (*f1 = file::alloc()) == 0) if((*f0 = file::alloc()) == 0 || (*f1 = file::alloc()) == 0)
goto bad; goto bad;
if((p = (pipe*)kmalloc(sizeof(*p))) == 0) if((p = (pipe*)kmalloc(sizeof(*p), "pipe")) == 0)
goto bad; goto bad;
p->readopen = 1; p->readopen = 1;
p->writeopen = 1; p->writeopen = 1;
......
kernel/sampler.cc
浏览文件 @ 44c215b1
...@@ -188,7 +188,7 @@ sampread(struct inode *ip, char *dst, u32 off, u32 n) ...@@ -188,7 +188,7 @@ sampread(struct inode *ip, char *dst, u32 off, u32 n)
u64 len = LOGHEADER_SZ; u64 len = LOGHEADER_SZ;
u64 cc; u64 cc;
hdr = (logheader*) kmalloc(len); hdr = (logheader*) kmalloc(len, "logheader");
if (hdr == nullptr) if (hdr == nullptr)
return -1; return -1;
hdr->ncpus = NCPU; hdr->ncpus = NCPU;
......
kernel/spinlock.cc
浏览文件 @ 44c215b1
...@@ -24,7 +24,7 @@ void* ...@@ -24,7 +24,7 @@ void*
klockstat::operator new(unsigned long nbytes) klockstat::operator new(unsigned long nbytes)
{ {
assert(nbytes == sizeof(klockstat)); assert(nbytes == sizeof(klockstat));
return kmalloc(sizeof(klockstat)); return kmalloc(sizeof(klockstat), "klockstat");
} }
void void
......
net/sys_arch.cc
浏览文件 @ 44c215b1
...@@ -208,7 +208,7 @@ sys_thread_new(const char *name, lwip_thread_fn thread, void *arg, ...@@ -208,7 +208,7 @@ sys_thread_new(const char *name, lwip_thread_fn thread, void *arg,
struct lwip_thread *lt; struct lwip_thread *lt;
struct proc *p; struct proc *p;
lt = (struct lwip_thread*) kmalloc(sizeof(*lt)); lt = (struct lwip_thread*) kmalloc(sizeof(*lt), "lwip_thread");
if (lt == nullptr) if (lt == nullptr)
return 0; return 0;
lt->thread = thread; lt->thread = thread;
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论