mirror of
https://github.com/oven-sh/bun
synced 2026-02-09 10:28:47 +00:00
Fixes ENG-21287
Build times, from `bun run build && echo '//' >> src/main.zig && time
bun run build`
|Platform|0.14.1|0.15.2|Speedup|
|-|-|-|-|
|macos debug asan|126.90s|106.27s|1.19x|
|macos debug noasan|60.62s|50.85s|1.19x|
|linux debug asan|292.77s|241.45s|1.21x|
|linux debug noasan|146.58s|130.94s|1.12x|
|linux debug use_llvm=false|n/a|78.27s|1.87x|
|windows debug asan|177.13s|142.55s|1.24x|
Runtime performance:
- next build memory usage may have gone up by 5%. Otherwise seems the
same. Some code with writers may have gotten slower, especially one
instance of a counting writer and a few instances of unbuffered writers
that now have vtable overhead.
- File size reduced by 800kb (from 100.2mb to 99.4mb)
Improvements:
- `@export` hack is no longer needed for watch
- native x86_64 backend for linux builds faster. to use it, set use_llvm
false and no_link_obj false. also set `ASAN_OPTIONS=detect_leaks=0`
otherwise it will spam the output with tens of thousands of lines of
debug info errors. may need to use the zig lldb fork for debugging.
- zig test-obj, which we will be able to use for zig unit tests
Still an issue:
- false 'dependency loop' errors remain in watch mode
- watch mode crashes observed
Follow-up:
- [ ] search `comptime Writer: type` and `comptime W: type` and remove
- [ ] remove format_mode in our zig fork
- [ ] remove deprecated.zig autoFormatLabelFallback
- [ ] remove deprecated.zig autoFormatLabel
- [ ] remove deprecated.BufferedWriter and BufferedReader
- [ ] remove override_no_export_cpp_apis as it is no longer needed
- [ ] css Parser(W) -> Parser, and remove all the comptime writer: type
params
- [ ] remove deprecated writer fully
Files that add lines:
```
649 src/deprecated.zig
167 scripts/pack-codegen-for-zig-team.ts
54 scripts/cleartrace-impl.js
46 scripts/cleartrace.ts
43 src/windows.zig
18 src/fs.zig
17 src/bun.js/ConsoleObject.zig
16 src/output.zig
12 src/bun.js/test/debug.zig
12 src/bun.js/node/node_fs.zig
8 src/env_loader.zig
7 src/css/printer.zig
7 src/cli/init_command.zig
7 src/bun.js/node.zig
6 src/string/escapeRegExp.zig
6 src/install/PnpmMatcher.zig
5 src/bun.js/webcore/Blob.zig
4 src/crash_handler.zig
4 src/bun.zig
3 src/install/lockfile/bun.lock.zig
3 src/cli/update_interactive_command.zig
3 src/cli/pack_command.zig
3 build.zig
2 src/Progress.zig
2 src/install/lockfile/lockfile_json_stringify_for_debugging.zig
2 src/css/small_list.zig
2 src/bun.js/webcore/prompt.zig
1 test/internal/ban-words.test.ts
1 test/internal/ban-limits.json
1 src/watcher/WatcherTrace.zig
1 src/transpiler.zig
1 src/shell/builtin/cp.zig
1 src/js_printer.zig
1 src/io/PipeReader.zig
1 src/install/bin.zig
1 src/css/selectors/selector.zig
1 src/cli/run_command.zig
1 src/bun.js/RuntimeTranspilerStore.zig
1 src/bun.js/bindings/JSRef.zig
1 src/bake/DevServer.zig
```
Files that remove lines:
```
-1 src/test/recover.zig
-1 src/sql/postgres/SocketMonitor.zig
-1 src/sql/mysql/MySQLRequestQueue.zig
-1 src/sourcemap/CodeCoverage.zig
-1 src/css/values/color_js.zig
-1 src/compile_target.zig
-1 src/bundler/linker_context/convertStmtsForChunk.zig
-1 src/bundler/bundle_v2.zig
-1 src/bun.js/webcore/blob/read_file.zig
-1 src/ast/base.zig
-2 src/sql/postgres/protocol/ArrayList.zig
-2 src/shell/builtin/mkdir.zig
-2 src/install/PackageManager/patchPackage.zig
-2 src/install/PackageManager/PackageManagerDirectories.zig
-2 src/fmt.zig
-2 src/css/declaration.zig
-2 src/css/css_parser.zig
-2 src/collections/baby_list.zig
-2 src/bun.js/bindings/ZigStackFrame.zig
-2 src/ast/E.zig
-3 src/StandaloneModuleGraph.zig
-3 src/deps/picohttp.zig
-3 src/deps/libuv.zig
-3 src/btjs.zig
-4 src/threading/Futex.zig
-4 src/shell/builtin/touch.zig
-4 src/meta.zig
-4 src/install/lockfile.zig
-4 src/css/selectors/parser.zig
-5 src/shell/interpreter.zig
-5 src/css/error.zig
-5 src/bun.js/web_worker.zig
-5 src/bun.js.zig
-6 src/cli/test_command.zig
-6 src/bun.js/VirtualMachine.zig
-6 src/bun.js/uuid.zig
-6 src/bun.js/bindings/JSValue.zig
-9 src/bun.js/test/pretty_format.zig
-9 src/bun.js/api/BunObject.zig
-14 src/install/install_binding.zig
-14 src/fd.zig
-14 src/bun.js/node/path.zig
-14 scripts/pack-codegen-for-zig-team.sh
-17 src/bun.js/test/diff_format.zig
```
`git diff --numstat origin/main...HEAD | awk '{ print ($1-$2)"\t"$3 }' |
sort -rn`
---------
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Dylan Conway <dylan.conway567@gmail.com>
Co-authored-by: Meghan Denny <meghan@bun.com>
Co-authored-by: tayor.fish <contact@taylor.fish>
273 lines
8.5 KiB
Zig
273 lines
8.5 KiB
Zig
//! This type is a `GenericAllocator`; see `src/allocators.zig`.
|
|
|
|
const Self = @This();
|
|
|
|
#heap: if (safety_checks) Owned(*DebugHeap) else *mimalloc.Heap,
|
|
|
|
/// Uses the default thread-local heap. This type is zero-sized.
|
|
///
|
|
/// This type is a `GenericAllocator`; see `src/allocators.zig`.
|
|
pub const Default = struct {
|
|
pub fn allocator(self: Default) std.mem.Allocator {
|
|
_ = self;
|
|
return Borrowed.getDefault().allocator();
|
|
}
|
|
};
|
|
|
|
/// Borrowed version of `MimallocArena`, returned by `MimallocArena.borrow`.
|
|
/// Using this type makes it clear who actually owns the `MimallocArena`, and prevents
|
|
/// `deinit` from being called twice.
|
|
///
|
|
/// This type is a `GenericAllocator`; see `src/allocators.zig`.
|
|
pub const Borrowed = struct {
|
|
#heap: BorrowedHeap,
|
|
|
|
pub fn allocator(self: Borrowed) std.mem.Allocator {
|
|
return .{ .ptr = self.#heap, .vtable = &c_allocator_vtable };
|
|
}
|
|
|
|
pub fn getDefault() Borrowed {
|
|
return .{ .#heap = getThreadHeap() };
|
|
}
|
|
|
|
pub fn gc(self: Borrowed) void {
|
|
mimalloc.mi_heap_collect(self.getMimallocHeap(), false);
|
|
}
|
|
|
|
pub fn helpCatchMemoryIssues(self: Borrowed) void {
|
|
if (comptime bun.FeatureFlags.help_catch_memory_issues) {
|
|
self.gc();
|
|
bun.mimalloc.mi_collect(false);
|
|
}
|
|
}
|
|
|
|
pub fn ownsPtr(self: Borrowed, ptr: *const anyopaque) bool {
|
|
return mimalloc.mi_heap_check_owned(self.getMimallocHeap(), ptr);
|
|
}
|
|
|
|
fn fromOpaque(ptr: *anyopaque) Borrowed {
|
|
return .{ .#heap = @ptrCast(@alignCast(ptr)) };
|
|
}
|
|
|
|
fn getMimallocHeap(self: Borrowed) *mimalloc.Heap {
|
|
return if (comptime safety_checks) self.#heap.inner else self.#heap;
|
|
}
|
|
|
|
fn assertThreadLock(self: Borrowed) void {
|
|
if (comptime safety_checks) self.#heap.thread_lock.assertLocked();
|
|
}
|
|
|
|
fn alignedAlloc(self: Borrowed, len: usize, alignment: Alignment) ?[*]u8 {
|
|
log("Malloc: {d}\n", .{len});
|
|
|
|
const heap = self.getMimallocHeap();
|
|
const ptr: ?*anyopaque = if (mimalloc.mustUseAlignedAlloc(alignment))
|
|
mimalloc.mi_heap_malloc_aligned(heap, len, alignment.toByteUnits())
|
|
else
|
|
mimalloc.mi_heap_malloc(heap, len);
|
|
|
|
if (comptime bun.Environment.isDebug) {
|
|
const usable = mimalloc.mi_malloc_usable_size(ptr);
|
|
if (usable < len) {
|
|
std.debug.panic("mimalloc: allocated size is too small: {d} < {d}", .{ usable, len });
|
|
}
|
|
}
|
|
|
|
return if (ptr) |p|
|
|
@as([*]u8, @ptrCast(p))
|
|
else
|
|
null;
|
|
}
|
|
|
|
pub fn downcast(std_alloc: std.mem.Allocator) Borrowed {
|
|
bun.assertf(
|
|
isInstance(std_alloc),
|
|
"not a MimallocArena (vtable is {*})",
|
|
.{std_alloc.vtable},
|
|
);
|
|
return .fromOpaque(std_alloc.ptr);
|
|
}
|
|
};
|
|
|
|
const BorrowedHeap = if (safety_checks) *DebugHeap else *mimalloc.Heap;
|
|
|
|
const DebugHeap = struct {
|
|
inner: *mimalloc.Heap,
|
|
thread_lock: bun.safety.ThreadLock,
|
|
|
|
pub const deinit = void;
|
|
};
|
|
|
|
threadlocal var thread_heap: if (safety_checks) ?DebugHeap else void = if (safety_checks) null;
|
|
|
|
fn getThreadHeap() BorrowedHeap {
|
|
if (comptime !safety_checks) return mimalloc.mi_heap_get_default();
|
|
if (thread_heap == null) {
|
|
thread_heap = .{
|
|
.inner = mimalloc.mi_heap_get_default(),
|
|
.thread_lock = .initLocked(),
|
|
};
|
|
}
|
|
return &thread_heap.?;
|
|
}
|
|
|
|
const log = bun.Output.scoped(.mimalloc, .hidden);
|
|
|
|
pub fn allocator(self: Self) std.mem.Allocator {
|
|
return self.borrow().allocator();
|
|
}
|
|
|
|
pub fn borrow(self: Self) Borrowed {
|
|
return .{ .#heap = if (comptime safety_checks) self.#heap.get() else self.#heap };
|
|
}
|
|
|
|
/// Internally, mimalloc calls mi_heap_get_default()
|
|
/// to get the default heap.
|
|
/// It uses pthread_getspecific to do that.
|
|
/// We can save those extra calls if we just do it once in here
|
|
pub fn getThreadLocalDefault() std.mem.Allocator {
|
|
if (bun.Environment.enable_asan) return bun.default_allocator;
|
|
return Borrowed.getDefault().allocator();
|
|
}
|
|
|
|
pub fn backingAllocator(_: Self) std.mem.Allocator {
|
|
return getThreadLocalDefault();
|
|
}
|
|
|
|
pub fn dumpThreadStats(_: Self) 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_thread_stats_print_out(dump_fn, null);
|
|
bun.Output.flush();
|
|
}
|
|
|
|
pub fn dumpStats(_: Self) 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 deinit(self: *Self) void {
|
|
const mimalloc_heap = self.borrow().getMimallocHeap();
|
|
if (comptime safety_checks) {
|
|
self.#heap.deinit();
|
|
}
|
|
mimalloc.mi_heap_destroy(mimalloc_heap);
|
|
self.* = undefined;
|
|
}
|
|
|
|
pub fn init() Self {
|
|
const mimalloc_heap = mimalloc.mi_heap_new() orelse bun.outOfMemory();
|
|
if (comptime !safety_checks) return .{ .#heap = mimalloc_heap };
|
|
const heap: Owned(*DebugHeap) = .new(.{
|
|
.inner = mimalloc_heap,
|
|
.thread_lock = .initLocked(),
|
|
});
|
|
return .{ .#heap = heap };
|
|
}
|
|
|
|
pub fn gc(self: Self) void {
|
|
self.borrow().gc();
|
|
}
|
|
|
|
pub fn helpCatchMemoryIssues(self: Self) void {
|
|
self.borrow().helpCatchMemoryIssues();
|
|
}
|
|
|
|
pub fn ownsPtr(self: Self, ptr: *const anyopaque) bool {
|
|
return self.borrow().ownsPtr(ptr);
|
|
}
|
|
|
|
fn alignedAllocSize(ptr: [*]u8) usize {
|
|
return mimalloc.mi_malloc_usable_size(ptr);
|
|
}
|
|
|
|
fn vtable_alloc(ptr: *anyopaque, len: usize, alignment: Alignment, _: usize) ?[*]u8 {
|
|
const self: Borrowed = .fromOpaque(ptr);
|
|
self.assertThreadLock();
|
|
return self.alignedAlloc(len, alignment);
|
|
}
|
|
|
|
fn vtable_resize(ptr: *anyopaque, buf: []u8, _: Alignment, new_len: usize, _: usize) bool {
|
|
const self: Borrowed = .fromOpaque(ptr);
|
|
self.assertThreadLock();
|
|
return mimalloc.mi_expand(buf.ptr, new_len) != null;
|
|
}
|
|
|
|
fn vtable_free(
|
|
_: *anyopaque,
|
|
buf: []u8,
|
|
alignment: Alignment,
|
|
_: usize,
|
|
) void {
|
|
// mi_free_size internally just asserts the size
|
|
// so it's faster if we don't pass that value through
|
|
// but its good to have that assertion
|
|
if (comptime bun.Environment.isDebug) {
|
|
assert(mimalloc.mi_is_in_heap_region(buf.ptr));
|
|
if (mimalloc.mustUseAlignedAlloc(alignment))
|
|
mimalloc.mi_free_size_aligned(buf.ptr, buf.len, alignment.toByteUnits())
|
|
else
|
|
mimalloc.mi_free_size(buf.ptr, buf.len);
|
|
} else {
|
|
mimalloc.mi_free(buf.ptr);
|
|
}
|
|
}
|
|
|
|
/// Attempt to expand or shrink memory, allowing relocation.
|
|
///
|
|
/// `memory.len` must equal the length requested from the most recent
|
|
/// successful call to `alloc`, `resize`, or `remap`. `alignment` must
|
|
/// equal the same value that was passed as the `alignment` parameter to
|
|
/// the original `alloc` call.
|
|
///
|
|
/// A non-`null` return value indicates the resize was successful. The
|
|
/// allocation may have same address, or may have been relocated. In either
|
|
/// case, the allocation now has size of `new_len`. A `null` return value
|
|
/// indicates that the resize would be equivalent to allocating new memory,
|
|
/// copying the bytes from the old memory, and then freeing the old memory.
|
|
/// In such case, it is more efficient for the caller to perform the copy.
|
|
///
|
|
/// `new_len` must be greater than zero.
|
|
///
|
|
/// `ret_addr` is optionally provided as the first return address of the
|
|
/// allocation call stack. If the value is `0` it means no return address
|
|
/// has been provided.
|
|
fn vtable_remap(ptr: *anyopaque, buf: []u8, alignment: Alignment, new_len: usize, _: usize) ?[*]u8 {
|
|
const self: Borrowed = .fromOpaque(ptr);
|
|
self.assertThreadLock();
|
|
const heap = self.getMimallocHeap();
|
|
const aligned_size = alignment.toByteUnits();
|
|
const value = mimalloc.mi_heap_realloc_aligned(heap, buf.ptr, new_len, aligned_size);
|
|
return @ptrCast(value);
|
|
}
|
|
|
|
pub fn isInstance(alloc: std.mem.Allocator) bool {
|
|
return alloc.vtable == &c_allocator_vtable;
|
|
}
|
|
|
|
const c_allocator_vtable = std.mem.Allocator.VTable{
|
|
.alloc = vtable_alloc,
|
|
.resize = vtable_resize,
|
|
.remap = vtable_remap,
|
|
.free = vtable_free,
|
|
};
|
|
|
|
const std = @import("std");
|
|
const Alignment = std.mem.Alignment;
|
|
|
|
const bun = @import("bun");
|
|
const assert = bun.assert;
|
|
const mimalloc = bun.mimalloc;
|
|
const Owned = bun.ptr.Owned;
|
|
const safety_checks = bun.Environment.ci_assert;
|