mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

runtime: do not unset the special bit after finalization. 

A block with finalizer might also be profiled. The special bit
is needed to unregister the block from the profile. It will be
unset only when the block is freed.

Fixes #3668.

R=golang-dev, rsc
CC=golang-dev, remy
https://golang.org/cl/6249066
This commit is contained in:
Rémy Oudompheng 2012-05-30 08:04:11 +02:00
parent 4e0749a478
commit 348087877c
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pkg/runtime/mfinal.c
View File

@ -150,8 +150,7 @@ runtime·addfinalizer(void *p, void (*f)(void*), int32 nret)
tab = TAB(p);
runtime·lock(tab);
if(f == nil) {
if(lookfintab(tab, p, true, nil))
runtime·setblockspecial(p, false);
lookfintab(tab, p, true, nil);
runtime·unlock(tab);
return true;
}

1
src/pkg/runtime/mgc0.c
View File

@ -1042,7 +1042,6 @@ runfinq(void)
framecap = framesz;
}
*(void**)frame = f->arg;
runtime·setblockspecial(f->arg, false);
reflect·call((byte*)f->fn, frame, sizeof(uintptr) + f->nret);
f->fn = nil;
f->arg = nil;