]> Cypherpunks repositories - gostls13.git/commitdiff
runtime: do not memprofile settype_flush
authorDmitriy Vyukov <dvyukov@google.com>
Thu, 14 Mar 2013 15:11:29 +0000 (19:11 +0400)
committerDmitriy Vyukov <dvyukov@google.com>
Thu, 14 Mar 2013 15:11:29 +0000 (19:11 +0400)
Fixes #4850.

R=golang-dev, bradfitz, rsc
CC=golang-dev
https://golang.org/cl/7745044

src/pkg/runtime/malloc.goc

index ac131b3af40219946efbedab6a1a981e61864e7b..aae3d233fccd288d5e4c121fdafb7d5384f92560 100644 (file)
@@ -516,7 +516,7 @@ runtime·settype_flush(M *mp, bool sysalloc)
                        nbytes3 = 8*sizeof(uintptr) + 1*ntypes;
 
                        if(!sysalloc) {
-                               data3 = runtime·mallocgc(nbytes3, FlagNoPointers, 0, 1);
+                               data3 = runtime·mallocgc(nbytes3, FlagNoProfiling|FlagNoPointers, 0, 1);
                        } else {
                                data3 = runtime·SysAlloc(nbytes3);
                                if(data3 == nil)
@@ -554,7 +554,7 @@ runtime·settype_flush(M *mp, bool sysalloc)
                                nbytes2 = ntypes * sizeof(uintptr);
 
                                if(!sysalloc) {
-                                       data2 = runtime·mallocgc(nbytes2, FlagNoPointers, 0, 1);
+                                       data2 = runtime·mallocgc(nbytes2, FlagNoProfiling|FlagNoPointers, 0, 1);
                                } else {
                                        data2 = runtime·SysAlloc(nbytes2);
                                        if(data2 == nil)