mirror of
https://github.com/oven-sh/bun
synced 2026-02-13 20:39:05 +00:00
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>
This commit is contained in:
@@ -560,7 +560,7 @@ pub fn fromBytes(binary: bool, bigint: bool, oid: types.Tag, bytes: []const u8,
|
||||
// this is probrably good enough for most cases
|
||||
var stack_buffer = std.heap.stackFallback(1024, bun.default_allocator);
|
||||
const allocator = stack_buffer.get();
|
||||
var numeric_buffer = std.ArrayList(u8).fromOwnedSlice(allocator, &stack_buffer.buffer);
|
||||
var numeric_buffer = std.array_list.Managed(u8).fromOwnedSlice(allocator, &stack_buffer.buffer);
|
||||
numeric_buffer.items.len = 0;
|
||||
defer numeric_buffer.deinit();
|
||||
|
||||
@@ -739,7 +739,7 @@ const PGNummericString = union(enum) {
|
||||
}
|
||||
};
|
||||
|
||||
fn parseBinaryNumeric(input: []const u8, result: *std.ArrayList(u8)) !PGNummericString {
|
||||
fn parseBinaryNumeric(input: []const u8, result: *std.array_list.Managed(u8)) !PGNummericString {
|
||||
// Reference: https://github.com/postgres/postgres/blob/50e6eb731d98ab6d0e625a0b87fb327b172bbebd/src/backend/utils/adt/numeric.c#L7612-L7740
|
||||
if (input.len < 8) return error.InvalidBuffer;
|
||||
var fixed_buffer = std.io.fixedBufferStream(input);
|
||||
@@ -789,7 +789,7 @@ fn parseBinaryNumeric(input: []const u8, result: *std.ArrayList(u8)) !PGNummeric
|
||||
const digit = if (idx < ndigits) try reader.readInt(u16, .big) else 0;
|
||||
log("digit: {d}", .{digit});
|
||||
var digit_str: [4]u8 = undefined;
|
||||
const digit_len = std.fmt.formatIntBuf(&digit_str, digit, 10, .lower, .{ .width = 4, .fill = '0' });
|
||||
const digit_len = std.fmt.printInt(&digit_str, digit, 10, .lower, .{ .width = 4, .fill = '0' });
|
||||
if (!first_non_zero) {
|
||||
//In the first digit, suppress extra leading decimal zeroes
|
||||
var start_idx: usize = 0;
|
||||
@@ -816,7 +816,7 @@ fn parseBinaryNumeric(input: []const u8, result: *std.ArrayList(u8)) !PGNummeric
|
||||
const digit = reader.readInt(u16, .big) catch 0;
|
||||
log("dscale digit: {d}", .{digit});
|
||||
var digit_str: [4]u8 = undefined;
|
||||
const digit_len = std.fmt.formatIntBuf(&digit_str, digit, 10, .lower, .{ .width = 4, .fill = '0' });
|
||||
const digit_len = std.fmt.printInt(&digit_str, digit, 10, .lower, .{ .width = 4, .fill = '0' });
|
||||
try result.appendSlice(digit_str[0..digit_len]);
|
||||
} else {
|
||||
log("dscale digit: 0000", .{});
|
||||
|
||||
@@ -61,7 +61,7 @@ pub fn writeBind(
|
||||
// must match the number of parameters needed by the query.
|
||||
try writer.short(len);
|
||||
|
||||
debug("Bind: {} ({d} args)", .{ bun.fmt.quote(name), len });
|
||||
debug("Bind: {f} ({d} args)", .{ bun.fmt.quote(name), len });
|
||||
iter.to(0);
|
||||
var i: usize = 0;
|
||||
while (try iter.next()) |value| : (i += 1) {
|
||||
@@ -194,7 +194,7 @@ pub fn writeQuery(
|
||||
.query = query,
|
||||
};
|
||||
try q.writeInternal(Context, writer);
|
||||
debug("Parse: {}", .{bun.fmt.quote(query)});
|
||||
debug("Parse: {f}", .{bun.fmt.quote(query)});
|
||||
}
|
||||
|
||||
{
|
||||
@@ -204,7 +204,7 @@ pub fn writeQuery(
|
||||
},
|
||||
};
|
||||
try d.writeInternal(Context, writer);
|
||||
debug("Describe: {}", .{bun.fmt.quote(name)});
|
||||
debug("Describe: {f}", .{bun.fmt.quote(name)});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -322,7 +322,7 @@ pub fn onData(
|
||||
}
|
||||
}
|
||||
|
||||
pub const Queue = std.fifo.LinearFifo(*PostgresSQLQuery, .Dynamic);
|
||||
pub const Queue = bun.LinearFifo(*PostgresSQLQuery, .Dynamic);
|
||||
|
||||
const debug = bun.Output.scoped(.Postgres, .visible);
|
||||
|
||||
|
||||
@@ -213,13 +213,13 @@ pub fn onConnectionTimeout(this: *PostgresSQLConnection) void {
|
||||
|
||||
switch (this.status) {
|
||||
.connected => {
|
||||
this.failFmt("ERR_POSTGRES_IDLE_TIMEOUT", "Idle timeout reached after {}", .{bun.fmt.fmtDurationOneDecimal(@as(u64, this.idle_timeout_interval_ms) *| std.time.ns_per_ms)});
|
||||
this.failFmt("ERR_POSTGRES_IDLE_TIMEOUT", "Idle timeout reached after {f}", .{bun.fmt.fmtDurationOneDecimal(@as(u64, this.idle_timeout_interval_ms) *| std.time.ns_per_ms)});
|
||||
},
|
||||
else => {
|
||||
this.failFmt("ERR_POSTGRES_CONNECTION_TIMEOUT", "Connection timeout after {}", .{bun.fmt.fmtDurationOneDecimal(@as(u64, this.connection_timeout_ms) *| std.time.ns_per_ms)});
|
||||
this.failFmt("ERR_POSTGRES_CONNECTION_TIMEOUT", "Connection timeout after {f}", .{bun.fmt.fmtDurationOneDecimal(@as(u64, this.connection_timeout_ms) *| std.time.ns_per_ms)});
|
||||
},
|
||||
.sent_startup_message => {
|
||||
this.failFmt("ERR_POSTGRES_CONNECTION_TIMEOUT", "Connection timeout after {} (sent startup message, but never received response)", .{bun.fmt.fmtDurationOneDecimal(@as(u64, this.connection_timeout_ms) *| std.time.ns_per_ms)});
|
||||
this.failFmt("ERR_POSTGRES_CONNECTION_TIMEOUT", "Connection timeout after {f} (sent startup message, but never received response)", .{bun.fmt.fmtDurationOneDecimal(@as(u64, this.connection_timeout_ms) *| std.time.ns_per_ms)});
|
||||
},
|
||||
}
|
||||
}
|
||||
@@ -228,7 +228,7 @@ pub fn onMaxLifetimeTimeout(this: *PostgresSQLConnection) void {
|
||||
debug("onMaxLifetimeTimeout", .{});
|
||||
this.max_lifetime_timer.state = .FIRED;
|
||||
if (this.status == .failed) return;
|
||||
this.failFmt("ERR_POSTGRES_LIFETIME_TIMEOUT", "Max lifetime timeout reached after {}", .{bun.fmt.fmtDurationOneDecimal(@as(u64, this.max_lifetime_interval_ms) *| std.time.ns_per_ms)});
|
||||
this.failFmt("ERR_POSTGRES_LIFETIME_TIMEOUT", "Max lifetime timeout reached after {f}", .{bun.fmt.fmtDurationOneDecimal(@as(u64, this.max_lifetime_interval_ms) *| std.time.ns_per_ms)});
|
||||
}
|
||||
|
||||
fn start(this: *PostgresSQLConnection) void {
|
||||
@@ -1681,14 +1681,14 @@ pub fn on(this: *PostgresSQLConnection, comptime MessageType: @Type(.enum_litera
|
||||
first_hasher.update(this.password);
|
||||
first_hasher.update(this.user);
|
||||
first_hasher.final(&first_hash_buf);
|
||||
const first_hash_str_output = std.fmt.bufPrint(&first_hash_str, "{x}", .{std.fmt.fmtSliceHexLower(&first_hash_buf)}) catch unreachable;
|
||||
const first_hash_str_output = std.fmt.bufPrint(&first_hash_str, "{x}", .{&first_hash_buf}) catch unreachable;
|
||||
|
||||
// Second hash: md5(first_hash + salt)
|
||||
var final_hasher = bun.sha.MD5.init();
|
||||
final_hasher.update(first_hash_str_output);
|
||||
final_hasher.update(&md5.salt);
|
||||
final_hasher.final(&final_hash_buf);
|
||||
const final_hash_str_output = std.fmt.bufPrint(&final_hash_str, "{x}", .{std.fmt.fmtSliceHexLower(&final_hash_buf)}) catch unreachable;
|
||||
const final_hash_str_output = std.fmt.bufPrint(&final_hash_str, "{x}", .{&final_hash_buf}) catch unreachable;
|
||||
|
||||
// Format final password as "md5" + final_hash
|
||||
const final_password = std.fmt.bufPrintZ(&final_password_buf, "md5{s}", .{final_hash_str_output}) catch unreachable;
|
||||
@@ -1736,7 +1736,7 @@ pub fn on(this: *PostgresSQLConnection, comptime MessageType: @Type(.enum_litera
|
||||
}
|
||||
|
||||
var request = this.current() orelse {
|
||||
debug("ErrorResponse: {}", .{err});
|
||||
debug("ErrorResponse: {f}", .{err});
|
||||
return error.ExpectedRequest;
|
||||
};
|
||||
var is_error_owned = true;
|
||||
|
||||
@@ -46,7 +46,7 @@ pub fn checkForDuplicateFields(this: *PostgresSQLStatement) void {
|
||||
if (!this.needs_duplicate_check) return;
|
||||
this.needs_duplicate_check = false;
|
||||
|
||||
var seen_numbers = std.ArrayList(u32).init(bun.default_allocator);
|
||||
var seen_numbers = std.array_list.Managed(u32).init(bun.default_allocator);
|
||||
defer seen_numbers.deinit();
|
||||
var seen_fields = bun.StringHashMap(void).init(bun.default_allocator);
|
||||
bun.handleOom(seen_fields.ensureUnusedCapacity(@intCast(this.fields.len)));
|
||||
|
||||
@@ -37,8 +37,8 @@ pub fn hash(this: *const Signature) u64 {
|
||||
}
|
||||
|
||||
pub fn generate(globalObject: *jsc.JSGlobalObject, query: []const u8, array_value: JSValue, columns: JSValue, prepared_statement_id: u64, unnamed: bool) !Signature {
|
||||
var fields = std.ArrayList(int4).init(bun.default_allocator);
|
||||
var name = try std.ArrayList(u8).initCapacity(bun.default_allocator, query.len);
|
||||
var fields = std.array_list.Managed(int4).init(bun.default_allocator);
|
||||
var name = try std.array_list.Managed(u8).initCapacity(bun.default_allocator, query.len);
|
||||
|
||||
name.appendSliceAssumeCapacity(query);
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
pub fn write(data: []const u8) void {
|
||||
debug("SocketMonitor: write {s}", .{std.fmt.fmtSliceHexLower(data)});
|
||||
debug("SocketMonitor: write {x}", .{data});
|
||||
if (comptime bun.Environment.isDebug) {
|
||||
DebugSocketMonitorWriter.check.call();
|
||||
if (DebugSocketMonitorWriter.enabled) {
|
||||
@@ -9,7 +9,7 @@ pub fn write(data: []const u8) void {
|
||||
}
|
||||
|
||||
pub fn read(data: []const u8) void {
|
||||
debug("SocketMonitor: read {s}", .{std.fmt.fmtSliceHexLower(data)});
|
||||
debug("SocketMonitor: read {x}", .{data});
|
||||
if (comptime bun.Environment.isDebug) {
|
||||
DebugSocketMonitorReader.check.call();
|
||||
if (DebugSocketMonitorReader.enabled) {
|
||||
@@ -23,4 +23,3 @@ const debug = bun.Output.scoped(.SocketMonitor, .visible);
|
||||
const DebugSocketMonitorReader = @import("./DebugSocketMonitorReader.zig");
|
||||
const DebugSocketMonitorWriter = @import("./DebugSocketMonitorWriter.zig");
|
||||
const bun = @import("bun");
|
||||
const std = @import("std");
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
const ArrayList = @This();
|
||||
|
||||
array: *std.ArrayList(u8),
|
||||
array: *std.array_list.Managed(u8),
|
||||
|
||||
pub fn offset(this: @This()) usize {
|
||||
return this.array.items.len;
|
||||
|
||||
@@ -2,9 +2,9 @@ const ErrorResponse = @This();
|
||||
|
||||
messages: std.ArrayListUnmanaged(FieldMessage) = .{},
|
||||
|
||||
pub fn format(formatter: ErrorResponse, comptime _: []const u8, _: std.fmt.FormatOptions, writer: anytype) !void {
|
||||
pub fn format(formatter: ErrorResponse, writer: *std.Io.Writer) !void {
|
||||
for (formatter.messages.items) |message| {
|
||||
try std.fmt.format(writer, "{}\n", .{message});
|
||||
try writer.print("{f}\n", .{message});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -18,10 +18,10 @@ pub const FieldMessage = union(FieldType) {
|
||||
line: String,
|
||||
routine: String,
|
||||
|
||||
pub fn format(this: FieldMessage, comptime _: []const u8, _: std.fmt.FormatOptions, writer: anytype) !void {
|
||||
pub fn format(this: FieldMessage, writer: *std.Io.Writer) !void {
|
||||
switch (this) {
|
||||
inline else => |str| {
|
||||
try std.fmt.format(writer, "{}", .{str});
|
||||
try writer.print("{f}", .{str});
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
@@ -228,7 +228,7 @@ pub const Tag = enum(short) {
|
||||
}
|
||||
|
||||
pub fn init(bytes: []const u8) *@This() {
|
||||
const this: *@This() = @alignCast(@ptrCast(@constCast(bytes.ptr)));
|
||||
const this: *@This() = @ptrCast(@alignCast(@constCast(bytes.ptr)));
|
||||
this.ndim = @byteSwap(this.ndim);
|
||||
this.offset_for_data = @byteSwap(this.offset_for_data);
|
||||
this.element_type = @byteSwap(this.element_type);
|
||||
|
||||
Reference in New Issue
Block a user