code review 257041: runtime: clock garbage collection on bytes allocated, n...

src/pkg/runtime/malloc.cgo

 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 // See malloc.h for overview.
 //
 // TODO(rsc): double-check stats.
 
 package runtime
 #include "runtime.h"
@@ skipping 43 matching lines @@
                         throw("malloc mlookup");
                 }
                 *ref = RefNone | refflag;
         } else {
                 // TODO(rsc): Report tracebacks for very large allocations.
 
                 // Allocate directly from heap.
                 npages = size >> PageShift;
                 if((size & PageMask) != 0)
                         npages++;
-                s = MHeap_Alloc(&mheap, npages, 0);
+                s = MHeap_Alloc(&mheap, npages, 0, 1);
                 if(s == nil)
                         throw("out of memory");
                 mstats.alloc += npages<<PageShift;
                 mstats.total_alloc += npages<<PageShift;
                 v = (void*)(s->start << PageShift);
 
                 // setup for mark sweep
                 s->gcref0 = RefNone | refflag;
         }
 
         m->mallocing = 0;
 
-        if(dogc && mstats.inuse_pages > mstats.next_gc)
+        if(dogc && mstats.heap_alloc >= mstats.next_gc)
                 gc(0);
         return v;
 }
 
 void*
 malloc(uintptr size)
 {
         return mallocgc(size, 0, 0, 1);
 }
 
@@ skipping 18 matching lines @@
                 throw("free mlookup");
         }
         *ref = RefFree;
 
         // Find size class for v.
         sizeclass = s->sizeclass;
         if(sizeclass == 0) {
                 // Large object.
                 mstats.alloc -= s->npages<<PageShift;
                 runtime_memclr(v, s->npages<<PageShift);
-                MHeap_Free(&mheap, s);
+                MHeap_Free(&mheap, s, 1);
         } else {
                 // Small object.
                 c = m->mcache;
                 size = class_to_size[sizeclass];
                 if(size > sizeof(uintptr))
                         ((uintptr*)v)[1] = 1;   // mark as "needs to be zeroed"
                 mstats.alloc -= size;
                 mstats.by_size[sizeclass].nfree++;
                 MCache_Free(c, v, sizeclass, size);
         }
@@ skipping 193 matching lines @@
                 }
                 nret = (nret + sizeof(void*)-1) & ~(sizeof(void*)-1);
 
                 if(getfinalizer(obj.data, 0, nil)) {
                         printf("runtime.SetFinalizer: finalizer already set");
                         goto throw;
                 }
         }
         addfinalizer(obj.data, finalizer.data, nret);
 }