zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core: fix usage of std_options for log_level and log_scope_levels (#717)

Browse source 
Co-authored-by: dweiller <4678790+dweiller@users.noreplay.github.com>
This commit is contained in:
Dominic 2023-03-10 13:49:40 +11:00 • committed by GitHub
parent b5f0669bda
commit 96ad6503d9
Failed to generate hash of commit
2 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
libs/core/src/platform/native/entry.zig
View file

@ -4,8 +4,21 @@ const App = @import("app").App;
const util = @import("util.zig");
pub const GPUInterface = gpu.dawn.Interface;
pub const scope_levels = if (@hasDecl(App, "scope_levels")) App.scope_levels else [0]std.log.ScopeLevel{};
pub const log_level = if (@hasDecl(App, "log_level")) App.log_level else std.log.default_level;
const app_std_options = if (@hasDecl(App, "std_options")) App.std_options else struct {};
pub const std_options = struct {
pub const log_level = if (@hasDecl(app_std_options, "log_level"))
app_std_options.log_level
else
std.log.default_level;
pub const log_scope_levels = if (@hasDecl(App, "log_scope_levels"))
app_std_options.log_scope_levels
else
&[0]std.log.ScopeLevel{};
};
pub fn main() !void {
gpu.Impl.init();
_ = gpu.Export(GPUInterface);

13
libs/core/src/platform/wasm/entry.zig
View file

@ -4,8 +4,7 @@ const App = @import("app").App;
const js = @import("js.zig");
pub const GPUInterface = gpu.StubInterface;
pub const log_level = if (@hasDecl(App, "log_level")) App.log_level else std.log.default_level;
pub const scope_levels = if (@hasDecl(App, "scope_levels")) App.scope_levels else [0]std.log.ScopeLevel{};
const app_std_options = if (@hasDecl(App, "std_options")) App.std_options else struct {};
var app: App = undefined;
export fn wasmInit() void {
@ -41,6 +40,16 @@ pub const std_options = struct {
writer.print(message_level.asText() ++ prefix ++ format ++ "\n", args) catch return;
js.machLogFlush();
}
pub const log_level = if (@hasDecl(app_std_options, "log_level"))
app_std_options.log_level
else
std.log.default_level;
pub const log_scope_levels = if (@hasDecl(app_std_options, "log_scope_levels"))
app_std_options.log_scope_levels
else
&[0]std.log.ScopeLevel{};
};
pub fn panic(msg: []const u8, error_return_trace: ?*std.builtin.StackTrace, ret_addr: ?usize) noreturn {