Files
bun.sh/src/brotli.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

288 lines
9.6 KiB
Zig

pub const c = @import("./deps/brotli_c.zig");
const BrotliDecoder = c.BrotliDecoder;
const BrotliEncoder = c.BrotliEncoder;
pub const BrotliAllocator = struct {
pub fn alloc(_: ?*anyopaque, len: usize) callconv(.c) *anyopaque {
if (bun.heap_breakdown.enabled) {
const zone = bun.heap_breakdown.getZone("brotli");
return zone.malloc_zone_malloc(len) orelse bun.outOfMemory();
}
return mimalloc.mi_malloc(len) orelse bun.outOfMemory();
}
pub fn free(_: ?*anyopaque, data: ?*anyopaque) callconv(.c) void {
if (bun.heap_breakdown.enabled) {
const zone = bun.heap_breakdown.getZone("brotli");
zone.malloc_zone_free(data);
return;
}
mimalloc.mi_free(data);
}
};
pub const DecoderOptions = struct {
pub const Params = std.enums.EnumFieldStruct(c.BrotliDecoderParameter, bool, false);
params: Params = Params{
.LARGE_WINDOW = true,
.DISABLE_RING_BUFFER_REALLOCATION = false,
},
};
pub const BrotliReaderArrayList = struct {
pub const State = enum {
Uninitialized,
Inflating,
End,
Error,
};
input: []const u8,
list: std.ArrayListUnmanaged(u8),
list_allocator: std.mem.Allocator,
list_ptr: *std.ArrayListUnmanaged(u8),
brotli: *BrotliDecoder,
state: State = State.Uninitialized,
total_out: usize = 0,
total_in: usize = 0,
flushOp: BrotliEncoder.Operation,
finishFlushOp: BrotliEncoder.Operation,
fullFlushOp: BrotliEncoder.Operation,
pub const new = bun.TrivialNew(BrotliReaderArrayList);
pub fn newWithOptions(input: []const u8, list: *std.ArrayListUnmanaged(u8), allocator: std.mem.Allocator, options: DecoderOptions) !*BrotliReaderArrayList {
return BrotliReaderArrayList.new(try initWithOptions(input, list, allocator, options, .process, .finish, .flush));
}
pub fn initWithOptions(
input: []const u8,
list: *std.ArrayListUnmanaged(u8),
allocator: std.mem.Allocator,
options: DecoderOptions,
flushOp: BrotliEncoder.Operation,
finishFlushOp: BrotliEncoder.Operation,
fullFlushOp: BrotliEncoder.Operation,
) !BrotliReaderArrayList {
if (!BrotliDecoder.initializeBrotli()) {
return error.BrotliFailedToLoad;
}
var brotli = BrotliDecoder.createInstance(&BrotliAllocator.alloc, &BrotliAllocator.free, null) orelse return error.BrotliFailedToCreateInstance;
if (options.params.LARGE_WINDOW)
_ = brotli.setParameter(c.BrotliDecoderParameter.LARGE_WINDOW, 1);
if (options.params.DISABLE_RING_BUFFER_REALLOCATION)
_ = brotli.setParameter(c.BrotliDecoderParameter.DISABLE_RING_BUFFER_REALLOCATION, 1);
bun.assert(list.items.ptr != input.ptr);
return .{
.input = input,
.list_ptr = list,
.list = list.*,
.list_allocator = allocator,
.brotli = brotli,
.flushOp = flushOp,
.finishFlushOp = finishFlushOp,
.fullFlushOp = fullFlushOp,
};
}
pub fn end(this: *BrotliReaderArrayList) void {
this.state = .End;
}
pub fn readAll(this: *BrotliReaderArrayList, is_done: bool) !void {
defer this.list_ptr.* = this.list;
if (this.state == .End or this.state == .Error) {
return;
}
bun.assert(this.list.items.ptr != this.input.ptr);
while (this.state == State.Uninitialized or this.state == State.Inflating) {
var unused_capacity = this.list.unusedCapacitySlice();
if (unused_capacity.len < 4096) {
try this.list.ensureUnusedCapacity(this.list_allocator, 4096);
unused_capacity = this.list.unusedCapacitySlice();
}
bun.assert(unused_capacity.len > 0);
var next_in = this.input[this.total_in..];
var in_remaining = next_in.len;
var out_remaining = unused_capacity.len;
// https://github.com/google/brotli/blob/fef82ea10435abb1500b615b1b2c6175d429ec6c/go/cbrotli/reader.go#L15-L27
const result = this.brotli.decompressStream(
&in_remaining,
@ptrCast(&next_in),
&out_remaining,
@ptrCast(&unused_capacity.ptr),
null,
);
const bytes_written = unused_capacity.len -| out_remaining;
const bytes_read = next_in.len -| in_remaining;
this.list.items.len += bytes_written;
this.total_in += bytes_read;
switch (result) {
.success => {
if (comptime bun.Environment.allow_assert) {
bun.assert(this.brotli.isFinished());
}
this.end();
return;
},
.err => {
this.state = .Error;
if (comptime bun.Environment.allow_assert) {
const code = this.brotli.getErrorCode();
bun.Output.debugWarn("Brotli error: {s} ({d})", .{ @tagName(code), @intFromEnum(code) });
}
return error.BrotliDecompressionError;
},
.needs_more_input => {
if (in_remaining > 0) {
@panic("Brotli wants more data");
}
this.state = .Inflating;
if (is_done) {
// Stream is truncated - we're at EOF but decoder needs more data
this.state = .Error;
return error.BrotliDecompressionError;
}
// Not at EOF - we can retry with more data
return error.ShortRead;
},
.needs_more_output => {
try this.list.ensureTotalCapacity(this.list_allocator, this.list.capacity + 4096);
this.state = .Inflating;
},
}
}
}
pub fn deinit(this: *BrotliReaderArrayList) void {
this.brotli.destroyInstance();
bun.destroy(this);
}
};
pub const BrotliCompressionStream = struct {
pub const State = enum {
Inflating,
End,
Error,
};
brotli: *BrotliEncoder,
state: State = State.Inflating,
total_out: usize = 0,
total_in: usize = 0,
flushOp: BrotliEncoder.Operation,
finishFlushOp: BrotliEncoder.Operation,
fullFlushOp: BrotliEncoder.Operation,
pub fn init(
flushOp: BrotliEncoder.Operation,
finishFlushOp: BrotliEncoder.Operation,
fullFlushOp: BrotliEncoder.Operation,
) !BrotliCompressionStream {
const instance = BrotliEncoder.createInstance(&BrotliAllocator.alloc, &BrotliAllocator.free, null) orelse return error.BrotliFailedToCreateInstance;
return BrotliCompressionStream{
.brotli = instance,
.flushOp = flushOp,
.finishFlushOp = finishFlushOp,
.fullFlushOp = fullFlushOp,
};
}
pub fn writeChunk(this: *BrotliCompressionStream, input: []const u8, last: bool) ![]const u8 {
this.total_in += input.len;
const result = this.brotli.compressStream(if (last) this.finishFlushOp else this.flushOp, input);
if (!result.success) {
this.state = .Error;
return error.BrotliCompressionError;
}
return result.output;
}
pub fn write(this: *BrotliCompressionStream, input: []const u8, last: bool) ![]const u8 {
if (this.state == .End or this.state == .Error) {
return "";
}
return this.writeChunk(input, last);
}
pub fn end(this: *BrotliCompressionStream) ![]const u8 {
defer this.state = .End;
return try this.write("", true);
}
pub fn deinit(this: *BrotliCompressionStream) void {
this.brotli.destroyInstance();
}
fn NewWriter(comptime InputWriter: type) type {
return struct {
compressor: *BrotliCompressionStream,
input_writer: InputWriter,
const Self = @This();
pub const WriteError = error{BrotliCompressionError} || InputWriter.Error;
pub const Writer = std.Io.GenericWriter(@This(), WriteError, Self.write);
pub fn init(compressor: *BrotliCompressionStream, input_writer: InputWriter) Self {
return Self{
.compressor = compressor,
.input_writer = input_writer,
};
}
pub fn write(self: Self, to_compress: []const u8) WriteError!usize {
const decompressed = try self.compressor.write(to_compress, false);
try self.input_writer.writeAll(decompressed);
return to_compress.len;
}
pub fn end(self: Self) !usize {
const decompressed = try self.compressor.end();
try self.input_writer.writeAll(decompressed);
}
pub fn writer(self: Self) Writer {
return Writer{ .context = self };
}
};
}
pub fn writerContext(this: *BrotliCompressionStream, writable: anytype) NewWriter(@TypeOf(writable)) {
return NewWriter(@TypeOf(writable)).init(this, writable);
}
pub fn writer(this: *BrotliCompressionStream, writable: anytype) NewWriter(@TypeOf(writable)).Writer {
return this.writerContext(writable).writer();
}
};
const std = @import("std");
const bun = @import("bun");
const mimalloc = bun.mimalloc;