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>
173 lines
7.2 KiB
Zig
173 lines
7.2 KiB
Zig
/// There are constraints on Bun's shell interpreter which are unique to shells in
|
|
/// general:
|
|
/// 1. We try to keep everything in the Bun process as much as possible for
|
|
/// performance reasons and also to leverage Bun's existing IO/FS code
|
|
/// 2. We try to use non-blocking IO as much as possible so the shell
|
|
/// does not block the main JS thread
|
|
/// 3. Zig does not have coroutines (yet)
|
|
///
|
|
/// These cause two problems:
|
|
/// 1. Unbounded recursion, if we keep calling .next() on state machine structs
|
|
/// then the call stack could get really deep, we need some mechanism to allow
|
|
/// execution to continue without blowing up the call stack
|
|
///
|
|
/// 2. Correctly handling suspension points. These occur when IO would block so
|
|
/// we must, for example, wait for epoll/kqueue. The easiest solution is to have
|
|
/// functions return some value indicating that they suspended execution of the
|
|
/// interpreter.
|
|
///
|
|
/// This `Yield` struct solves these problems. It represents a "continuation" of
|
|
/// the shell interpreter. Shell interpreter functions must return this value.
|
|
/// At the top-level of execution, `Yield.run(...)` serves as a "trampoline" to
|
|
/// drive execution without blowing up the callstack.
|
|
///
|
|
/// Note that the "top-level of execution" could be in `Interpreter.run` or when
|
|
/// shell execution resumes after suspension in a task callback (for example in
|
|
/// IOWriter.onWritePoll).
|
|
pub const Yield = union(enum) {
|
|
script: *Script,
|
|
stmt: *Stmt,
|
|
pipeline: *Pipeline,
|
|
cmd: *Cmd,
|
|
assigns: *Assigns,
|
|
expansion: *Expansion,
|
|
@"if": *If,
|
|
subshell: *Subshell,
|
|
cond_expr: *CondExpr,
|
|
|
|
/// This can occur if data is written using IOWriter and it immediately
|
|
/// completes (e.g. the buf to write was empty or the fd was immediately
|
|
/// writeable).
|
|
///
|
|
/// When that happens, we return this variant to ensure that the
|
|
/// `.onIOWriterChunk` is called at the top of the callstack.
|
|
///
|
|
/// TODO: this struct is massive, also I think we can remove this since
|
|
/// it is only used in 2 places. we might need to implement signals
|
|
/// first tho.
|
|
on_io_writer_chunk: struct {
|
|
err: ?jsc.SystemError,
|
|
written: usize,
|
|
/// This type is actually `IOWriterChildPtr`, but because
|
|
/// of an annoying cyclic Zig compile error we're doing this
|
|
/// quick fix of making it `*anyopaque`.
|
|
child: *anyopaque,
|
|
},
|
|
|
|
suspended,
|
|
/// Failed and threw a JS error
|
|
failed,
|
|
done,
|
|
|
|
/// Used in debug builds to ensure the shell is not creating a callstack
|
|
/// that is too deep.
|
|
threadlocal var _dbg_catch_exec_within_exec: if (Environment.isDebug) usize else u0 = 0;
|
|
|
|
/// Ideally this should be 1, but since we actually call the `resolve` of the Promise in
|
|
/// Interpreter.finish it could actually result in another shell script running.
|
|
const MAX_DEPTH = 2;
|
|
|
|
pub fn isDone(this: *const Yield) bool {
|
|
return this.* == .done;
|
|
}
|
|
|
|
pub fn run(this: Yield) void {
|
|
if (comptime Environment.isDebug) log("Yield({s}) _dbg_catch_exec_within_exec = {d} + 1 = {d}", .{ @tagName(this), _dbg_catch_exec_within_exec, _dbg_catch_exec_within_exec + 1 });
|
|
bun.debugAssert(_dbg_catch_exec_within_exec <= MAX_DEPTH);
|
|
if (comptime Environment.isDebug) _dbg_catch_exec_within_exec += 1;
|
|
defer {
|
|
if (comptime Environment.isDebug) log("Yield({s}) _dbg_catch_exec_within_exec = {d} - 1 = {d}", .{ @tagName(this), _dbg_catch_exec_within_exec, _dbg_catch_exec_within_exec - 1 });
|
|
if (comptime Environment.isDebug) _dbg_catch_exec_within_exec -= 1;
|
|
}
|
|
|
|
// A pipeline creates multiple "threads" of execution:
|
|
//
|
|
// ```bash
|
|
// cmd1 | cmd2 | cmd3
|
|
// ```
|
|
//
|
|
// We need to start cmd1, go back to the pipeline, start cmd2, and so
|
|
// on.
|
|
//
|
|
// This means we need to store a reference to the pipeline. And
|
|
// there can be nested pipelines, so we need a stack.
|
|
var sfb = std.heap.stackFallback(@sizeOf(*Pipeline) * 4, bun.default_allocator);
|
|
const alloc = sfb.get();
|
|
var pipeline_stack = bun.handleOom(std.array_list.Managed(*Pipeline).initCapacity(alloc, 4));
|
|
defer pipeline_stack.deinit();
|
|
|
|
// Note that we're using labelled switch statements but _not_
|
|
// re-assigning `this`, so the `this` variable is stale after the first
|
|
// execution. Don't touch it.
|
|
state: switch (this) {
|
|
.pipeline => |x| {
|
|
if (x.state == .done) {
|
|
// remove it from the pipeline stack as calling `.next()` will now deinit it
|
|
if (std.mem.indexOfScalar(*Pipeline, pipeline_stack.items, x)) |idx| {
|
|
_ = pipeline_stack.orderedRemove(idx);
|
|
}
|
|
continue :state x.next();
|
|
}
|
|
bun.assert_eql(std.mem.indexOfScalar(*Pipeline, pipeline_stack.items, x), null);
|
|
bun.handleOom(pipeline_stack.append(x));
|
|
continue :state x.next();
|
|
},
|
|
.cmd => |x| continue :state x.next(),
|
|
.script => |x| continue :state x.next(),
|
|
.stmt => |x| continue :state x.next(),
|
|
.assigns => |x| continue :state x.next(),
|
|
.expansion => |x| continue :state x.next(),
|
|
.@"if" => |x| continue :state x.next(),
|
|
.subshell => |x| continue :state x.next(),
|
|
.cond_expr => |x| continue :state x.next(),
|
|
.on_io_writer_chunk => |x| {
|
|
const child = IOWriterChildPtr.fromAnyOpaque(x.child);
|
|
continue :state child.onIOWriterChunk(x.written, x.err);
|
|
},
|
|
.failed, .suspended, .done => {
|
|
if (drainPipelines(&pipeline_stack)) |yield| {
|
|
continue :state yield;
|
|
}
|
|
return;
|
|
},
|
|
}
|
|
}
|
|
|
|
pub fn drainPipelines(pipeline_stack: *std.array_list.Managed(*Pipeline)) ?Yield {
|
|
if (pipeline_stack.items.len == 0) return null;
|
|
var i: i64 = @as(i64, @intCast(pipeline_stack.items.len)) - 1;
|
|
while (i >= 0 and i < pipeline_stack.items.len) : (i -= 1) {
|
|
const pipeline = pipeline_stack.items[@intCast(i)];
|
|
if (pipeline.state == .starting_cmds) return pipeline.next();
|
|
_ = pipeline_stack.pop();
|
|
if (pipeline.state == .done) {
|
|
return pipeline.next();
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
};
|
|
|
|
const std = @import("std");
|
|
|
|
const bun = @import("bun");
|
|
const Environment = bun.Environment;
|
|
const jsc = bun.jsc;
|
|
const shell = bun.shell;
|
|
const log = bun.shell.interpret.log;
|
|
|
|
const Interpreter = bun.shell.Interpreter;
|
|
const Assigns = bun.shell.Interpreter.Assigns;
|
|
const Cmd = bun.shell.Interpreter.Cmd;
|
|
const CondExpr = bun.shell.Interpreter.CondExpr;
|
|
const Expansion = bun.shell.Interpreter.Expansion;
|
|
const IO = bun.shell.Interpreter.IO;
|
|
const If = bun.shell.Interpreter.If;
|
|
const Pipeline = bun.shell.Interpreter.Pipeline;
|
|
const Script = bun.shell.Interpreter.Script;
|
|
const Stmt = bun.shell.Interpreter.Stmt;
|
|
const Subshell = bun.shell.Interpreter.Subshell;
|
|
|
|
const IOWriter = bun.shell.Interpreter.IOWriter;
|
|
const IOWriterChildPtr = IOWriter.IOWriterChildPtr;
|