diff options
Diffstat (limited to 'libgo/runtime/malloc.h')
| -rw-r--r-- | libgo/runtime/malloc.h | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/libgo/runtime/malloc.h b/libgo/runtime/malloc.h index 7ebb762450e..ebea34eb32c 100644 --- a/libgo/runtime/malloc.h +++ b/libgo/runtime/malloc.h @@ -86,6 +86,7 @@ typedef struct MSpan MSpan; typedef struct MStats MStats; typedef struct MLink MLink; typedef struct MTypes MTypes; +typedef struct GCStats GCStats; enum { @@ -114,10 +115,18 @@ enum HeapAllocChunk = 1<<20, // Chunk size for heap growth // Number of bits in page to span calculations (4k pages). - // On 64-bit, we limit the arena to 128GB, or 37 bits. + // On Windows 64-bit we limit the arena to 32GB or 35 bits (see below for reason). + // On other 64-bit platforms, we limit the arena to 128GB, or 37 bits. // On 32-bit, we don't bother limiting anything, so we use the full 32-bit address. #if __SIZEOF_POINTER__ == 8 +#ifdef GOOS_windows + // Windows counts memory used by page table into committed memory + // of the process, so we can't reserve too much memory. + // See http://golang.org/issue/5402 and http://golang.org/issue/5236. + MHeapMap_Bits = 35 - PageShift, +#else MHeapMap_Bits = 37 - PageShift, +#endif #else MHeapMap_Bits = 32 - PageShift, #endif @@ -133,7 +142,7 @@ enum // This must be a #define instead of an enum because it // is so large. #if __SIZEOF_POINTER__ == 8 -#define MaxMem (1ULL<<(MHeapMap_Bits+PageShift)) /* 128 GB */ +#define MaxMem (1ULL<<(MHeapMap_Bits+PageShift)) /* 128 GB or 32 GB */ #else #define MaxMem ((uintptr)-1) #endif @@ -229,7 +238,7 @@ struct MStats uint64 buckhash_sys; // profiling bucket hash table // Statistics about garbage collector. - // Protected by stopping the world during GC. + // Protected by mheap or stopping the world during GC. uint64 next_gc; // next GC (in heap_alloc time) uint64 last_gc; // last GC (in absolute time) uint64 pause_total_ns; @@ -249,7 +258,6 @@ struct MStats extern MStats mstats __asm__ (GOSYM_PREFIX "runtime.VmemStats"); - // Size classes. Computed and initialized by InitSizes. // // SizeToClass(0 <= n <= MaxSmallSize) returns the size class, @@ -416,18 +424,18 @@ struct MHeap byte *arena_end; // central free lists for small size classes. - // the union makes sure that the MCentrals are + // the padding makes sure that the MCentrals are // spaced CacheLineSize bytes apart, so that each MCentral.Lock // gets its own cache line. - union { + struct { MCentral; - byte pad[CacheLineSize]; + byte pad[64]; } central[NumSizeClasses]; FixAlloc spanalloc; // allocator for Span* FixAlloc cachealloc; // allocator for MCache* }; -extern MHeap runtime_mheap; +extern MHeap *runtime_mheap; void runtime_MHeap_Init(MHeap *h, void *(*allocator)(uintptr)); MSpan* runtime_MHeap_Alloc(MHeap *h, uintptr npage, int32 sizeclass, int32 acct, int32 zeroed); @@ -452,8 +460,8 @@ void runtime_unmarkspan(void *v, uintptr size); bool runtime_blockspecial(void*); void runtime_setblockspecial(void*, bool); void runtime_purgecachedstats(MCache*); -void* runtime_new(const Type *); -#define runtime_cnew(T) runtime_new(T) +void* runtime_cnew(const Type*); +void* runtime_cnewarray(const Type*, intgo); void runtime_settype(void*, uintptr); void runtime_settype_flush(M*, bool); @@ -493,6 +501,7 @@ enum TypeInfo_SingleObject = 0, TypeInfo_Array = 1, TypeInfo_Map = 2, + TypeInfo_Chan = 3, // Enables type information at the end of blocks allocated from heap DebugTypeAtBlockEnd = 0, @@ -504,4 +513,5 @@ void runtime_gc_itab_ptr(Eface*); void runtime_memorydump(void); +void runtime_proc_scan(void (*)(Obj)); void runtime_time_scan(void (*)(Obj)); |