diff options
| -rw-r--r-- | src/allocators/mimalloc.zig | 190 | ||||
| m--------- | src/deps/mimalloc | 0 | ||||
| -rw-r--r-- | src/mimalloc_arena.zig | 124 |
3 files changed, 203 insertions, 111 deletions
diff --git a/src/allocators/mimalloc.zig b/src/allocators/mimalloc.zig index f671b4553..5d8d7f2e3 100644 --- a/src/allocators/mimalloc.zig +++ b/src/allocators/mimalloc.zig @@ -1,17 +1,3 @@ -const C = @import("std").zig.c_builtins; -const __attribute__ = C.__attribute__; -const _Nonnull = C._Nonnull; -const _Null_unspecified = C._Null_unspecified; -const _Nullable = C._Nullable; -const enum_mi_option_e = C.enum_mi_option_e; -const L = C.L; -const LL = C.LL; -const U = C.U; -const UL = C.UL; -const ULL = C.ULL; -pub const ptrdiff_t = c_long; -pub const wchar_t = c_int; -pub const max_align_t = c_longdouble; pub extern fn mi_malloc(size: usize) ?*anyopaque; pub extern fn mi_calloc(count: usize, size: usize) ?*anyopaque; pub extern fn mi_realloc(p: ?*anyopaque, newsize: usize) ?*anyopaque; @@ -30,7 +16,7 @@ pub extern fn mi_usable_size(p: ?*const anyopaque) usize; pub extern fn mi_good_size(size: usize) usize; pub const mi_deferred_free_fun = fn (bool, c_ulonglong, ?*anyopaque) callconv(.C) void; pub extern fn mi_register_deferred_free(deferred_free: ?mi_deferred_free_fun, arg: ?*anyopaque) void; -pub const mi_output_fun = fn ([*c]const u8, ?*anyopaque) callconv(.C) void; +pub const mi_output_fun = fn ([*:0]const u8, ?*anyopaque) callconv(.C) void; pub extern fn mi_register_output(out: ?mi_output_fun, arg: ?*anyopaque) void; pub const mi_error_fun = fn (c_int, ?*anyopaque) callconv(.C) void; pub extern fn mi_register_error(fun: ?mi_error_fun, arg: ?*anyopaque) void; @@ -44,61 +30,84 @@ pub extern fn mi_process_init() void; pub extern fn mi_thread_init() void; pub extern fn mi_thread_done() void; pub extern fn mi_thread_stats_print_out(out: ?mi_output_fun, arg: ?*anyopaque) void; -pub extern fn mi_process_info(elapsed_msecs: *usize, user_msecs: *usize, system_msecs: *usize, current_rss: *usize, peak_rss: *usize, current_commit: *usize, peak_commit: *usize, page_faults: *usize) void; +pub extern fn mi_process_info(elapsed_msecs: [*c]usize, user_msecs: [*c]usize, system_msecs: [*c]usize, current_rss: [*c]usize, peak_rss: [*c]usize, current_commit: [*c]usize, peak_commit: [*c]usize, page_faults: [*c]usize) void; pub extern fn mi_malloc_aligned(size: usize, alignment: usize) ?*anyopaque; -pub extern fn mi_malloc_aligned_at(size: usize, alignment: usize, offset: usize) ?[*]u8; +pub extern fn mi_malloc_aligned_at(size: usize, alignment: usize, offset: usize) ?*anyopaque; pub extern fn mi_zalloc_aligned(size: usize, alignment: usize) ?*anyopaque; pub extern fn mi_zalloc_aligned_at(size: usize, alignment: usize, offset: usize) ?*anyopaque; pub extern fn mi_calloc_aligned(count: usize, size: usize, alignment: usize) ?*anyopaque; pub extern fn mi_calloc_aligned_at(count: usize, size: usize, alignment: usize, offset: usize) ?*anyopaque; pub extern fn mi_realloc_aligned(p: ?*anyopaque, newsize: usize, alignment: usize) ?*anyopaque; pub extern fn mi_realloc_aligned_at(p: ?*anyopaque, newsize: usize, alignment: usize, offset: usize) ?*anyopaque; -pub const struct_mi_heap_s = opaque { - pub inline fn backing(_: anytype) *mi_heap_t { - return mi_heap_get_backing(); +pub const Heap = opaque { + pub fn new() ?*Heap { + return mi_heap_new(); + } + + pub fn delete(self: *Heap) void { + mi_heap_delete(self); + } + + pub fn malloc(self: *Heap, size: usize) ?*anyopaque { + return mi_heap_malloc(self, size); + } + + pub fn backing(_: *Heap) *Heap { + return mi_heap_get_default(); + } + + pub fn calloc(self: *Heap, count: usize, size: usize) ?*anyopaque { + return mi_heap_calloc(self, count, size); + } + + pub fn realloc(self: *Heap, p: ?*anyopaque, newsize: usize) ?*anyopaque { + return mi_heap_realloc(self, p, newsize); + } + + pub fn isOwned(self: *Heap, p: ?*anyopaque) bool { + return mi_heap_check_owned(self, p); } }; -pub const mi_heap_t = struct_mi_heap_s; -pub extern fn mi_heap_new() ?*mi_heap_t; -pub extern fn mi_heap_delete(heap: ?*mi_heap_t) void; -pub extern fn mi_heap_destroy(heap: ?*mi_heap_t) void; -pub extern fn mi_heap_set_default(heap: ?*mi_heap_t) ?*mi_heap_t; -pub extern fn mi_heap_get_default() *mi_heap_t; -pub extern fn mi_heap_get_backing() *mi_heap_t; -pub extern fn mi_heap_collect(heap: ?*mi_heap_t, force: bool) void; -pub extern fn mi_heap_malloc(heap: ?*mi_heap_t, size: usize) ?*anyopaque; -pub extern fn mi_heap_zalloc(heap: ?*mi_heap_t, size: usize) ?*anyopaque; -pub extern fn mi_heap_calloc(heap: ?*mi_heap_t, count: usize, size: usize) ?*anyopaque; -pub extern fn mi_heap_mallocn(heap: ?*mi_heap_t, count: usize, size: usize) ?*anyopaque; -pub extern fn mi_heap_malloc_small(heap: ?*mi_heap_t, size: usize) ?*anyopaque; -pub extern fn mi_heap_realloc(heap: ?*mi_heap_t, p: ?*anyopaque, newsize: usize) ?*anyopaque; -pub extern fn mi_heap_reallocn(heap: ?*mi_heap_t, p: ?*anyopaque, count: usize, size: usize) ?*anyopaque; -pub extern fn mi_heap_reallocf(heap: ?*mi_heap_t, p: ?*anyopaque, newsize: usize) ?*anyopaque; -pub extern fn mi_heap_strdup(heap: ?*mi_heap_t, s: [*c]const u8) [*c]u8; -pub extern fn mi_heap_strndup(heap: ?*mi_heap_t, s: [*c]const u8, n: usize) [*c]u8; -pub extern fn mi_heap_realpath(heap: ?*mi_heap_t, fname: [*c]const u8, resolved_name: [*c]u8) [*c]u8; -pub extern fn mi_heap_malloc_aligned(heap: ?*mi_heap_t, size: usize, alignment: usize) ?*anyopaque; -pub extern fn mi_heap_malloc_aligned_at(heap: ?*mi_heap_t, size: usize, alignment: usize, offset: usize) ?*anyopaque; -pub extern fn mi_heap_zalloc_aligned(heap: ?*mi_heap_t, size: usize, alignment: usize) ?*anyopaque; -pub extern fn mi_heap_zalloc_aligned_at(heap: ?*mi_heap_t, size: usize, alignment: usize, offset: usize) ?*anyopaque; -pub extern fn mi_heap_calloc_aligned(heap: ?*mi_heap_t, count: usize, size: usize, alignment: usize) ?*anyopaque; -pub extern fn mi_heap_calloc_aligned_at(heap: ?*mi_heap_t, count: usize, size: usize, alignment: usize, offset: usize) ?*anyopaque; -pub extern fn mi_heap_realloc_aligned(heap: ?*mi_heap_t, p: ?*anyopaque, newsize: usize, alignment: usize) ?*anyopaque; -pub extern fn mi_heap_realloc_aligned_at(heap: ?*mi_heap_t, p: ?*anyopaque, newsize: usize, alignment: usize, offset: usize) ?*anyopaque; +pub extern fn mi_heap_new() ?*Heap; +pub extern fn mi_heap_delete(heap: *Heap) void; +pub extern fn mi_heap_destroy(heap: *Heap) void; +pub extern fn mi_heap_set_default(heap: *Heap) *Heap; +pub extern fn mi_heap_get_default() *Heap; +pub extern fn mi_heap_get_backing() *Heap; +pub extern fn mi_heap_collect(heap: *Heap, force: bool) void; +pub extern fn mi_heap_malloc(heap: *Heap, size: usize) ?*anyopaque; +pub extern fn mi_heap_zalloc(heap: *Heap, size: usize) ?*anyopaque; +pub extern fn mi_heap_calloc(heap: *Heap, count: usize, size: usize) ?*anyopaque; +pub extern fn mi_heap_mallocn(heap: *Heap, count: usize, size: usize) ?*anyopaque; +pub extern fn mi_heap_malloc_small(heap: *Heap, size: usize) ?*anyopaque; +pub extern fn mi_heap_realloc(heap: *Heap, p: ?*anyopaque, newsize: usize) ?*anyopaque; +pub extern fn mi_heap_reallocn(heap: *Heap, p: ?*anyopaque, count: usize, size: usize) ?*anyopaque; +pub extern fn mi_heap_reallocf(heap: *Heap, p: ?*anyopaque, newsize: usize) ?*anyopaque; +pub extern fn mi_heap_strdup(heap: *Heap, s: [*c]const u8) [*c]u8; +pub extern fn mi_heap_strndup(heap: *Heap, s: [*c]const u8, n: usize) [*c]u8; +pub extern fn mi_heap_realpath(heap: *Heap, fname: [*c]const u8, resolved_name: [*c]u8) [*c]u8; +pub extern fn mi_heap_malloc_aligned(heap: *Heap, size: usize, alignment: usize) ?*anyopaque; +pub extern fn mi_heap_malloc_aligned_at(heap: *Heap, size: usize, alignment: usize, offset: usize) ?*anyopaque; +pub extern fn mi_heap_zalloc_aligned(heap: *Heap, size: usize, alignment: usize) ?*anyopaque; +pub extern fn mi_heap_zalloc_aligned_at(heap: *Heap, size: usize, alignment: usize, offset: usize) ?*anyopaque; +pub extern fn mi_heap_calloc_aligned(heap: *Heap, count: usize, size: usize, alignment: usize) ?*anyopaque; +pub extern fn mi_heap_calloc_aligned_at(heap: *Heap, count: usize, size: usize, alignment: usize, offset: usize) ?*anyopaque; +pub extern fn mi_heap_realloc_aligned(heap: *Heap, p: ?*anyopaque, newsize: usize, alignment: usize) ?*anyopaque; +pub extern fn mi_heap_realloc_aligned_at(heap: *Heap, p: ?*anyopaque, newsize: usize, alignment: usize, offset: usize) ?*anyopaque; pub extern fn mi_rezalloc(p: ?*anyopaque, newsize: usize) ?*anyopaque; pub extern fn mi_recalloc(p: ?*anyopaque, newcount: usize, size: usize) ?*anyopaque; pub extern fn mi_rezalloc_aligned(p: ?*anyopaque, newsize: usize, alignment: usize) ?*anyopaque; pub extern fn mi_rezalloc_aligned_at(p: ?*anyopaque, newsize: usize, alignment: usize, offset: usize) ?*anyopaque; pub extern fn mi_recalloc_aligned(p: ?*anyopaque, newcount: usize, size: usize, alignment: usize) ?*anyopaque; pub extern fn mi_recalloc_aligned_at(p: ?*anyopaque, newcount: usize, size: usize, alignment: usize, offset: usize) ?*anyopaque; -pub extern fn mi_heap_rezalloc(heap: ?*mi_heap_t, p: ?*anyopaque, newsize: usize) ?*anyopaque; -pub extern fn mi_heap_recalloc(heap: ?*mi_heap_t, p: ?*anyopaque, newcount: usize, size: usize) ?*anyopaque; -pub extern fn mi_heap_rezalloc_aligned(heap: ?*mi_heap_t, p: ?*anyopaque, newsize: usize, alignment: usize) ?*anyopaque; -pub extern fn mi_heap_rezalloc_aligned_at(heap: ?*mi_heap_t, p: ?*anyopaque, newsize: usize, alignment: usize, offset: usize) ?*anyopaque; -pub extern fn mi_heap_recalloc_aligned(heap: ?*mi_heap_t, p: ?*anyopaque, newcount: usize, size: usize, alignment: usize) ?*anyopaque; -pub extern fn mi_heap_recalloc_aligned_at(heap: ?*mi_heap_t, p: ?*anyopaque, newcount: usize, size: usize, alignment: usize, offset: usize) ?*anyopaque; -pub extern fn mi_heap_contains_block(heap: ?*mi_heap_t, p: ?*const anyopaque) bool; -pub extern fn mi_heap_check_owned(heap: ?*mi_heap_t, p: ?*const anyopaque) bool; +pub extern fn mi_heap_rezalloc(heap: *Heap, p: ?*anyopaque, newsize: usize) ?*anyopaque; +pub extern fn mi_heap_recalloc(heap: *Heap, p: ?*anyopaque, newcount: usize, size: usize) ?*anyopaque; +pub extern fn mi_heap_rezalloc_aligned(heap: *Heap, p: ?*anyopaque, newsize: usize, alignment: usize) ?*anyopaque; +pub extern fn mi_heap_rezalloc_aligned_at(heap: *Heap, p: ?*anyopaque, newsize: usize, alignment: usize, offset: usize) ?*anyopaque; +pub extern fn mi_heap_recalloc_aligned(heap: *Heap, p: ?*anyopaque, newcount: usize, size: usize, alignment: usize) ?*anyopaque; +pub extern fn mi_heap_recalloc_aligned_at(heap: *Heap, p: ?*anyopaque, newcount: usize, size: usize, alignment: usize, offset: usize) ?*anyopaque; +pub extern fn mi_heap_contains_block(heap: *Heap, p: *const anyopaque) bool; +pub extern fn mi_heap_check_owned(heap: *Heap, p: *const anyopaque) bool; pub extern fn mi_check_owned(p: ?*const anyopaque) bool; pub const struct_mi_heap_area_s = extern struct { blocks: ?*anyopaque, @@ -106,18 +115,26 @@ pub const struct_mi_heap_area_s = extern struct { committed: usize, used: usize, block_size: usize, + full_block_size: usize, }; pub const mi_heap_area_t = struct_mi_heap_area_s; -pub const mi_block_visit_fun = fn (?*const mi_heap_t, [*c]const mi_heap_area_t, ?*anyopaque, usize, ?*anyopaque) callconv(.C) bool; -pub extern fn mi_heap_visit_blocks(heap: ?*const mi_heap_t, visit_all_blocks: bool, visitor: ?mi_block_visit_fun, arg: ?*anyopaque) bool; +pub const mi_block_visit_fun = fn (?*const Heap, [*c]const mi_heap_area_t, ?*anyopaque, usize, ?*anyopaque) callconv(.C) bool; +pub extern fn mi_heap_visit_blocks(heap: ?*const Heap, visit_all_blocks: bool, visitor: ?mi_block_visit_fun, arg: ?*anyopaque) bool; pub extern fn mi_is_in_heap_region(p: ?*const anyopaque) bool; pub extern fn mi_is_redirected() bool; pub extern fn mi_reserve_huge_os_pages_interleave(pages: usize, numa_nodes: usize, timeout_msecs: usize) c_int; pub extern fn mi_reserve_huge_os_pages_at(pages: usize, numa_node: c_int, timeout_msecs: usize) c_int; pub extern fn mi_reserve_os_memory(size: usize, commit: bool, allow_large: bool) c_int; pub extern fn mi_manage_os_memory(start: ?*anyopaque, size: usize, is_committed: bool, is_large: bool, is_zero: bool, numa_node: c_int) bool; +pub extern fn mi_debug_show_arenas() void; +pub const ArenaID = c_int; +pub extern fn mi_arena_area(arena_id: ArenaID, size: [*c]usize) ?*anyopaque; +pub extern fn mi_reserve_huge_os_pages_at_ex(pages: usize, numa_node: c_int, timeout_msecs: usize, exclusive: bool, arena_id: *ArenaID) c_int; +pub extern fn mi_reserve_os_memory_ex(size: usize, commit: bool, allow_large: bool, exclusive: bool, arena_id: *ArenaID) c_int; +pub extern fn mi_manage_os_memory_ex(start: ?*anyopaque, size: usize, is_committed: bool, is_large: bool, is_zero: bool, numa_node: c_int, exclusive: bool, arena_id: *ArenaID) bool; +pub extern fn mi_heap_new_in_arena(arena_id: ArenaID) ?*Heap; pub extern fn mi_reserve_huge_os_pages(pages: usize, max_secs: f64, pages_reserved: [*c]usize) c_int; -pub const mi_option_t = enum(c_uint) { +pub const Option = enum(c_uint) { show_errors = 0, show_stats = 1, verbose = 2, @@ -128,7 +145,7 @@ pub const mi_option_t = enum(c_uint) { reserve_huge_os_pages = 7, reserve_huge_os_pages_at = 8, reserve_os_memory = 9, - segment_cache = 10, + deprecated_segment_cache = 10, page_reset = 11, abandoned_page_decommit = 12, deprecated_segment_reset = 13, @@ -139,24 +156,24 @@ pub const mi_option_t = enum(c_uint) { os_tag = 18, max_errors = 19, max_warnings = 20, - - // mimalloc v2 specific - allow_decommit = 21, - segment_decommit_delay = 22, - decommit_extend_delay = 23, + max_segment_reclaim = 21, + allow_decommit = 22, + segment_decommit_delay = 23, + decommit_extend_delay = 24, }; - -pub extern fn mi_option_is_enabled(option: mi_option_t) bool; -pub extern fn mi_option_enable(option: mi_option_t) void; -pub extern fn mi_option_disable(option: mi_option_t) void; -pub extern fn mi_option_set_enabled(option: mi_option_t, enable: bool) void; -pub extern fn mi_option_set_enabled_default(option: mi_option_t, enable: bool) void; -pub extern fn mi_option_get(option: mi_option_t) c_long; -pub extern fn mi_option_set(option: mi_option_t, value: c_long) void; -pub extern fn mi_option_set_default(option: mi_option_t, value: c_long) void; +pub extern fn mi_option_is_enabled(option: Option) bool; +pub extern fn mi_option_enable(option: Option) void; +pub extern fn mi_option_disable(option: Option) void; +pub extern fn mi_option_set_enabled(option: Option, enable: bool) void; +pub extern fn mi_option_set_enabled_default(option: Option, enable: bool) void; +pub extern fn mi_option_get(option: Option) c_long; +pub extern fn mi_option_get_clamp(option: Option, min: c_long, max: c_long) c_long; +pub extern fn mi_option_set(option: Option, value: c_long) void; +pub extern fn mi_option_set_default(option: Option, value: c_long) void; pub extern fn mi_cfree(p: ?*anyopaque) void; pub extern fn mi__expand(p: ?*anyopaque, newsize: usize) ?*anyopaque; pub extern fn mi_malloc_size(p: ?*const anyopaque) usize; +pub extern fn mi_malloc_good_size(size: usize) usize; pub extern fn mi_malloc_usable_size(p: ?*const anyopaque) usize; pub extern fn mi_posix_memalign(p: [*c]?*anyopaque, alignment: usize, size: usize) c_int; pub extern fn mi_memalign(alignment: usize, size: usize) ?*anyopaque; @@ -164,6 +181,7 @@ pub extern fn mi_valloc(size: usize) ?*anyopaque; pub extern fn mi_pvalloc(size: usize) ?*anyopaque; pub extern fn mi_aligned_alloc(alignment: usize, size: usize) ?*anyopaque; pub extern fn mi_reallocarray(p: ?*anyopaque, count: usize, size: usize) ?*anyopaque; +pub extern fn mi_reallocarr(p: ?*anyopaque, count: usize, size: usize) c_int; pub extern fn mi_aligned_recalloc(p: ?*anyopaque, newcount: usize, size: usize, alignment: usize) ?*anyopaque; pub extern fn mi_aligned_offset_recalloc(p: ?*anyopaque, newcount: usize, size: usize, alignment: usize, offset: usize) ?*anyopaque; pub extern fn mi_wcsdup(s: [*c]const c_ushort) [*c]c_ushort; @@ -180,30 +198,6 @@ pub extern fn mi_new_aligned_nothrow(size: usize, alignment: usize) ?*anyopaque; pub extern fn mi_new_n(count: usize, size: usize) ?*anyopaque; pub extern fn mi_new_realloc(p: ?*anyopaque, newsize: usize) ?*anyopaque; pub extern fn mi_new_reallocn(p: ?*anyopaque, newcount: usize, size: usize) ?*anyopaque; -pub const mi_attr_alloc_size = @compileError("unable to translate C expr: unexpected token .Eof"); // /Users/jarred/Downloads/mimalloc-1.7.2/include/mimalloc.h:66:13 -pub const mi_attr_alloc_size2 = @compileError("unable to translate C expr: unexpected token .Eof"); // /Users/jarred/Downloads/mimalloc-1.7.2/include/mimalloc.h:67:13 -pub const mi_attr_alloc_align = @compileError("unable to translate C expr: unexpected token .Eof"); // /Users/jarred/Downloads/mimalloc-1.7.2/include/mimalloc.h:68:13 -pub const offsetof = @compileError("TODO implement function '__builtin_offsetof' in std.zig.c_builtins"); // /Users/jarred/Build/zig/lib/include/stddef.h:104:9 -pub const mi_malloc_tp = @compileError("unable to translate C expr: unexpected token .RParen"); // /Users/jarred/Downloads/mimalloc-1.7.2/include/mimalloc.h:279:9 -pub const mi_zalloc_tp = @compileError("unable to translate C expr: unexpected token .RParen"); // /Users/jarred/Downloads/mimalloc-1.7.2/include/mimalloc.h:280:9 -pub const mi_calloc_tp = @compileError("unable to translate C expr: unexpected token .RParen"); // /Users/jarred/Downloads/mimalloc-1.7.2/include/mimalloc.h:281:9 -pub const mi_mallocn_tp = @compileError("unable to translate C expr: unexpected token .RParen"); // /Users/jarred/Downloads/mimalloc-1.7.2/include/mimalloc.h:282:9 -pub const mi_reallocn_tp = @compileError("unable to translate C expr: unexpected token .RParen"); // /Users/jarred/Downloads/mimalloc-1.7.2/include/mimalloc.h:283:9 -pub const mi_recalloc_tp = @compileError("unable to translate C expr: unexpected token .RParen"); // /Users/jarred/Downloads/mimalloc-1.7.2/include/mimalloc.h:284:9 -pub const mi_heap_malloc_tp = @compileError("unable to translate C expr: unexpected token .RParen"); // /Users/jarred/Downloads/mimalloc-1.7.2/include/mimalloc.h:286:9 -pub const mi_heap_zalloc_tp = @compileError("unable to translate C expr: unexpected token .RParen"); // /Users/jarred/Downloads/mimalloc-1.7.2/include/mimalloc.h:287:9 -pub const mi_heap_calloc_tp = @compileError("unable to translate C expr: unexpected token .RParen"); // /Users/jarred/Downloads/mimalloc-1.7.2/include/mimalloc.h:288:9 -pub const mi_heap_mallocn_tp = @compileError("unable to translate C expr: unexpected token .RParen"); // /Users/jarred/Downloads/mimalloc-1.7.2/include/mimalloc.h:289:9 -pub const mi_heap_reallocn_tp = @compileError("unable to translate C expr: unexpected token .RParen"); // /Users/jarred/Downloads/mimalloc-1.7.2/include/mimalloc.h:290:9 -pub const mi_heap_recalloc_tp = @compileError("unable to translate C expr: unexpected token .RParen"); // /Users/jarred/Downloads/mimalloc-1.7.2/include/mimalloc.h:291:9 -pub const MI_MALLOC_VERSION = @as(c_int, 171); -pub const NULL = @import("std").zig.c_translation.cast(?*anyopaque, @as(c_int, 0)); -pub const bool_1 = bool; -pub const true_2 = @as(c_int, 1); -pub const false_3 = @as(c_int, 0); -pub const __bool_true_false_are_defined = @as(c_int, 1); pub const MI_SMALL_WSIZE_MAX = @as(c_int, 128); pub const MI_SMALL_SIZE_MAX = MI_SMALL_WSIZE_MAX * @import("std").zig.c_translation.sizeof(?*anyopaque); -pub const mi_heap_s = struct_mi_heap_s; -pub const mi_heap_area_s = struct_mi_heap_area_s; -pub const mi_option_e = enum_mi_option_e; +pub const MI_ALIGNMENT_MAX = (@as(c_int, 16) * @as(c_int, 1024)) * @as(c_ulong, 1024); diff --git a/src/deps/mimalloc b/src/deps/mimalloc -Subproject 6d07c0b9ba535617cf9665ea77d099dad265818 +Subproject 030ff2f4a4905e7579e7576cac47bac0643b2a6 diff --git a/src/mimalloc_arena.zig b/src/mimalloc_arena.zig index a313c7dfe..5b2fa14e8 100644 --- a/src/mimalloc_arena.zig +++ b/src/mimalloc_arena.zig @@ -7,9 +7,88 @@ const Environment = @import("./env.zig"); const FeatureFlags = @import("./feature_flags.zig"); const Allocator = mem.Allocator; const assert = std.debug.assert; +const bun = @import("./global.zig"); + +pub const GlobalArena = struct { + arena: Arena, + fallback_allocator: std.mem.Allocator, + + pub fn initWithCapacity(capacity: usize, fallback: std.mem.Allocator) error{OutOfMemory}!GlobalArena { + const arena = try Arena.initWithCapacity(capacity); + + return GlobalArena{ + .arena = arena, + .fallback_allocator = fallback, + }; + } + + pub fn allocator(this: *GlobalArena) Allocator { + return std.mem.Allocator.init(this, alloc, resize, free); + } + + fn alloc( + self: *GlobalArena, + len: usize, + ptr_align: u29, + len_align: u29, + return_address: usize, + ) error{OutOfMemory}![]u8 { + return self.arena.alloc(len, ptr_align, len_align, return_address) catch + return self.fallback_allocator.rawAlloc(len, ptr_align, len_align, return_address); + } + + fn resize( + self: *GlobalArena, + buf: []u8, + buf_align: u29, + new_len: usize, + len_align: u29, + return_address: usize, + ) ?usize { + if (self.arena.ownsPtr(buf.ptr)) { + return self.arena.resize(buf, buf_align, new_len, len_align, return_address); + } else { + return self.fallback_allocator.rawResize(buf, buf_align, new_len, len_align, return_address); + } + } + + fn free( + self: *GlobalArena, + buf: []u8, + buf_align: u29, + return_address: usize, + ) void { + if (self.arena.ownsPtr(buf.ptr)) { + return self.arena.free(buf, buf_align, return_address); + } else { + return self.fallback_allocator.rawFree(buf, buf_align, return_address); + } + } +}; pub const Arena = struct { - heap: ?*mimalloc.mi_heap_t = null, + heap: ?*mimalloc.Heap = null, + arena_id: mimalloc.ArenaID = -1, + + pub fn initWithCapacity(capacity: usize) error{OutOfMemory}!Arena { + var arena_id: mimalloc.ArenaID = -1; + + std.debug.assert(capacity >= 8 * 1024 * 1024); // mimalloc requires a minimum of 8MB + // which makes this not very useful for us! + + if (!mimalloc.mi_manage_os_memory_ex(null, capacity, true, true, false, -1, true, &arena_id)) { + if (!mimalloc.mi_manage_os_memory_ex(null, capacity, false, false, false, -1, true, &arena_id)) { + return error.OutOfMemory; + } + } + std.debug.assert(arena_id != -1); + + var heap = mimalloc.mi_heap_new_in_arena(arena_id) orelse return error.OutOfMemory; + return Arena{ + .heap = heap, + .arena_id = arena_id, + }; + } /// Internally, mimalloc calls mi_heap_get_default() /// to get the default heap. @@ -30,13 +109,31 @@ pub const Arena = struct { } pub fn deinit(this: *Arena) void { - mimalloc.mi_heap_destroy(this.heap); + mimalloc.mi_heap_destroy(this.heap.?); this.heap = null; } pub fn dumpThreadStats(_: *Arena) void { - mimalloc.mi_thread_stats_print_out(null, null); + const dump_fn = struct { + pub fn dump(textZ: [*:0]const u8, _: ?*anyopaque) callconv(.C) void { + const text = bun.span(textZ); + bun.Output.errorWriter().writeAll(text) catch {}; + } + }.dump; + mimalloc.mi_thread_stats_print_out(dump_fn, null); + bun.Output.flush(); + } + + pub fn dumpStats(_: *Arena) void { + const dump_fn = struct { + pub fn dump(textZ: [*:0]const u8, _: ?*anyopaque) callconv(.C) void { + const text = bun.span(textZ); + bun.Output.errorWriter().writeAll(text) catch {}; + } + }.dump; + mimalloc.mi_stats_print_out(dump_fn, null); + bun.Output.flush(); } pub fn reset(this: *Arena) void { @@ -49,7 +146,11 @@ pub const Arena = struct { } pub fn gc(this: Arena, force: bool) void { - mimalloc.mi_heap_collect(this.heap, force); + mimalloc.mi_heap_collect(this.heap orelse return, force); + } + + pub fn ownsPtr(this: Arena, ptr: *const anyopaque) bool { + return mimalloc.mi_heap_check_owned(this.heap.?, ptr); } // Copied from rust @@ -59,19 +160,16 @@ pub const Arena = struct { (alignment == MI_MAX_ALIGN_SIZE and size > (MI_MAX_ALIGN_SIZE / 2))); } - fn alignedAlloc(heap: *mimalloc.mi_heap_t, len: usize, alignment: usize) ?[*]u8 { + fn alignedAlloc(heap: *mimalloc.Heap, len: usize, alignment: usize) ?[*]u8 { if (comptime FeatureFlags.log_allocations) std.debug.print("Malloc: {d}\n", .{len}); // this is the logic that posix_memalign does - var ptr = if (mi_malloc_satisfies_alignment(alignment, len)) - mimalloc.mi_heap_malloc(heap, len) - else - mimalloc.mi_heap_malloc_aligned(heap, len, alignment); + var ptr = mimalloc.mi_heap_malloc_aligned(heap, len, alignment); return @ptrCast([*]u8, ptr orelse null); } - fn alloc( + pub fn alloc( arena: *anyopaque, len: usize, alignment: u29, @@ -82,7 +180,7 @@ pub const Arena = struct { assert(len > 0); assert(std.math.isPowerOfTwo(alignment)); - var ptr = alignedAlloc(@ptrCast(*mimalloc.mi_heap_t, arena), len, alignment) orelse return error.OutOfMemory; + var ptr = alignedAlloc(@ptrCast(*mimalloc.Heap, arena), len, alignment) orelse return error.OutOfMemory; if (len_align == 0) { return ptr[0..len]; } @@ -98,7 +196,7 @@ pub const Arena = struct { } } - fn resize( + pub fn resize( _: *anyopaque, buf: []u8, buf_align: u29, @@ -121,7 +219,7 @@ pub const Arena = struct { return null; } - fn free( + pub fn free( _: *anyopaque, buf: []u8, buf_align: u29, |