mirror of
https://github.com/oven-sh/bun
synced 2026-02-11 19:38:58 +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>
216 lines
8.1 KiB
Zig
216 lines
8.1 KiB
Zig
//! All code working with atomics to communicate watcher <-> DevServer is here.
|
|
//! It attempts to recycle as much memory as possible, since files are very
|
|
//! frequently updated (the whole point of HMR)
|
|
|
|
const Self = @This();
|
|
|
|
/// Only one event can run at any given time. We need three events because:
|
|
///
|
|
/// * One event may be actively running on the dev server thread.
|
|
/// * One event may be "pending", i.e., it was added by the watcher thread but not immediately
|
|
/// started because an event was already running.
|
|
/// * One event must be available for the watcher thread to initialize and submit. If an event
|
|
/// is already pending, this new event will replace the pending one, and the pending one will
|
|
/// become available.
|
|
events: [3]HotReloadEvent,
|
|
|
|
/// The next event to be run. If an event is already running, new events are stored in this
|
|
/// field instead of scheduled directly, and will be run once the current event finishes.
|
|
next_event: std.atomic.Value(NextEvent) align(std.atomic.cache_line) = .init(.done),
|
|
|
|
// Only the watcher thread uses these two fields. They are both indices into the `events` array,
|
|
// and indicate which elements are in-use and not available for modification. Only two such events
|
|
// can ever be in use at once, so we can always find a free event in the array of length 3.
|
|
current_event: ?u2 = null,
|
|
pending_event: ?u2 = null,
|
|
|
|
// Debug fields to ensure methods are being called in the right order.
|
|
dbg_watcher_event: DbgEventPtr = if (Environment.allow_assert) null,
|
|
dbg_server_event: DbgEventPtr = if (Environment.allow_assert) null,
|
|
|
|
const NextEvent = enum(u8) {
|
|
/// An event is running, and no next event is pending.
|
|
waiting = std.math.maxInt(u8) - 1,
|
|
/// No event is running.
|
|
done = std.math.maxInt(u8),
|
|
/// Any other value represents an index into the `events` array.
|
|
_,
|
|
};
|
|
|
|
const DbgEventPtr = if (Environment.allow_assert) ?*HotReloadEvent else void;
|
|
|
|
pub fn init(dev: *DevServer) Self {
|
|
var self = Self{ .events = undefined };
|
|
for (&self.events) |*event| {
|
|
event.* = .initEmpty(dev);
|
|
}
|
|
return self;
|
|
}
|
|
|
|
/// Atomically get a *HotReloadEvent that is not used by the DevServer thread
|
|
/// Call `watcherRelease` when it is filled with files.
|
|
///
|
|
/// Called from watcher thread.
|
|
pub fn watcherAcquireEvent(self: *Self) *HotReloadEvent {
|
|
var available = [_]bool{true} ** 3;
|
|
if (self.current_event) |i| available[i] = false;
|
|
if (self.pending_event) |i| available[i] = false;
|
|
|
|
const index = for (available, 0..) |is_available, i| {
|
|
if (is_available) break i;
|
|
} else unreachable;
|
|
const ev = &self.events[index];
|
|
|
|
if (comptime Environment.allow_assert) {
|
|
bun.assertf(
|
|
self.dbg_watcher_event == null,
|
|
"must call `watcherReleaseEvent` before calling `watcherAcquireEvent` again",
|
|
.{},
|
|
);
|
|
self.dbg_watcher_event = ev;
|
|
}
|
|
|
|
// Initialize the timer if it is empty.
|
|
if (ev.isEmpty())
|
|
ev.timer = std.time.Timer.start() catch unreachable;
|
|
|
|
ev.owner.bun_watcher.thread_lock.assertLocked();
|
|
|
|
if (comptime Environment.isDebug)
|
|
assert(ev.debug_mutex.tryLock());
|
|
return ev;
|
|
}
|
|
|
|
/// Release the pointer from `watcherAcquireHotReloadEvent`, submitting
|
|
/// the event if it contains new files.
|
|
///
|
|
/// Called from watcher thread.
|
|
pub fn watcherReleaseAndSubmitEvent(self: *Self, ev: *HotReloadEvent) void {
|
|
ev.owner.bun_watcher.thread_lock.assertLocked();
|
|
|
|
if (comptime Environment.allow_assert) {
|
|
const dbg_event = self.dbg_watcher_event orelse std.debug.panic(
|
|
"must call `watcherAcquireEvent` before `watcherReleaseAndSubmitEvent`",
|
|
.{},
|
|
);
|
|
bun.assertf(
|
|
dbg_event == ev,
|
|
"watcherReleaseAndSubmitEvent: event is not from last `watcherAcquireEvent` call" ++
|
|
" (expected {*}, got {*})",
|
|
.{ dbg_event, ev },
|
|
);
|
|
self.dbg_watcher_event = null;
|
|
}
|
|
|
|
if (comptime Environment.isDebug) {
|
|
for (std.mem.asBytes(&ev.timer)) |b| {
|
|
if (b != 0xAA) break;
|
|
} else @panic("timer is undefined memory in watcherReleaseAndSubmitEvent");
|
|
ev.debug_mutex.unlock();
|
|
}
|
|
|
|
if (ev.isEmpty()) return;
|
|
// There are files to be processed.
|
|
|
|
const ev_index: u2 = @intCast(ev - &self.events[0]);
|
|
const old_next = self.next_event.swap(@enumFromInt(ev_index), .acq_rel);
|
|
switch (old_next) {
|
|
.done => {
|
|
// Dev server is done running events. We need to schedule the event directly.
|
|
self.current_event = ev_index;
|
|
self.pending_event = null;
|
|
// .monotonic because the dev server is not running events right now.
|
|
// (could technically be made non-atomic)
|
|
self.next_event.store(.waiting, .monotonic);
|
|
if (comptime Environment.allow_assert) {
|
|
bun.assertf(
|
|
self.dbg_server_event == null,
|
|
"no event should be running right now",
|
|
.{},
|
|
);
|
|
// Not atomic because the dev server is not running events right now.
|
|
self.dbg_server_event = ev;
|
|
}
|
|
ev.concurrent_task = .{
|
|
.auto_delete = false,
|
|
.next = null,
|
|
.task = jsc.Task.init(ev),
|
|
};
|
|
ev.owner.vm.event_loop.enqueueTaskConcurrent(&ev.concurrent_task);
|
|
},
|
|
|
|
.waiting => {
|
|
if (self.pending_event != null) {
|
|
// `pending_event` is running, which means we're done with `current_event`.
|
|
self.current_event = self.pending_event;
|
|
} // else, no pending event yet, but not done with `current_event`.
|
|
self.pending_event = ev_index;
|
|
},
|
|
|
|
else => {
|
|
// This is an index into the `events` array.
|
|
const old_index: u2 = @intCast(@intFromEnum(old_next));
|
|
bun.assertf(
|
|
self.pending_event == old_index,
|
|
"watcherReleaseAndSubmitEvent: expected `pending_event` to be {d}; got {?d}",
|
|
.{ old_index, self.pending_event },
|
|
);
|
|
// The old pending event hadn't been run yet, so we can replace it with `ev`.
|
|
self.pending_event = ev_index;
|
|
},
|
|
}
|
|
}
|
|
|
|
/// Called by DevServer after it receives a task callback. If this returns another event,
|
|
/// that event should be passed again to this function, and so on, until this function
|
|
/// returns null.
|
|
///
|
|
/// Runs on dev server thread.
|
|
pub fn recycleEventFromDevServer(self: *Self, old_event: *HotReloadEvent) ?*HotReloadEvent {
|
|
old_event.reset();
|
|
|
|
if (comptime Environment.allow_assert) {
|
|
// Not atomic because watcher won't modify this value while an event is running.
|
|
const dbg_event = self.dbg_server_event;
|
|
self.dbg_server_event = null;
|
|
bun.assertf(
|
|
dbg_event == old_event,
|
|
"recycleEventFromDevServer: old_event: expected {*}, got {*}",
|
|
.{ dbg_event, old_event },
|
|
);
|
|
}
|
|
|
|
const event = while (true) {
|
|
const next = self.next_event.swap(.waiting, .acq_rel);
|
|
switch (next) {
|
|
.waiting => {
|
|
// Success order is not .acq_rel because the swap above performed an .acquire load.
|
|
// Failure order is .monotonic because we're going to perform an .acquire load
|
|
// in the next loop iteration.
|
|
if (self.next_event.cmpxchgWeak(.waiting, .done, .release, .monotonic) != null)
|
|
continue; // another event may have been added
|
|
return null; // done running events
|
|
},
|
|
.done => unreachable,
|
|
else => break &self.events[@intFromEnum(next)],
|
|
}
|
|
};
|
|
|
|
if (comptime Environment.allow_assert) {
|
|
// Not atomic because watcher won't modify this value while an event is running.
|
|
self.dbg_server_event = event;
|
|
}
|
|
return event;
|
|
}
|
|
|
|
const std = @import("std");
|
|
|
|
const bun = @import("bun");
|
|
const Environment = bun.Environment;
|
|
const assert = bun.assert;
|
|
const bake = bun.bake;
|
|
const jsc = bun.jsc;
|
|
|
|
const DevServer = bake.DevServer;
|
|
const HotReloadEvent = DevServer.HotReloadEvent;
|