Files
bun.sh/src/walker_skippable.zig
pfg 05d0475c6c Update to zig 0.15.2 (#24204)
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>
2025-11-10 14:38:26 -08:00

184 lines
6.9 KiB
Zig

const Walker = @This();
stack: std.array_list.Managed(StackItem),
name_buffer: NameBufferList,
skip_filenames: []const u64 = &[_]u64{},
skip_dirnames: []const u64 = &[_]u64{},
skip_all: []const u64 = &[_]u64{},
seed: u64 = 0,
const NameBufferList = std.array_list.Managed(bun.OSPathChar);
const WrappedIterator = DirIterator.NewWrappedIterator(if (Environment.isWindows) .u16 else .u8);
pub const WalkerEntry = struct {
/// The containing directory. This can be used to operate directly on `basename`
/// rather than `path`, avoiding `error.NameTooLong` for deeply nested paths.
/// The directory remains open until `next` or `deinit` is called.
dir: FD,
basename: OSPathSliceZ,
path: OSPathSliceZ,
kind: std.fs.Dir.Entry.Kind,
};
const StackItem = struct {
iter: WrappedIterator,
dirname_len: usize,
};
/// After each call to this function, and on deinit(), the memory returned
/// from this function becomes invalid. A copy must be made in order to keep
/// a reference to the path.
pub fn next(self: *Walker) bun.sys.Maybe(?WalkerEntry) {
while (self.stack.items.len != 0) {
// `top` becomes invalid after appending to `self.stack`
var top = &self.stack.items[self.stack.items.len - 1];
var dirname_len = top.dirname_len;
switch (top.iter.next()) {
.err => |err| return .initErr(err),
.result => |res| {
if (res) |base| {
switch (base.kind) {
.directory => {
if (std.mem.indexOfScalar(
u64,
self.skip_dirnames,
// avoid hashing if there will be 0 results
if (self.skip_dirnames.len > 0) bun.hashWithSeed(self.seed, std.mem.sliceAsBytes(base.name.slice())) else 0,
) != null) continue;
},
.file => {
if (std.mem.indexOfScalar(
u64,
self.skip_filenames,
// avoid hashing if there will be 0 results
if (self.skip_filenames.len > 0) bun.hashWithSeed(self.seed, std.mem.sliceAsBytes(base.name.slice())) else 0,
) != null) continue;
},
// we don't know what it is for a symlink
.sym_link => {
if (std.mem.indexOfScalar(
u64,
self.skip_all,
// avoid hashing if there will be 0 results
if (self.skip_all.len > 0) bun.hashWithSeed(self.seed, std.mem.sliceAsBytes(base.name.slice())) else 0,
) != null) continue;
},
else => {},
}
self.name_buffer.shrinkRetainingCapacity(dirname_len);
if (self.name_buffer.items.len != 0) {
bun.handleOom(self.name_buffer.append(path.sep));
dirname_len += 1;
}
bun.handleOom(self.name_buffer.appendSlice(base.name.slice()));
const cur_len = self.name_buffer.items.len;
bun.handleOom(self.name_buffer.append(0));
if (base.kind == .directory) {
const new_dir = switch (bun.openDirForIterationOSPath(top.iter.iter.dir, base.name.slice())) {
.result => |fd| fd,
.err => |err| return .initErr(err),
};
{
self.stack.append(StackItem{
.iter = DirIterator.iterate(new_dir, if (Environment.isWindows) .u16 else .u8),
.dirname_len = cur_len,
}) catch |err| bun.handleOom(err);
top = &self.stack.items[self.stack.items.len - 1];
}
}
return .initResult(WalkerEntry{
.dir = top.iter.iter.dir,
.basename = self.name_buffer.items[dirname_len..cur_len :0],
.path = self.name_buffer.items[0..cur_len :0],
.kind = base.kind,
});
} else {
var item = self.stack.pop().?;
if (self.stack.items.len != 0) {
item.iter.iter.dir.close();
}
}
},
}
}
return .initResult(null);
}
pub fn deinit(self: *Walker) void {
if (self.stack.items.len > 0) {
for (self.stack.items[1..]) |*item| {
if (self.stack.items.len != 0) {
item.iter.iter.dir.close();
}
}
self.stack.deinit();
}
self.name_buffer.allocator.free(self.skip_all);
self.name_buffer.deinit();
}
/// Recursively iterates over a directory.
/// `self` must have been opened with `OpenDirOptions{.iterate = true}`.
/// Must call `Walker.deinit` when done.
/// The order of returned file system entries is undefined.
/// `self` will not be closed after walking it.
pub fn walk(
self: FD,
allocator: Allocator,
skip_filenames: []const OSPathSlice,
skip_dirnames: []const OSPathSlice,
) OOM!Walker {
var name_buffer = NameBufferList.init(allocator);
errdefer name_buffer.deinit();
var stack = std.array_list.Managed(Walker.StackItem).init(allocator);
errdefer stack.deinit();
var skip_names = try allocator.alloc(u64, skip_filenames.len + skip_dirnames.len);
const seed = skip_filenames.len + skip_dirnames.len;
var skip_name_i: usize = 0;
for (skip_filenames) |name| {
skip_names[skip_name_i] = bun.hashWithSeed(seed, std.mem.sliceAsBytes(name));
skip_name_i += 1;
}
const skip_filenames_ = skip_names[0..skip_name_i];
var skip_dirnames_ = skip_names[skip_name_i..];
for (skip_dirnames, 0..) |name, i| {
skip_dirnames_[i] = bun.hashWithSeed(seed, std.mem.sliceAsBytes(name));
}
try stack.append(Walker.StackItem{
.iter = DirIterator.iterate(self, if (Environment.isWindows) .u16 else .u8),
.dirname_len = 0,
});
return Walker{
.stack = stack,
.name_buffer = name_buffer,
.skip_all = skip_names,
.seed = seed,
.skip_filenames = skip_filenames_,
.skip_dirnames = skip_dirnames_,
};
}
const std = @import("std");
const Allocator = std.mem.Allocator;
const path = std.fs.path;
const bun = @import("bun");
const DirIterator = bun.DirIterator;
const Environment = bun.Environment;
const FD = bun.FD;
const OOM = bun.OOM;
const OSPathSlice = bun.OSPathSlice;
const OSPathSliceZ = bun.OSPathSliceZ;