diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-01-22 00:12:00 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-01-22 00:12:00 +0000 |
| commit | 7e33c4aadcbd1fbd6a83a9246776cff3c4680e1e (patch) | |
| tree | 9c293c211f8d55d058e950363b288392bf35ea66 | |
| parent | cf606aeb06898a190a219f51b2a627eddc8f0a70 (diff) | |
| download | gcc-7e33c4aadcbd1fbd6a83a9246776cff3c4680e1e.zip gcc-7e33c4aadcbd1fbd6a83a9246776cff3c4680e1e.tar.gz gcc-7e33c4aadcbd1fbd6a83a9246776cff3c4680e1e.tar.bz2 | |
Avoid deadlock creating new thread.
From-SVN: r169114
| -rw-r--r-- | libgo/runtime/malloc.goc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libgo/runtime/malloc.goc b/libgo/runtime/malloc.goc index be37777..d826d47 100644 --- a/libgo/runtime/malloc.goc +++ b/libgo/runtime/malloc.goc @@ -255,6 +255,9 @@ runtime_allocmcache(void) { MCache *c; + if(!__sync_bool_compare_and_swap(&m->mallocing, 0, 1)) + runtime_throw("allocmcache - deadlock"); + runtime_lock(&runtime_mheap); c = runtime_FixAlloc_Alloc(&runtime_mheap.cachealloc); @@ -264,6 +267,11 @@ runtime_allocmcache(void) mstats.mcache_inuse = runtime_mheap.cachealloc.inuse; mstats.mcache_sys = runtime_mheap.cachealloc.sys; runtime_unlock(&runtime_mheap); + + __sync_bool_compare_and_swap(&m->mallocing, 1, 0); + if(__sync_bool_compare_and_swap(&m->gcing, 1, 0)) + __go_run_goroutine_gc(2); + return c; } |