diff options
| author | Ondřej Surý <ondrej@sury.org> | 2011-08-03 17:26:15 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2011-08-03 17:31:49 +0200 |
| commit | b757d264230d65f988e08158e096a09497d39eb4 (patch) | |
| tree | e20ec608a2ec8ebf603fa7aa060eb9723c4780b9 /src/pkg/runtime/plan9/mem.c | |
| parent | 5976088995f5c0d0bcada7d491fda4b6245e54e0 (diff) | |
| download | golang-b757d264230d65f988e08158e096a09497d39eb4.tar.gz | |
Imported Upstream version 2011.07.29
Diffstat (limited to 'src/pkg/runtime/plan9/mem.c')
| -rw-r--r-- | src/pkg/runtime/plan9/mem.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/pkg/runtime/plan9/mem.c b/src/pkg/runtime/plan9/mem.c index 9dfdf2cc3..f795b2c01 100644 --- a/src/pkg/runtime/plan9/mem.c +++ b/src/pkg/runtime/plan9/mem.c @@ -8,6 +8,7 @@ extern byte end[]; static byte *bloc = { end }; +static Lock memlock; enum { @@ -19,23 +20,31 @@ runtime·SysAlloc(uintptr nbytes) { uintptr bl; + runtime·lock(&memlock); + mstats.sys += nbytes; // Plan 9 sbrk from /sys/src/libc/9sys/sbrk.c bl = ((uintptr)bloc + Round) & ~Round; - if(runtime·brk_((void*)(bl + nbytes)) < 0) + if(runtime·brk_((void*)(bl + nbytes)) < 0) { + runtime·unlock(&memlock); return (void*)-1; + } bloc = (byte*)bl + nbytes; + runtime·unlock(&memlock); return (void*)bl; } void runtime·SysFree(void *v, uintptr nbytes) { + runtime·lock(&memlock); + mstats.sys -= nbytes; // from tiny/mem.c // Push pointer back if this is a free // of the most recent SysAlloc. nbytes += (nbytes + Round) & ~Round; if(bloc == (byte*)v+nbytes) bloc -= nbytes; + runtime·unlock(&memlock); } void |