mirror of
https://github.com/oven-sh/bun
synced 2026-02-17 22:32:06 +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>
311 lines
10 KiB
Zig
311 lines
10 KiB
Zig
var default_manager: ?*PathWatcherManager = null;
|
|
|
|
// TODO: make this a generic so we can reuse code with path_watcher
|
|
// TODO: we probably should use native instead of libuv abstraction here for better performance
|
|
pub const PathWatcherManager = struct {
|
|
const options = @import("../../options.zig");
|
|
const log = Output.scoped(.PathWatcherManager, .visible);
|
|
|
|
watchers: bun.StringArrayHashMapUnmanaged(*PathWatcher) = .{},
|
|
vm: *jsc.VirtualMachine,
|
|
deinit_on_last_watcher: bool = false,
|
|
|
|
pub const new = bun.TrivialNew(PathWatcherManager);
|
|
|
|
pub fn init(vm: *jsc.VirtualMachine) *PathWatcherManager {
|
|
return PathWatcherManager.new(.{
|
|
.watchers = .{},
|
|
.vm = vm,
|
|
});
|
|
}
|
|
|
|
// unregister is always called form main thread
|
|
fn unregisterWatcher(this: *PathWatcherManager, watcher: *PathWatcher, path: [:0]const u8) void {
|
|
defer {
|
|
if (this.deinit_on_last_watcher and this.watchers.count() == 0) {
|
|
this.deinit();
|
|
}
|
|
}
|
|
|
|
if (std.mem.indexOfScalar(*PathWatcher, this.watchers.values(), watcher)) |index| {
|
|
if (comptime bun.Environment.isDebug) {
|
|
if (path.len > 0)
|
|
bun.assert(bun.strings.eql(this.watchers.keys()[index], path));
|
|
}
|
|
|
|
bun.default_allocator.free(this.watchers.keys()[index]);
|
|
_ = this.watchers.swapRemoveAt(index);
|
|
}
|
|
}
|
|
|
|
fn deinit(this: *PathWatcherManager) void {
|
|
// enable to create a new manager
|
|
if (default_manager == this) {
|
|
default_manager = null;
|
|
}
|
|
|
|
if (this.watchers.count() != 0) {
|
|
this.deinit_on_last_watcher = true;
|
|
return;
|
|
}
|
|
|
|
for (this.watchers.values()) |watcher| {
|
|
watcher.manager = null;
|
|
watcher.deinit();
|
|
}
|
|
|
|
for (this.watchers.keys()) |path| {
|
|
bun.default_allocator.free(path);
|
|
}
|
|
|
|
this.watchers.deinit(bun.default_allocator);
|
|
bun.destroy(this);
|
|
}
|
|
};
|
|
|
|
pub const PathWatcher = struct {
|
|
handle: uv.uv_fs_event_t,
|
|
manager: ?*PathWatcherManager,
|
|
emit_in_progress: bool = false,
|
|
handlers: std.AutoArrayHashMapUnmanaged(*anyopaque, ChangeEvent) = .{},
|
|
|
|
pub const new = bun.TrivialNew(PathWatcher);
|
|
|
|
const log = Output.scoped(.@"fs.watch", .visible);
|
|
|
|
pub const ChangeEvent = struct {
|
|
hash: Watcher.HashType = 0,
|
|
event_type: EventType = .change,
|
|
timestamp: u64 = 0,
|
|
|
|
pub fn emit(this: *ChangeEvent, hash: Watcher.HashType, timestamp: u64, event_type: EventType) bool {
|
|
const time_diff = timestamp -| this.timestamp;
|
|
// skip consecutive duplicates
|
|
if ((this.timestamp == 0 or time_diff > 1) or this.event_type != event_type and this.hash != hash) {
|
|
this.timestamp = timestamp;
|
|
this.event_type = event_type;
|
|
this.hash = hash;
|
|
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
};
|
|
|
|
const Callback = *const fn (ctx: ?*anyopaque, event: Event, is_file: bool) void;
|
|
const UpdateEndCallback = *const fn (ctx: ?*anyopaque) void;
|
|
|
|
fn uvEventCallback(event: *uv.uv_fs_event_t, filename: ?[*:0]const u8, events: c_int, status: uv.ReturnCode) callconv(.c) void {
|
|
if (event.data == null) {
|
|
Output.debugWarn("uvEventCallback called with null data", .{});
|
|
return;
|
|
}
|
|
const this: *PathWatcher = @alignCast(@fieldParentPtr("handle", event));
|
|
if (comptime bun.Environment.isDebug) {
|
|
bun.assert(event.data == @as(?*anyopaque, @ptrCast(this)));
|
|
}
|
|
|
|
const timestamp = event.loop.time;
|
|
|
|
if (status.toError(.watch)) |err| {
|
|
this.emit_in_progress = true;
|
|
defer this.emit_in_progress = false;
|
|
|
|
const ctxs = this.handlers.keys();
|
|
for (ctxs) |ctx| {
|
|
onPathUpdateFn(ctx, .{ .@"error" = err }, false);
|
|
onUpdateEndFn(ctx);
|
|
}
|
|
this.maybeDeinit();
|
|
|
|
return;
|
|
}
|
|
|
|
const path = if (filename) |file| file[0..bun.len(file) :0] else return;
|
|
|
|
this.emit(
|
|
path,
|
|
@truncate(event.hash(path, events, status)),
|
|
timestamp,
|
|
!event.isDir(),
|
|
if (events & uv.UV_RENAME != 0) .rename else .change,
|
|
);
|
|
}
|
|
|
|
pub fn emit(this: *PathWatcher, path: string, hash: Watcher.HashType, timestamp: u64, is_file: bool, event_type: EventType) void {
|
|
this.emit_in_progress = true;
|
|
var debug_count: if (bun.Environment.isDebug) usize else u0 = 0;
|
|
for (this.handlers.values(), 0..) |*event, i| {
|
|
if (event.emit(hash, timestamp, event_type)) {
|
|
const ctx: *FSWatcher = @ptrCast(@alignCast(this.handlers.keys()[i]));
|
|
onPathUpdateFn(ctx, event_type.toEvent(switch (ctx.encoding) {
|
|
.utf8 => .{ .string = bun.String.cloneUTF8(path) },
|
|
else => .{ .bytes_to_free = bun.handleOom(bun.default_allocator.dupeZ(u8, path)) },
|
|
}), is_file);
|
|
if (comptime bun.Environment.isDebug)
|
|
debug_count += 1;
|
|
onUpdateEndFn(ctx);
|
|
}
|
|
}
|
|
if (comptime bun.Environment.isDebug)
|
|
log("emit({s}, {s}, {s}, at {d}) x {d}", .{
|
|
path,
|
|
if (is_file) "file" else "dir",
|
|
@tagName(event_type),
|
|
timestamp,
|
|
debug_count,
|
|
});
|
|
|
|
this.emit_in_progress = false;
|
|
this.maybeDeinit();
|
|
}
|
|
|
|
pub fn init(manager: *PathWatcherManager, path: [:0]const u8, recursive: bool) bun.sys.Maybe(*PathWatcher) {
|
|
var outbuf: bun.PathBuffer = undefined;
|
|
const event_path = switch (bun.sys.readlink(path, &outbuf)) {
|
|
.err => |err| brk: {
|
|
if (err.errno == @intFromEnum(bun.sys.E.NOENT)) {
|
|
return .{ .err = .{
|
|
.errno = err.errno,
|
|
.syscall = .open,
|
|
} };
|
|
}
|
|
|
|
break :brk path;
|
|
},
|
|
.result => |event_path| event_path,
|
|
};
|
|
|
|
const watchers_entry = bun.handleOom(manager.watchers.getOrPut(bun.default_allocator, @as([]const u8, event_path)));
|
|
if (watchers_entry.found_existing) {
|
|
return .{ .result = watchers_entry.value_ptr.* };
|
|
}
|
|
|
|
var this = PathWatcher.new(.{
|
|
.handle = std.mem.zeroes(uv.uv_fs_event_t),
|
|
.manager = manager,
|
|
});
|
|
|
|
errdefer {
|
|
_ = manager.watchers.swapRemove(event_path);
|
|
this.manager = null;
|
|
this.deinit();
|
|
}
|
|
|
|
if (uv.uv_fs_event_init(manager.vm.uvLoop(), &this.handle).toError(.watch)) |err| {
|
|
return .{ .err = err };
|
|
}
|
|
this.handle.data = this;
|
|
|
|
// UV_FS_EVENT_RECURSIVE only works for Windows and OSX
|
|
if (uv.uv_fs_event_start(
|
|
&this.handle,
|
|
PathWatcher.uvEventCallback,
|
|
event_path.ptr,
|
|
if (recursive) uv.UV_FS_EVENT_RECURSIVE else 0,
|
|
).toError(.watch)) |err| {
|
|
return .{ .err = err };
|
|
}
|
|
// we handle this in node_fs_watcher
|
|
uv.uv_unref(@ptrCast(&this.handle));
|
|
|
|
watchers_entry.value_ptr.* = this;
|
|
watchers_entry.key_ptr.* = bun.handleOom(bun.default_allocator.dupeZ(u8, event_path));
|
|
|
|
return .{ .result = this };
|
|
}
|
|
|
|
fn uvClosedCallback(handler: *anyopaque) callconv(.c) void {
|
|
log("onClose", .{});
|
|
const event = bun.cast(*uv.uv_fs_event_t, handler);
|
|
const this = bun.cast(*PathWatcher, event.data);
|
|
bun.destroy(this);
|
|
}
|
|
|
|
pub fn detach(this: *PathWatcher, handler: *anyopaque) void {
|
|
if (this.handlers.swapRemove(handler)) {
|
|
this.maybeDeinit();
|
|
}
|
|
}
|
|
|
|
fn maybeDeinit(this: *PathWatcher) void {
|
|
if (this.handlers.count() == 0 and !this.emit_in_progress) {
|
|
this.deinit();
|
|
}
|
|
}
|
|
|
|
fn deinit(this: *PathWatcher) void {
|
|
log("deinit", .{});
|
|
this.handlers.clearAndFree(bun.default_allocator);
|
|
|
|
if (this.manager) |manager| {
|
|
this.manager = null;
|
|
if (this.handle.path) |path| {
|
|
manager.unregisterWatcher(this, bun.sliceTo(path, 0));
|
|
} else {
|
|
manager.unregisterWatcher(this, "");
|
|
}
|
|
}
|
|
if (uv.uv_is_closed(@ptrCast(&this.handle))) {
|
|
bun.destroy(this);
|
|
} else {
|
|
_ = uv.uv_fs_event_stop(&this.handle);
|
|
_ = uv.uv_close(@ptrCast(&this.handle), PathWatcher.uvClosedCallback);
|
|
}
|
|
}
|
|
};
|
|
|
|
pub fn watch(
|
|
vm: *VirtualMachine,
|
|
path: [:0]const u8,
|
|
recursive: bool,
|
|
comptime callback: PathWatcher.Callback,
|
|
comptime updateEnd: PathWatcher.UpdateEndCallback,
|
|
ctx: *anyopaque,
|
|
) bun.sys.Maybe(*PathWatcher) {
|
|
comptime {
|
|
if (callback != onPathUpdateFn) {
|
|
@compileError("callback must be onPathUpdateFn");
|
|
}
|
|
|
|
if (updateEnd != onUpdateEndFn) {
|
|
@compileError("updateEnd must be onUpdateEndFn");
|
|
}
|
|
}
|
|
|
|
if (!bun.Environment.isWindows) {
|
|
@compileError("win_watcher should only be used on Windows");
|
|
}
|
|
|
|
const manager = default_manager orelse brk: {
|
|
default_manager = PathWatcherManager.init(vm);
|
|
break :brk default_manager.?;
|
|
};
|
|
var watcher = switch (PathWatcher.init(manager, path, recursive)) {
|
|
.err => |err| return .{ .err = err },
|
|
.result => |watcher| watcher,
|
|
};
|
|
bun.handleOom(watcher.handlers.put(bun.default_allocator, ctx, .{}));
|
|
return .{ .result = watcher };
|
|
}
|
|
|
|
const string = []const u8;
|
|
|
|
const std = @import("std");
|
|
const EventType = @import("./path_watcher.zig").PathWatcher.EventType;
|
|
|
|
const bun = @import("bun");
|
|
const Output = bun.Output;
|
|
const Watcher = bun.Watcher;
|
|
|
|
const jsc = bun.jsc;
|
|
const VirtualMachine = jsc.VirtualMachine;
|
|
|
|
const FSWatcher = bun.jsc.Node.fs.Watcher;
|
|
const Event = FSWatcher.Event;
|
|
const onPathUpdateFn = jsc.Node.fs.Watcher.onPathUpdate;
|
|
const onUpdateEndFn = jsc.Node.fs.Watcher.onUpdateEnd;
|
|
|
|
const windows = bun.windows;
|
|
const uv = windows.libuv;
|