From d3f127e78eb7c881768c3a7701b0af8e4c8315a7 Mon Sep 17 00:00:00 2001 From: Techatrix <19954306+Techatrix@users.noreply.github.com> Date: Wed, 10 May 2023 00:38:09 +0200 Subject: [PATCH] Update tracy to 0.9.1 (#1182) * update tracy to 0.9.1 * set allocation and callstack tracing by default when tracy is enabled --- build.zig | 6 +++--- src/tracy | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.zig b/build.zig index 2fcc46d..e90b3f6 100644 --- a/build.zig +++ b/build.zig @@ -35,8 +35,8 @@ pub fn build(b: *std.build.Builder) !void { exe_options.addOption(shared.ZigVersion, "data_version", b.option(shared.ZigVersion, "data_version", "The Zig version your compiler is.") orelse .master); exe_options.addOption(std.log.Level, "log_level", b.option(std.log.Level, "log_level", "The Log Level to be used.") orelse .info); exe_options.addOption(bool, "enable_tracy", enable_tracy); - exe_options.addOption(bool, "enable_tracy_allocation", b.option(bool, "enable_tracy_allocation", "Enable using TracyAllocator to monitor allocations.") orelse false); - exe_options.addOption(bool, "enable_tracy_callstack", b.option(bool, "enable_tracy_callstack", "Enable callstack graphs.") orelse false); + exe_options.addOption(bool, "enable_tracy_allocation", b.option(bool, "enable_tracy_allocation", "Enable using TracyAllocator to monitor allocations.") orelse enable_tracy); + exe_options.addOption(bool, "enable_tracy_callstack", b.option(bool, "enable_tracy_callstack", "Enable callstack graphs.") orelse enable_tracy); exe_options.addOption(bool, "enable_failing_allocator", b.option(bool, "enable_failing_allocator", "Whether to use a randomly failing allocator.") orelse false); exe_options.addOption(u32, "enable_failing_allocator_likelihood", b.option(u32, "enable_failing_allocator_likelihood", "The chance that an allocation will fail is `1/likelihood`") orelse 256); @@ -89,7 +89,7 @@ pub fn build(b: *std.build.Builder) !void { exe.addModule("diffz", diffz_module); if (enable_tracy) { - const client_cpp = "src/tracy/TracyClient.cpp"; + const client_cpp = "src/tracy/public/TracyClient.cpp"; // On mingw, we need to opt into windows 7+ to get some features required by tracy. const tracy_c_flags: []const []const u8 = if (target.isWindows() and target.getAbi() == .gnu) diff --git a/src/tracy b/src/tracy index f493d4a..897aec5 160000 --- a/src/tracy +++ b/src/tracy @@ -1 +1 @@ -Subproject commit f493d4aa8ba8141d9680473fad007d8a6348628e +Subproject commit 897aec5b062664d2485f4f9a213715d2e527e0ca