mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-12 20:09:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make the logs better

Browse Source
This commit is contained in:
Jarred Sumner
2024-03-07 00:52:30 -08:00
parent b2cc1a9039
commit 7ca1139cec
1 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/sys.zig
View File

@@ -242,6 +242,30 @@ pub const Error = struct {
};
}
pub fn name(this: *const Error) []const u8 {
if (comptime Environment.isWindows) {
const system_errno = brk: {
// setRuntimeSafety(false) because we use tagName function, which will be null on invalid enum value.
@setRuntimeSafety(false);
if (this.from_libuv) {
break :brk @as(C.SystemErrno, @enumFromInt(@intFromEnum(bun.windows.libuv.translateUVErrorToE(this.errno))));
}
break :brk @as(C.SystemErrno, @enumFromInt(this.errno));
};
if (std.enums.tagName(bun.C.SystemErrno, system_errno)) |errname| {
return errname;
}
} else if (this.errno > 0 and this.errno < C.SystemErrno.max) {
const system_errno = @as(C.SystemErrno, @enumFromInt(this.errno));
if (std.enums.tagName(bun.C.SystemErrno, system_errno)) |errname| {
return errname;
}
}
return "UNKNOWN";
}
pub fn toSystemError(this: Error) SystemError {
var err = SystemError{
.errno = @as(c_int, this.errno) * -1,
@@ -1344,22 +1368,25 @@ pub fn recv(fd: bun.FileDescriptor, buf: []u8, flag: u32) Maybe(usize) {
if (comptime Environment.isMac) {
const rc = system.@"recvfrom$NOCANCEL"(fd.cast(), buf.ptr, adjusted_len, flag, null, null);
log("recv({}, {d}, {d}) = {d}", .{ fd, adjusted_len, flag, rc });
if (Maybe(usize).errnoSys(rc, .recv)) |err| {
log("recv({}, {d}, {d}) = {s}", .{ fd, adjusted_len, flag, err.err.name() });
return err;
}
log("recv({}, {d}, {d}) = {d}", .{ fd, adjusted_len, flag, rc });
return Maybe(usize){ .result = @as(usize, @intCast(rc)) };
} else {
while (true) {
const rc = linux.recvfrom(fd.cast(), buf.ptr, adjusted_len, flag | os.SOCK.CLOEXEC | linux.MSG.CMSG_CLOEXEC, null, null);
log("recv({}, {d}, {d}) = {d}", .{ fd, adjusted_len, flag, rc });
if (Maybe(usize).errnoSysFd(rc, .recv, fd)) |err| {
if (err.getErrno() == .INTR) continue;
log("recv({}, {d}, {d}) = {s}", .{ fd, adjusted_len, flag, err.err.name() });
return err;
}
log("recv({}, {d}, {d}) = {d}", .{ fd, adjusted_len, flag, rc });
return Maybe(usize){ .result = @as(usize, @intCast(rc)) };
}
}
@@ -1373,23 +1400,25 @@ pub fn send(fd: bun.FileDescriptor, buf: []const u8, flag: u32) Maybe(usize) {
if (comptime Environment.isMac) {
const rc = system.@"sendto$NOCANCEL"(fd.cast(), buf.ptr, buf.len, flag, null, 0);
syslog("send({}, {d}) = {d}", .{ fd, buf.len, rc });
if (Maybe(usize).errnoSys(rc, .send)) |err| {
syslog("send({}, {d}) = {s}", .{ fd, buf.len, err.err.name() });
return err;
}
syslog("send({}, {d}) = {d}", .{ fd, buf.len, rc });
return Maybe(usize){ .result = @as(usize, @intCast(rc)) };
} else {
while (true) {
const rc = linux.sendto(fd.cast(), buf.ptr, buf.len, flag, null, 0);
syslog("send({}, {d}) = {d}", .{ fd, buf.len, rc });
if (Maybe(usize).errnoSys(rc, .send)) |err| {
if (err.getErrno() == .INTR) continue;
syslog("send({}, {d}) = {s}", .{ fd, buf.len, err.err.name() });
return err;
}
syslog("send({}, {d}) = {d}", .{ fd, buf.len, rc });
return Maybe(usize){ .result = @as(usize, @intCast(rc)) };
}
}