diff options
Diffstat (limited to 'src/pkg')
| -rw-r--r-- | src/pkg/runtime/mheap.c | 16 | ||||
| -rw-r--r-- | src/pkg/runtime/mprof.goc | 7 |
2 files changed, 19 insertions, 4 deletions
diff --git a/src/pkg/runtime/mheap.c b/src/pkg/runtime/mheap.c index c77772afbe..920d653682 100644 --- a/src/pkg/runtime/mheap.c +++ b/src/pkg/runtime/mheap.c @@ -703,9 +703,12 @@ runtime·freespecial(Special *s, void *p, uintptr size) void runtime·freeallspecials(MSpan *span, void *p, uintptr size) { - Special *s, **t; + Special *s, **t, *list; uintptr offset; + // first, collect all specials into the list; then, free them + // this is required to not cause deadlock between span->specialLock and proflock + list = nil; offset = (uintptr)p - (span->start << PageShift); runtime·lock(&span->specialLock); t = &span->specials; @@ -714,10 +717,17 @@ runtime·freeallspecials(MSpan *span, void *p, uintptr size) break; if(offset == s->offset) { *t = s->next; - if(!runtime·freespecial(s, p, size)) - runtime·throw("can't explicitly free an object with a finalizer"); + s->next = list; + list = s; } else t = &s->next; } runtime·unlock(&span->specialLock); + + while(list != nil) { + s = list; + list = s->next; + if(!runtime·freespecial(s, p, size)) + runtime·throw("can't explicitly free an object with a finalizer"); + } } diff --git a/src/pkg/runtime/mprof.goc b/src/pkg/runtime/mprof.goc index 51d0224250..4cd92d04a1 100644 --- a/src/pkg/runtime/mprof.goc +++ b/src/pkg/runtime/mprof.goc @@ -209,8 +209,13 @@ runtime·MProf_Malloc(void *p, uintptr size, uintptr typ) b = stkbucket(MProf, stk, nstk, true); b->recent_allocs++; b->recent_alloc_bytes += size; - runtime·setprofilebucket(p, b); runtime·unlock(&proflock); + + // Setprofilebucket locks a bunch of other mutexes, so we call it outside of proflock. + // This reduces potential contention and chances of deadlocks. + // Since the object must be alive during call to MProf_Malloc, + // it's fine to do this non-atomically. + runtime·setprofilebucket(p, b); } // Called when freeing a profiled block. |