git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

runtime: Handle allocating memory in cgo/SWIG function. 

A function that returns an interface type and returns a value
that requires memory allocation will try to allocate while
appearing to be in a syscall.  This patch lets that work.

From-SVN: r201226
This commit is contained in:
Ian Lance Taylor 2013-07-24 22:30:25 +00:00
parent ce4a94223e
commit b0c5dc1655
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libgo/runtime/malloc.goc
View File

@ -41,11 +41,24 @@ runtime_mallocgc(uintptr size, uint32 flag, int32 dogc, int32 zeroed)
uintptr npages; uintptr npages;
MSpan *s; MSpan *s;
void *v; void *v;
bool incallback;
m = runtime_m(); m = runtime_m();
g = runtime_g(); g = runtime_g();
if(g->status == Gsyscall)
dogc = 0; incallback = false;
if(m->mcache == nil && g->ncgo > 0) {
// For gccgo this case can occur when a cgo or SWIG function
// has an interface return type and the function
// returns a non-pointer, so memory allocation occurs
// after syscall.Cgocall but before syscall.CgocallDone.
// We treat it as a callback.
runtime_exitsyscall();
m = runtime_m();
incallback = true;
dogc = false;
}
if(runtime_gcwaiting && g != m->g0 && m->locks == 0 && dogc) { if(runtime_gcwaiting && g != m->g0 && m->locks == 0 && dogc) {
runtime_gosched(); runtime_gosched();
m = runtime_m(); m = runtime_m();
@ -129,6 +142,10 @@ runtime_mallocgc(uintptr size, uint32 flag, int32 dogc, int32 zeroed)
runtime_racemalloc(v, size, m->racepc); runtime_racemalloc(v, size, m->racepc);
m->racepc = nil; m->racepc = nil;
} }
if(incallback)
runtime_entersyscall();
return v; return v;
} }