mirror of
https://github.com/oven-sh/bun
synced 2026-02-11 11:29:02 +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>
423 lines
14 KiB
Zig
423 lines
14 KiB
Zig
pub const Loop = uv.Loop;
|
|
|
|
pub const KeepAlive = struct {
|
|
status: Status = .inactive,
|
|
|
|
const log = Output.scoped(.KeepAlive, .visible);
|
|
|
|
const Status = enum { active, inactive, done };
|
|
|
|
pub inline fn isActive(this: KeepAlive) bool {
|
|
return this.status == .active;
|
|
}
|
|
|
|
/// Make calling ref() on this poll into a no-op.
|
|
pub fn disable(this: *KeepAlive) void {
|
|
if (this.status == .active) {
|
|
this.unref(jsc.VirtualMachine.get());
|
|
}
|
|
|
|
this.status = .done;
|
|
}
|
|
|
|
/// Only intended to be used from EventLoop.Pollable
|
|
pub fn deactivate(this: *KeepAlive, loop: *Loop) void {
|
|
if (this.status != .active)
|
|
return;
|
|
|
|
this.status = .inactive;
|
|
loop.dec();
|
|
}
|
|
|
|
/// Only intended to be used from EventLoop.Pollable
|
|
pub fn activate(this: *KeepAlive, loop: *Loop) void {
|
|
if (this.status != .active)
|
|
return;
|
|
|
|
this.status = .active;
|
|
loop.inc();
|
|
}
|
|
|
|
pub fn init() KeepAlive {
|
|
return .{};
|
|
}
|
|
|
|
/// Prevent a poll from keeping the process alive.
|
|
pub fn unref(this: *KeepAlive, event_loop_ctx_: anytype) void {
|
|
if (this.status != .active)
|
|
return;
|
|
this.status = .inactive;
|
|
if (comptime @TypeOf(event_loop_ctx_) == jsc.EventLoopHandle) {
|
|
event_loop_ctx_.loop().subActive(1);
|
|
return;
|
|
}
|
|
const event_loop_ctx = jsc.AbstractVM(event_loop_ctx_);
|
|
event_loop_ctx.platformEventLoop().subActive(1);
|
|
}
|
|
|
|
/// From another thread, Prevent a poll from keeping the process alive.
|
|
pub fn unrefConcurrently(this: *KeepAlive, vm: *jsc.VirtualMachine) void {
|
|
// _ = vm;
|
|
if (this.status != .active)
|
|
return;
|
|
this.status = .inactive;
|
|
vm.event_loop.unrefConcurrently();
|
|
}
|
|
|
|
/// Prevent a poll from keeping the process alive on the next tick.
|
|
pub fn unrefOnNextTick(this: *KeepAlive, vm: *jsc.VirtualMachine) void {
|
|
if (this.status != .active)
|
|
return;
|
|
this.status = .inactive;
|
|
vm.event_loop_handle.?.dec();
|
|
}
|
|
|
|
/// From another thread, prevent a poll from keeping the process alive on the next tick.
|
|
pub fn unrefOnNextTickConcurrently(this: *KeepAlive, vm: *jsc.VirtualMachine) void {
|
|
if (this.status != .active)
|
|
return;
|
|
this.status = .inactive;
|
|
// TODO: https://github.com/oven-sh/bun/pull/4410#discussion_r1317326194
|
|
vm.event_loop_handle.?.dec();
|
|
}
|
|
|
|
/// Allow a poll to keep the process alive.
|
|
pub fn ref(this: *KeepAlive, event_loop_ctx_: anytype) void {
|
|
if (this.status != .inactive)
|
|
return;
|
|
this.status = .active;
|
|
const EventLoopContext = @TypeOf(event_loop_ctx_);
|
|
if (comptime EventLoopContext == jsc.EventLoopHandle) {
|
|
event_loop_ctx_.ref();
|
|
return;
|
|
}
|
|
const event_loop_ctx = jsc.AbstractVM(event_loop_ctx_);
|
|
event_loop_ctx.platformEventLoop().ref();
|
|
}
|
|
|
|
/// Allow a poll to keep the process alive.
|
|
pub fn refConcurrently(this: *KeepAlive, vm: *jsc.VirtualMachine) void {
|
|
if (this.status != .inactive)
|
|
return;
|
|
this.status = .active;
|
|
vm.event_loop.refConcurrently();
|
|
}
|
|
|
|
pub fn refConcurrentlyFromEventLoop(this: *KeepAlive, loop: *jsc.EventLoop) void {
|
|
this.refConcurrently(loop.virtual_machine);
|
|
}
|
|
|
|
pub fn unrefConcurrentlyFromEventLoop(this: *KeepAlive, loop: *jsc.EventLoop) void {
|
|
this.unrefConcurrently(loop.virtual_machine);
|
|
}
|
|
};
|
|
|
|
pub const FilePoll = struct {
|
|
fd: bun.FileDescriptor,
|
|
owner: Owner = undefined,
|
|
flags: Flags.Set = Flags.Set{},
|
|
next_to_free: ?*FilePoll = null,
|
|
|
|
pub const Flags = Posix.FilePoll.Flags;
|
|
pub const Owner = Posix.FilePoll.Owner;
|
|
|
|
const log = Output.scoped(.FilePoll, .visible);
|
|
|
|
pub inline fn isActive(this: *const FilePoll) bool {
|
|
return this.flags.contains(.has_incremented_poll_count);
|
|
}
|
|
|
|
pub inline fn isWatching(this: *const FilePoll) bool {
|
|
return !this.flags.contains(.needs_rearm) and (this.flags.contains(.poll_readable) or this.flags.contains(.poll_writable) or this.flags.contains(.poll_process));
|
|
}
|
|
|
|
pub inline fn isKeepingProcessAlive(this: *const FilePoll) bool {
|
|
return !this.flags.contains(.closed) and this.isActive();
|
|
}
|
|
|
|
pub fn isRegistered(this: *const FilePoll) bool {
|
|
return this.flags.contains(.poll_writable) or this.flags.contains(.poll_readable) or this.flags.contains(.poll_process) or this.flags.contains(.poll_machport);
|
|
}
|
|
|
|
/// Make calling ref() on this poll into a no-op.
|
|
// pub fn disableKeepingProcessAlive(this: *FilePoll, vm: *jsc.VirtualMachine) void {
|
|
pub fn disableKeepingProcessAlive(this: *FilePoll, abstract_vm: anytype) void {
|
|
const vm = jsc.AbstractVM(abstract_vm);
|
|
if (this.flags.contains(.closed))
|
|
return;
|
|
this.flags.insert(.closed);
|
|
|
|
vm.platformEventLoop().subActive(@as(u32, @intFromBool(this.flags.contains(.has_incremented_poll_count))));
|
|
// vm.event_loop_handle.?.active_handles -= @as(u32, @intFromBool(this.flags.contains(.has_incremented_poll_count)));
|
|
}
|
|
|
|
pub fn init(vm: *jsc.VirtualMachine, fd: bun.FileDescriptor, flags: Flags.Struct, comptime Type: type, owner: *Type) *FilePoll {
|
|
return initWithOwner(vm, fd, flags, Owner.init(owner));
|
|
}
|
|
|
|
pub fn initWithOwner(vm: *jsc.VirtualMachine, fd: bun.FileDescriptor, flags: Flags.Struct, owner: Owner) *FilePoll {
|
|
var poll = vm.rareData().filePolls(vm).get();
|
|
poll.fd = fd;
|
|
poll.flags = Flags.Set.init(flags);
|
|
poll.owner = owner;
|
|
poll.next_to_free = null;
|
|
|
|
return poll;
|
|
}
|
|
|
|
pub fn deinit(this: *FilePoll) void {
|
|
const vm = jsc.VirtualMachine.get();
|
|
this.deinitWithVM(vm);
|
|
}
|
|
|
|
pub inline fn fileDescriptor(this: *FilePoll) bun.FileDescriptor {
|
|
return this.fd;
|
|
}
|
|
|
|
pub const deinitForceUnregister = deinit;
|
|
|
|
pub fn unregister(this: *FilePoll, loop: *Loop) bool {
|
|
_ = loop;
|
|
// TODO(@paperclover): This cast is extremely suspicious. At best, `fd` is
|
|
// the wrong type (it should be a uv handle), at worst this code is a
|
|
// crash due to invalid memory access.
|
|
uv.uv_unref(@ptrFromInt(@as(u64, @bitCast(this.fd))));
|
|
return true;
|
|
}
|
|
|
|
fn deinitPossiblyDefer(this: *FilePoll, vm: *jsc.VirtualMachine, loop: *Loop, polls: *FilePoll.Store) void {
|
|
if (this.isRegistered()) {
|
|
_ = this.unregister(loop);
|
|
}
|
|
|
|
const was_ever_registered = this.flags.contains(.was_ever_registered);
|
|
this.flags = Flags.Set{};
|
|
this.fd = bun.invalid_fd;
|
|
polls.put(this, vm, was_ever_registered);
|
|
}
|
|
|
|
pub fn isReadable(this: *FilePoll) bool {
|
|
const readable = this.flags.contains(.readable);
|
|
this.flags.remove(.readable);
|
|
return readable;
|
|
}
|
|
|
|
pub fn isHUP(this: *FilePoll) bool {
|
|
const readable = this.flags.contains(.hup);
|
|
this.flags.remove(.hup);
|
|
return readable;
|
|
}
|
|
|
|
pub fn isEOF(this: *FilePoll) bool {
|
|
const readable = this.flags.contains(.eof);
|
|
this.flags.remove(.eof);
|
|
return readable;
|
|
}
|
|
|
|
pub fn clearEvent(poll: *FilePoll, flag: Flags) void {
|
|
poll.flags.remove(flag);
|
|
}
|
|
|
|
pub fn isWritable(this: *FilePoll) bool {
|
|
const readable = this.flags.contains(.writable);
|
|
this.flags.remove(.writable);
|
|
return readable;
|
|
}
|
|
|
|
pub fn deinitWithVM(this: *FilePoll, vm: *jsc.VirtualMachine) void {
|
|
const loop = vm.event_loop_handle.?;
|
|
this.deinitPossiblyDefer(vm, loop, vm.rareData().filePolls(vm));
|
|
}
|
|
|
|
pub fn enableKeepingProcessAlive(this: *FilePoll, abstract_vm: anytype) void {
|
|
const vm = jsc.AbstractVM(abstract_vm);
|
|
if (!this.flags.contains(.closed))
|
|
return;
|
|
this.flags.remove(.closed);
|
|
|
|
// vm.event_loop_handle.?.active_handles += @as(u32, @intFromBool(this.flags.contains(.has_incremented_poll_count)));
|
|
vm.platformEventLoop().addActive(@as(u32, @intFromBool(this.flags.contains(.has_incremented_poll_count))));
|
|
}
|
|
|
|
pub fn canActivate(this: *const FilePoll) bool {
|
|
return !this.flags.contains(.has_incremented_poll_count);
|
|
}
|
|
|
|
/// Only intended to be used from EventLoop.Pollable
|
|
pub fn deactivate(this: *FilePoll, loop: *Loop) void {
|
|
bun.assert(this.flags.contains(.has_incremented_poll_count));
|
|
loop.active_handles -= @as(u32, @intFromBool(this.flags.contains(.has_incremented_poll_count)));
|
|
log("deactivate - {d}", .{loop.active_handles});
|
|
this.flags.remove(.has_incremented_poll_count);
|
|
}
|
|
|
|
/// Only intended to be used from EventLoop.Pollable
|
|
pub fn activate(this: *FilePoll, loop: *Loop) void {
|
|
loop.active_handles += @as(u32, @intFromBool(!this.flags.contains(.closed) and !this.flags.contains(.has_incremented_poll_count)));
|
|
log("activate - {d}", .{loop.active_handles});
|
|
this.flags.insert(.has_incremented_poll_count);
|
|
}
|
|
|
|
pub inline fn canRef(this: *const FilePoll) bool {
|
|
if (this.flags.contains(.closed))
|
|
return false;
|
|
|
|
return !this.flags.contains(.has_incremented_poll_count);
|
|
}
|
|
|
|
pub inline fn canUnref(this: *const FilePoll) bool {
|
|
return this.flags.contains(.has_incremented_poll_count);
|
|
}
|
|
|
|
pub fn onEnded(this: *FilePoll, event_loop_ctx_: anytype) void {
|
|
const event_loop_ctx = jsc.AbstractVM(event_loop_ctx_);
|
|
this.flags.remove(.keeps_event_loop_alive);
|
|
this.flags.insert(.closed);
|
|
// this.deactivate(vm.event_loop_handle.?);
|
|
this.deactivate(event_loop_ctx.platformEventLoop());
|
|
}
|
|
|
|
/// Prevent a poll from keeping the process alive.
|
|
pub fn unref(this: *FilePoll, abstract_vm: anytype) void {
|
|
const vm = jsc.AbstractVM(abstract_vm);
|
|
if (!this.canUnref())
|
|
return;
|
|
log("unref", .{});
|
|
// this.deactivate(vm.event_loop_handle.?);
|
|
this.deactivate(vm.platformEventLoop());
|
|
}
|
|
|
|
/// Allow a poll to keep the process alive.
|
|
// pub fn ref(this: *FilePoll, vm: *jsc.VirtualMachine) void {
|
|
pub fn ref(this: *FilePoll, event_loop_ctx_: anytype) void {
|
|
if (this.canRef())
|
|
return;
|
|
log("ref", .{});
|
|
// this.activate(vm.event_loop_handle.?);
|
|
const event_loop_ctx = jsc.AbstractVM(event_loop_ctx_);
|
|
this.activate(event_loop_ctx.platformEventLoop());
|
|
}
|
|
|
|
const HiveArray = bun.HiveArray(FilePoll, 128).Fallback;
|
|
|
|
pub const Store = struct {
|
|
hive: HiveArray,
|
|
pending_free_head: ?*FilePoll = null,
|
|
pending_free_tail: ?*FilePoll = null,
|
|
|
|
const log = Output.scoped(.FilePoll, .visible);
|
|
|
|
pub fn init() Store {
|
|
return .{
|
|
.hive = HiveArray.init(bun.typedAllocator(FilePoll)),
|
|
};
|
|
}
|
|
|
|
pub fn get(this: *Store) *FilePoll {
|
|
return this.hive.get();
|
|
}
|
|
|
|
pub fn processDeferredFrees(this: *Store) void {
|
|
var next = this.pending_free_head;
|
|
while (next) |current| {
|
|
next = current.next_to_free;
|
|
current.next_to_free = null;
|
|
this.hive.put(current);
|
|
}
|
|
this.pending_free_head = null;
|
|
this.pending_free_tail = null;
|
|
}
|
|
|
|
pub fn put(this: *Store, poll: *FilePoll, vm: *jsc.VirtualMachine, ever_registered: bool) void {
|
|
if (!ever_registered) {
|
|
this.hive.put(poll);
|
|
return;
|
|
}
|
|
|
|
bun.assert(poll.next_to_free == null);
|
|
|
|
if (this.pending_free_tail) |tail| {
|
|
bun.assert(this.pending_free_head != null);
|
|
bun.assert(tail.next_to_free == null);
|
|
tail.next_to_free = poll;
|
|
}
|
|
|
|
if (this.pending_free_head == null) {
|
|
this.pending_free_head = poll;
|
|
bun.assert(this.pending_free_tail == null);
|
|
}
|
|
|
|
poll.flags.insert(.ignore_updates);
|
|
this.pending_free_tail = poll;
|
|
|
|
const callback = jsc.OpaqueWrap(Store, processDeferredFrees);
|
|
bun.assert(vm.after_event_loop_callback == null or vm.after_event_loop_callback == @as(?jsc.OpaqueCallback, callback));
|
|
vm.after_event_loop_callback = callback;
|
|
vm.after_event_loop_callback_ctx = this;
|
|
}
|
|
};
|
|
};
|
|
|
|
pub const Waker = struct {
|
|
loop: *bun.uws.WindowsLoop,
|
|
|
|
pub fn init() !Waker {
|
|
return .{ .loop = bun.uws.WindowsLoop.get() };
|
|
}
|
|
|
|
pub fn getFd(_: *const Waker) bun.FileDescriptor {
|
|
@compileError("Waker.getFd is unsupported on Windows");
|
|
}
|
|
|
|
pub fn initWithFileDescriptor(_: bun.FileDescriptor) Waker {
|
|
@compileError("Waker.initWithFileDescriptor is unsupported on Windows");
|
|
}
|
|
|
|
pub fn wait(this: Waker) void {
|
|
this.loop.wait();
|
|
}
|
|
|
|
pub fn wake(this: *const Waker) void {
|
|
this.loop.wakeup();
|
|
}
|
|
};
|
|
|
|
pub const Closer = struct {
|
|
io_request: uv.fs_t,
|
|
|
|
pub fn close(fd: bun.FileDescriptor, loop: *uv.Loop) void {
|
|
const closer = bun.new(Closer, .{ .io_request = std.mem.zeroes(uv.fs_t) });
|
|
// data is not overridden by libuv when calling uv_fs_close, its ok to set it here
|
|
closer.io_request.data = closer;
|
|
if (uv.uv_fs_close(loop, &closer.io_request, fd.uv(), onClose).errEnum()) |err| {
|
|
Output.debugWarn("libuv close() failed = {}", .{err});
|
|
bun.destroy(closer);
|
|
}
|
|
}
|
|
|
|
fn onClose(req: *uv.fs_t) callconv(.c) void {
|
|
var closer: *Closer = @fieldParentPtr("io_request", req);
|
|
bun.assert(closer == @as(*Closer, @ptrCast(@alignCast(req.data.?))));
|
|
bun.sys.syslog("uv_fs_close({f}) = {f}", .{ bun.FD.fromUV(req.file.fd), req.result });
|
|
|
|
if (comptime Environment.allow_assert) {
|
|
if (closer.io_request.result.errEnum()) |err| {
|
|
Output.debugWarn("libuv close() failed = {}", .{err});
|
|
}
|
|
}
|
|
|
|
req.deinit();
|
|
bun.destroy(closer);
|
|
}
|
|
};
|
|
|
|
const Posix = @import("./posix_event_loop.zig");
|
|
const std = @import("std");
|
|
|
|
const bun = @import("bun");
|
|
const Environment = bun.Environment;
|
|
const Output = bun.Output;
|
|
const jsc = bun.jsc;
|
|
const uws = bun.uws;
|
|
const uv = bun.windows.libuv;
|