neurocyte/thespian
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: log thespian errors to std.log

Browse source
This commit is contained in:
CJ van den Berg 2024-08-08 19:49:21 +02:00
parent 5eb4b9b916
commit ee6b1276df
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/thespian.zig
View file

@ -11,6 +11,8 @@ const c = @cImport({
const cbor = @import("cbor"); const cbor = @import("cbor");
const builtin = @import("builtin"); const builtin = @import("builtin");
const log = std.log.scoped(.thespian);
pub var stack_trace_on_errors: bool = false; pub var stack_trace_on_errors: bool = false;
pub const subprocess = if (builtin.os.tag == .windows) @import("subprocess_windows.zig") else @import("subprocess.zig"); pub const subprocess = if (builtin.os.tag == .windows) @import("subprocess_windows.zig") else @import("subprocess.zig");
@ -447,8 +449,20 @@ pub const context = struct {
pub fn deinit(self: *Self) void { pub fn deinit(self: *Self) void {
self.context_destroy(self.context); self.context_destroy(self.context);
} }
pub fn get_last_error(buf: []u8) [] const u8 {
const err = std.mem.span(c.thespian_get_last_error());
const err_len = @min(buf.len, err.len);
@memcpy(buf[0..err_len], err[0..err_len]);
return buf[0..err_len];
}
}; };
fn log_last_error(err: anytype) @TypeOf(err) {
log.err("{any}: {s}", .{ err, c.thespian_get_last_error() });
return err;
}
fn exitHandlerRun(comptime T: type) c.thespian_exit_handler { fn exitHandlerRun(comptime T: type) c.thespian_exit_handler {
if (T == @TypeOf(null)) return null; if (T == @TypeOf(null)) return null;
return switch (@typeInfo(T)) { return switch (@typeInfo(T)) {
@ -531,7 +545,7 @@ pub fn spawn_link_env(
} }
pub fn neg_to_error(errcode: c_int, errortype: anytype) @TypeOf(errortype)!void { pub fn neg_to_error(errcode: c_int, errortype: anytype) @TypeOf(errortype)!void {
if (errcode < 0) return errortype; if (errcode < 0) return log_last_error(errortype);
} }
pub fn nonzero_to_error(errcode: c_int, errortype: anytype) @TypeOf(errortype)!void { pub fn nonzero_to_error(errcode: c_int, errortype: anytype) @TypeOf(errortype)!void {
@ -642,7 +656,7 @@ pub const signal = struct {
const Self = @This(); const Self = @This();
pub fn init(signum: c_int, m: message) !Self { pub fn init(signum: c_int, m: message) !Self {
return .{ .handle = c.thespian_signal_create(signum, m.to(c.cbor_buffer)) orelse return error.ThespianSignalInitFailed }; return .{ .handle = c.thespian_signal_create(signum, m.to(c.cbor_buffer)) orelse return log_last_error(error.ThespianSignalInitFailed) };
} }
pub fn cancel(self: *const Self) !void { pub fn cancel(self: *const Self) !void {
@ -660,11 +674,11 @@ pub const metronome = struct {
const Self = @This(); const Self = @This();
pub fn init(tick_time_us: u64) !Self { pub fn init(tick_time_us: u64) !Self {
return .{ .handle = c.thespian_metronome_create_us(@intCast(tick_time_us)) orelse return error.ThespianMetronomeInitFailed }; return .{ .handle = c.thespian_metronome_create_us(@intCast(tick_time_us)) orelse return log_last_error(error.ThespianMetronomeInitFailed) };
} }
pub fn init_ms(tick_time_us: u64) !Self { pub fn init_ms(tick_time_us: u64) !Self {
return .{ .handle = c.thespian_metronome_create_ms(tick_time_us) orelse return error.ThespianMetronomeInitFailed }; return .{ .handle = c.thespian_metronome_create_ms(tick_time_us) orelse return log_last_error(error.ThespianMetronomeInitFailed) };
} }
pub fn start(self: *const Self) !void { pub fn start(self: *const Self) !void {
@ -686,11 +700,11 @@ pub const timeout = struct {
const Self = @This(); const Self = @This();
pub fn init(tick_time_us: u64, m: message) !Self { pub fn init(tick_time_us: u64, m: message) !Self {
return .{ .handle = c.thespian_timeout_create_us(tick_time_us, m.to(c.cbor_buffer)) orelse return error.ThespianTimeoutInitFailed }; return .{ .handle = c.thespian_timeout_create_us(tick_time_us, m.to(c.cbor_buffer)) orelse return log_last_error(error.ThespianTimeoutInitFailed) };
} }
pub fn init_ms(tick_time_us: u64, m: message) !Self { pub fn init_ms(tick_time_us: u64, m: message) !Self {
return .{ .handle = c.thespian_timeout_create_ms(tick_time_us, m.to(c.cbor_buffer)) orelse return error.ThespianTimeoutInitFailed }; return .{ .handle = c.thespian_timeout_create_ms(tick_time_us, m.to(c.cbor_buffer)) orelse return log_last_error(error.ThespianTimeoutInitFailed) };
} }
pub fn cancel(self: *const Self) !void { pub fn cancel(self: *const Self) !void {
@ -709,7 +723,7 @@ pub const file_descriptor = struct {
const Self = @This(); const Self = @This();
pub fn init(tag_: []const u8, fd: i32) !Self { pub fn init(tag_: []const u8, fd: i32) !Self {
return .{ .handle = c.thespian_file_descriptor_create(tag_.ptr, fd) orelse return error.ThespianFileDescriptorInitFailed }; return .{ .handle = c.thespian_file_descriptor_create(tag_.ptr, fd) orelse return log_last_error(error.ThespianFileDescriptorInitFailed) };
} }
pub fn wait_write(self: *const Self) !void { pub fn wait_write(self: *const Self) !void {
@ -735,7 +749,7 @@ pub const file_stream = struct {
const Self = @This(); const Self = @This();
pub fn init(tag_: []const u8, handle: *anyopaque) !Self { pub fn init(tag_: []const u8, handle: *anyopaque) !Self {
return .{ .handle = c.thespian_file_stream_create(tag_.ptr, handle) orelse return error.ThespianFileStreamInitFailed }; return .{ .handle = c.thespian_file_stream_create(tag_.ptr, handle) orelse return log_last_error(error.ThespianFileStreamInitFailed) };
} }
pub fn start_read(self: *const Self) !void { pub fn start_read(self: *const Self) !void {