mirror of
https://github.com/oven-sh/bun
synced 2026-02-09 18:38:55 +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>
342 lines
11 KiB
Zig
342 lines
11 KiB
Zig
//! Error type that preserves useful information from the operating system
|
|
const Error = @This();
|
|
|
|
const retry_errno = if (Environment.isLinux)
|
|
@as(Int, @intCast(@intFromEnum(E.AGAIN)))
|
|
else if (Environment.isMac)
|
|
@as(Int, @intCast(@intFromEnum(E.AGAIN)))
|
|
else
|
|
@as(Int, @intCast(@intFromEnum(E.INTR)));
|
|
|
|
const todo_errno = std.math.maxInt(Int) - 1;
|
|
|
|
pub const Int = u16;
|
|
|
|
/// TODO: convert to function
|
|
pub const oom = fromCode(E.NOMEM, .read);
|
|
|
|
errno: Int = todo_errno,
|
|
fd: bun.FileDescriptor = bun.invalid_fd,
|
|
from_libuv: if (Environment.isWindows) bool else void = if (Environment.isWindows) false else undefined,
|
|
path: []const u8 = "",
|
|
syscall: sys.Tag = sys.Tag.TODO,
|
|
dest: []const u8 = "",
|
|
|
|
pub fn clone(this: *const Error, allocator: std.mem.Allocator) Error {
|
|
var copy = this.*;
|
|
copy.path = bun.handleOom(allocator.dupe(u8, copy.path));
|
|
copy.dest = bun.handleOom(allocator.dupe(u8, copy.dest));
|
|
return copy;
|
|
}
|
|
|
|
pub fn fromCode(errno: E, syscall_tag: sys.Tag) Error {
|
|
return .{
|
|
.errno = @as(Int, @intCast(@intFromEnum(errno))),
|
|
.syscall = syscall_tag,
|
|
};
|
|
}
|
|
|
|
pub fn fromCodeInt(errno: anytype, syscall_tag: sys.Tag) Error {
|
|
return .{
|
|
.errno = @as(Int, @intCast(if (Environment.isWindows) @abs(errno) else errno)),
|
|
.syscall = syscall_tag,
|
|
};
|
|
}
|
|
|
|
pub fn format(self: Error, writer: *std.Io.Writer) std.Io.Writer.Error!void {
|
|
// We want to reuse the code from SystemError for formatting.
|
|
// But, we do not want to call String.createUTF8 on the path/dest strings
|
|
// because we're intending to pass them to writer.print()
|
|
// which will convert them back into UTF*.
|
|
var that = self.withoutPath().toShellSystemError();
|
|
bun.debugAssert(that.path.tag != .WTFStringImpl);
|
|
bun.debugAssert(that.dest.tag != .WTFStringImpl);
|
|
that.path = bun.String.borrowUTF8(self.path);
|
|
that.dest = bun.String.borrowUTF8(self.dest);
|
|
bun.debugAssert(that.path.tag != .WTFStringImpl);
|
|
bun.debugAssert(that.dest.tag != .WTFStringImpl);
|
|
|
|
return that.format(writer);
|
|
}
|
|
|
|
pub inline fn getErrno(this: Error) E {
|
|
return @as(E, @enumFromInt(this.errno));
|
|
}
|
|
|
|
pub inline fn isRetry(this: *const Error) bool {
|
|
return this.getErrno() == .AGAIN;
|
|
}
|
|
|
|
pub const retry = Error{
|
|
.errno = retry_errno,
|
|
.syscall = .read,
|
|
};
|
|
|
|
pub inline fn withFd(this: Error, fd: anytype) Error {
|
|
if (Environment.allow_assert) bun.assert(fd != bun.invalid_fd);
|
|
return Error{
|
|
.errno = this.errno,
|
|
.syscall = this.syscall,
|
|
.fd = fd,
|
|
};
|
|
}
|
|
|
|
pub inline fn withPath(this: Error, path: anytype) Error {
|
|
if (std.meta.Child(@TypeOf(path)) == u16) {
|
|
@compileError("Do not pass WString path to withPath, it needs the path encoded as utf8");
|
|
}
|
|
return Error{
|
|
.errno = this.errno,
|
|
.syscall = this.syscall,
|
|
.path = bun.span(path),
|
|
};
|
|
}
|
|
|
|
pub inline fn withPathAndSyscall(this: Error, path: anytype, syscall_: sys.Tag) Error {
|
|
if (std.meta.Child(@TypeOf(path)) == u16) {
|
|
@compileError("Do not pass WString path to withPath, it needs the path encoded as utf8");
|
|
}
|
|
return Error{
|
|
.errno = this.errno,
|
|
.syscall = syscall_,
|
|
.path = bun.span(path),
|
|
};
|
|
}
|
|
|
|
pub fn deinit(this: *Error) void {
|
|
this.deinitWithAllocator(bun.default_allocator);
|
|
}
|
|
|
|
/// Only call this after it's been .clone()'d
|
|
pub fn deinitWithAllocator(this: *Error, allocator: std.mem.Allocator) void {
|
|
if (this.path.len > 0) {
|
|
allocator.free(this.path);
|
|
this.path = "";
|
|
}
|
|
if (this.dest.len > 0) {
|
|
allocator.free(this.dest);
|
|
this.dest = "";
|
|
}
|
|
}
|
|
|
|
pub inline fn withPathDest(this: Error, path: anytype, dest: anytype) Error {
|
|
if (std.meta.Child(@TypeOf(path)) == u16) {
|
|
@compileError("Do not pass WString path to withPathDest, it needs the path encoded as utf8 (path)");
|
|
}
|
|
if (std.meta.Child(@TypeOf(dest)) == u16) {
|
|
@compileError("Do not pass WString path to withPathDest, it needs the path encoded as utf8 (dest)");
|
|
}
|
|
return Error{
|
|
.errno = this.errno,
|
|
.syscall = this.syscall,
|
|
.path = bun.span(path),
|
|
.dest = bun.span(dest),
|
|
};
|
|
}
|
|
|
|
pub inline fn withPathLike(this: Error, pathlike: anytype) Error {
|
|
return switch (pathlike) {
|
|
.fd => |fd| this.withFd(fd),
|
|
.path => |path| this.withPath(path.slice()),
|
|
};
|
|
}
|
|
|
|
/// When the memory of the path/dest buffer is unsafe to use, call this function to clone the error without the path/dest.
|
|
pub fn withoutPath(this: *const Error) Error {
|
|
var copy = this.*;
|
|
copy.path = "";
|
|
copy.dest = "";
|
|
return copy;
|
|
}
|
|
|
|
pub fn name(this: *const Error) []const u8 {
|
|
if (comptime Environment.isWindows) {
|
|
const system_errno = brk: {
|
|
// setRuntimeSafety(false) because we use tagName function, which will be null on invalid enum value.
|
|
@setRuntimeSafety(false);
|
|
if (this.from_libuv) {
|
|
break :brk @as(SystemErrno, @enumFromInt(@intFromEnum(bun.windows.libuv.translateUVErrorToE(this.errno))));
|
|
}
|
|
|
|
break :brk @as(SystemErrno, @enumFromInt(this.errno));
|
|
};
|
|
if (bun.tagName(SystemErrno, system_errno)) |errname| {
|
|
return errname;
|
|
}
|
|
} else if (this.errno > 0 and this.errno < SystemErrno.max) {
|
|
const system_errno = @as(SystemErrno, @enumFromInt(this.errno));
|
|
if (bun.tagName(SystemErrno, system_errno)) |errname| {
|
|
return errname;
|
|
}
|
|
}
|
|
|
|
return "UNKNOWN";
|
|
}
|
|
|
|
pub fn toZigErr(this: Error) anyerror {
|
|
return bun.errnoToZigErr(this.errno);
|
|
}
|
|
|
|
/// 1. Convert libuv errno values into libc ones.
|
|
/// 2. Get the tag name as a string for printing.
|
|
pub fn getErrorCodeTagName(err: *const Error) ?struct { [:0]const u8, SystemErrno } {
|
|
if (!Environment.isWindows) {
|
|
if (err.errno > 0 and err.errno < SystemErrno.max) {
|
|
const system_errno = @as(SystemErrno, @enumFromInt(err.errno));
|
|
return .{ @tagName(system_errno), system_errno };
|
|
}
|
|
} else {
|
|
const system_errno: SystemErrno = brk: {
|
|
// setRuntimeSafety(false) because we use tagName function, which will be null on invalid enum value.
|
|
@setRuntimeSafety(false);
|
|
if (err.from_libuv) {
|
|
break :brk @enumFromInt(@intFromEnum(bun.windows.libuv.translateUVErrorToE(@as(c_int, err.errno) * -1)));
|
|
}
|
|
|
|
break :brk @enumFromInt(err.errno);
|
|
};
|
|
if (bun.tagName(SystemErrno, system_errno)) |errname| {
|
|
return .{ errname, system_errno };
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
|
|
pub fn msg(this: Error) ?[]const u8 {
|
|
if (this.getErrorCodeTagName()) |resolved_errno| {
|
|
const code, const system_errno = resolved_errno;
|
|
if (coreutils_error_map.get(system_errno)) |label| {
|
|
return label;
|
|
}
|
|
return code;
|
|
}
|
|
return null;
|
|
}
|
|
|
|
/// Simpler formatting which does not allocate a message
|
|
pub fn toShellSystemError(this: Error) SystemError {
|
|
@setEvalBranchQuota(1_000_000);
|
|
var err = SystemError{
|
|
.errno = @as(c_int, this.errno) * -1,
|
|
.syscall = bun.String.static(@tagName(this.syscall)),
|
|
.message = .empty,
|
|
};
|
|
|
|
// errno label
|
|
if (this.getErrorCodeTagName()) |resolved_errno| {
|
|
const code, const system_errno = resolved_errno;
|
|
err.code = bun.String.static(code);
|
|
if (coreutils_error_map.get(system_errno)) |label| {
|
|
err.message = bun.String.static(label);
|
|
}
|
|
}
|
|
|
|
if (this.path.len > 0) {
|
|
err.path = bun.String.cloneUTF8(this.path);
|
|
}
|
|
|
|
if (this.dest.len > 0) {
|
|
err.dest = bun.String.cloneUTF8(this.dest);
|
|
}
|
|
|
|
if (this.fd.unwrapValid()) |valid| {
|
|
// When the FD is a windows handle, there is no sane way to report this.
|
|
if (!Environment.isWindows or valid.kind == .uv) {
|
|
err.fd = valid.uv();
|
|
}
|
|
}
|
|
|
|
return err;
|
|
}
|
|
|
|
/// More complex formatting to precisely match the printing that Node.js emits.
|
|
/// Use this whenever the error will be sent to JavaScript instead of the shell variant above.
|
|
pub fn toSystemError(this: Error) SystemError {
|
|
var err = SystemError{
|
|
.errno = -%@as(c_int, this.errno),
|
|
.syscall = bun.String.static(@tagName(this.syscall)),
|
|
.message = .empty,
|
|
};
|
|
|
|
// errno label
|
|
var maybe_code: ?[:0]const u8 = null;
|
|
var label: ?[]const u8 = null;
|
|
if (this.getErrorCodeTagName()) |resolved_errno| {
|
|
maybe_code, const system_errno = resolved_errno;
|
|
err.code = bun.String.static(maybe_code.?);
|
|
label = libuv_error_map.get(system_errno);
|
|
}
|
|
|
|
// format taken from Node.js 'exceptions.cc'
|
|
// search keyword: `Local<Value> UVException(Isolate* isolate,`
|
|
var message_buf: [4096]u8 = @splat(0);
|
|
const message = message: {
|
|
var stream = std.io.fixedBufferStream(&message_buf);
|
|
const writer = stream.writer();
|
|
brk: {
|
|
if (maybe_code) |code| {
|
|
writer.writeAll(code) catch break :brk;
|
|
writer.writeAll(": ") catch break :brk;
|
|
}
|
|
writer.writeAll(label orelse "Unknown Error") catch break :brk;
|
|
writer.writeAll(", ") catch break :brk;
|
|
writer.writeAll(@tagName(this.syscall)) catch break :brk;
|
|
if (this.path.len > 0) {
|
|
writer.writeAll(" '") catch break :brk;
|
|
writer.writeAll(this.path) catch break :brk;
|
|
writer.writeAll("'") catch break :brk;
|
|
|
|
if (this.dest.len > 0) {
|
|
writer.writeAll(" -> '") catch break :brk;
|
|
writer.writeAll(this.dest) catch break :brk;
|
|
writer.writeAll("'") catch break :brk;
|
|
}
|
|
}
|
|
}
|
|
break :message stream.getWritten();
|
|
};
|
|
err.message = bun.String.cloneUTF8(message);
|
|
|
|
if (this.path.len > 0) {
|
|
err.path = bun.String.cloneUTF8(this.path);
|
|
}
|
|
|
|
if (this.dest.len > 0) {
|
|
err.dest = bun.String.cloneUTF8(this.dest);
|
|
}
|
|
|
|
if (this.fd.unwrapValid()) |valid| {
|
|
// When the FD is a windows handle, there is no sane way to report this.
|
|
if (!Environment.isWindows or valid.kind == .uv) {
|
|
err.fd = valid.uv();
|
|
}
|
|
}
|
|
|
|
return err;
|
|
}
|
|
|
|
pub inline fn todo() Error {
|
|
if (Environment.isDebug) {
|
|
@panic("Error.todo() was called");
|
|
}
|
|
return Error{ .errno = todo_errno, .syscall = .TODO };
|
|
}
|
|
|
|
pub fn toJS(this: Error, ptr: *jsc.JSGlobalObject) jsc.JSValue {
|
|
return this.toSystemError().toErrorInstance(ptr);
|
|
}
|
|
|
|
const std = @import("std");
|
|
|
|
const bun = @import("bun");
|
|
const Environment = bun.Environment;
|
|
|
|
const jsc = bun.jsc;
|
|
const SystemError = jsc.SystemError;
|
|
|
|
const sys = bun.sys;
|
|
const E = sys.E;
|
|
const SystemErrno = sys.SystemErrno;
|
|
const coreutils_error_map = sys.coreutils_error_map;
|
|
const libuv_error_map = sys.libuv_error_map;
|