clones/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2024-09-22 02:48:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

runtime: fix plan9 HeapSys accounting

Browse Source 
LGTM=0intro
R=0intro
CC=golang-codereviews
https://golang.org/cl/131190043
This commit is contained in:
Dmitriy Vyukov 2014-08-25 18:02:30 +04:00
parent 99080c4b6f
commit 846db08936
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/pkg/runtime/mem_plan9.c
View File

@ -17,8 +17,8 @@ enum
Round = PAGESIZE-1
};
void*
runtime·SysAlloc(uintptr nbytes, uint64 *stat)
static void*
brk(uintptr nbytes)
{
uintptr bl;
@ -31,8 +31,19 @@ runtime·SysAlloc(uintptr nbytes, uint64 *stat)
}
bloc = (byte*)bl + nbytes;
runtime·unlock(&memlock);
runtime·xadd64(stat, nbytes);
return (void*)bl;
}
void*
runtime·SysAlloc(uintptr nbytes, uint64 *stat)
{
void *p;
p = brk(nbytes);
if(p != nil)
runtime·xadd64(stat, nbytes);
return p;
}
void
@ -64,7 +75,10 @@ runtime·SysUsed(void *v, uintptr nbytes)
void
runtime·SysMap(void *v, uintptr nbytes, bool reserved, uint64 *stat)
{
USED(v, nbytes, reserved, stat);
// SysReserve has already allocated all heap memory,
// but has not adjusted stats.
USED(v, reserved);
runtime·xadd64(stat, nbytes);
}
void
@ -78,5 +92,5 @@ runtime·SysReserve(void *v, uintptr nbytes, bool *reserved)
{
USED(v);
*reserved = true;
return runtime·SysAlloc(nbytes, &mstats.heap_sys);
return brk(nbytes);
}