mirror of
https://github.com/tinygo-org/tinygo.git
synced 2026-08-21 12:59:04 +00:00
wasm: improve malloc/free heap tracking
Using a slice requires a lot less in code size than a map. This is visible when compiling a very small "hello world" style program. Before tracking memory in malloc/free: 2873 bytes With tracking using a map: 6551 bytes With a slice instead of a map: 3532 bytes Of course, most of this code size increase won't be visible with https://github.com/tinygo-org/tinygo/pull/3142, but it's still a saving of around 3kB in this minimal example.
This commit is contained in:
@@ -62,53 +62,63 @@ func growHeap() bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// The below functions override the default allocator of wasi-libc. This ensures
|
// The below functions override the default allocator of wasi-libc. This ensures
|
||||||
// code linked from other languages can allocate memory without colliding with
|
// code linked from other languages can allocate memory on the same heap as the
|
||||||
// our GC allocations.
|
// TinyGo heap.
|
||||||
|
|
||||||
var allocs = make(map[uintptr][]byte)
|
// Keep track of all the heap allocations while they're in use.
|
||||||
|
// This is not the most efficient solution but it costs a lot less in code size
|
||||||
|
// compared to a map.
|
||||||
|
var allocs []unsafe.Pointer
|
||||||
|
|
||||||
|
func trackAlloc(ptr unsafe.Pointer) {
|
||||||
|
// Try to find some empty space in the allocs slice.
|
||||||
|
for i, slot := range allocs {
|
||||||
|
if slot == nil {
|
||||||
|
allocs[i] = slot
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Couldn't find this space. Fall back to appending to the end.
|
||||||
|
allocs = append(allocs, ptr)
|
||||||
|
}
|
||||||
|
|
||||||
|
func removeAlloc(ptr unsafe.Pointer) {
|
||||||
|
// Remove the pointer so it can be garbage collected.
|
||||||
|
for i, slot := range allocs {
|
||||||
|
if ptr == slot {
|
||||||
|
allocs[i] = nil
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//export malloc
|
//export malloc
|
||||||
func libc_malloc(size uintptr) unsafe.Pointer {
|
func libc_malloc(size uintptr) unsafe.Pointer {
|
||||||
buf := make([]byte, size)
|
ptr := alloc(size, nil)
|
||||||
ptr := unsafe.Pointer(&buf[0])
|
trackAlloc(ptr)
|
||||||
allocs[uintptr(ptr)] = buf
|
|
||||||
return ptr
|
return ptr
|
||||||
}
|
}
|
||||||
|
|
||||||
//export free
|
//export free
|
||||||
func libc_free(ptr unsafe.Pointer) {
|
func libc_free(ptr unsafe.Pointer) {
|
||||||
if ptr == nil {
|
removeAlloc(ptr)
|
||||||
return
|
free(ptr)
|
||||||
}
|
|
||||||
if _, ok := allocs[uintptr(ptr)]; ok {
|
|
||||||
delete(allocs, uintptr(ptr))
|
|
||||||
} else {
|
|
||||||
panic("free: invalid pointer")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//export calloc
|
//export calloc
|
||||||
func libc_calloc(nmemb, size uintptr) unsafe.Pointer {
|
func libc_calloc(nmemb, size uintptr) unsafe.Pointer {
|
||||||
// No difference between calloc and malloc.
|
// Note: we could be even more correct here and check that nmemb * size
|
||||||
|
// doesn't overflow. However the current implementation should normally work
|
||||||
|
// fine.
|
||||||
return libc_malloc(nmemb * size)
|
return libc_malloc(nmemb * size)
|
||||||
}
|
}
|
||||||
|
|
||||||
//export realloc
|
//export realloc
|
||||||
func libc_realloc(oldPtr unsafe.Pointer, size uintptr) unsafe.Pointer {
|
func libc_realloc(oldPtr unsafe.Pointer, size uintptr) unsafe.Pointer {
|
||||||
// It's hard to optimize this to expand the current buffer with our GC, but
|
newPtr := realloc(oldPtr, size)
|
||||||
// it is theoretically possible. For now, just always allocate fresh.
|
if newPtr != oldPtr {
|
||||||
buf := make([]byte, size)
|
removeAlloc(oldPtr)
|
||||||
|
trackAlloc(newPtr)
|
||||||
if oldPtr != nil {
|
|
||||||
if oldBuf, ok := allocs[uintptr(oldPtr)]; ok {
|
|
||||||
copy(buf, oldBuf)
|
|
||||||
delete(allocs, uintptr(oldPtr))
|
|
||||||
} else {
|
|
||||||
panic("realloc: invalid pointer")
|
|
||||||
}
|
}
|
||||||
}
|
return newPtr
|
||||||
|
|
||||||
ptr := unsafe.Pointer(&buf[0])
|
|
||||||
allocs[uintptr(ptr)] = buf
|
|
||||||
return ptr
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user