Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.name = .zig_tracy,
.fingerprint = 0x1c9150cfb12ae268,
.version = "0.0.5",
.minimum_zig_version = "0.14.1",
.minimum_zig_version = "0.15.2",
.paths = .{
"build.zig",
"build.zig.zon",
Expand Down
8 changes: 5 additions & 3 deletions example/build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ pub fn build(b: *std.Build) void {

const exe = b.addExecutable(.{
.name = "tracy-example",
.root_source_file = b.path("src/main.zig"),
.target = target,
.optimize = optimize,
.root_module = b.createModule(.{
.root_source_file = b.path("src/main.zig"),
.target = target,
.optimize = optimize,
}),
});
exe.root_module.addImport("tracy", tracy.module("tracy"));
exe.linkLibrary(tracy.artifact("tracy"));
Expand Down
2 changes: 1 addition & 1 deletion example/build.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.name = .zig_tracy_example,
.fingerprint = 0xe9dd79ab1e600c1e,
.version = "0.0.2",
.minimum_zig_version = "0.14.1",
.minimum_zig_version = "0.15.2",
.paths = .{
"build.zig",
"build.zig.zon",
Expand Down
25 changes: 15 additions & 10 deletions example/src/main.zig
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const tracy = @import("tracy");

var finalise_threads: std.Thread.ResetEvent = .{};

fn handleSigInt(_: c_int) callconv(.C) void {
export fn handleSigInt(_: c_int) void {
finalise_threads.set();
}

Expand All @@ -13,7 +13,7 @@ pub fn main() !void {

std.posix.sigaction(std.posix.SIG.INT, &.{
.handler = .{ .handler = handleSigInt },
.mask = std.posix.empty_sigset,
.mask = std.posix.sigemptyset(),
.flags = 0,
}, null);

Expand All @@ -25,7 +25,7 @@ pub fn main() !void {

const zone = tracy.initZone(@src(), .{ .name = "Important work" });
defer zone.deinit();
std.time.sleep(100);
std.Thread.sleep(100);
}
}

Expand All @@ -39,26 +39,31 @@ fn otherThread() void {
defer arena.deinit();

var tracing_allocator = tracy.TracingAllocator.initNamed("arena", arena.allocator());
const allocator = tracing_allocator.allocator();

var stack = std.ArrayList(u8).init(tracing_allocator.allocator());
defer stack.deinit();
var stack = std.ArrayList(u8).empty;
defer stack.deinit(allocator);

const stdin = std.io.getStdIn().reader();
const stdout = std.io.getStdOut().writer();
const stdin = std.fs.File.stdin().deprecatedReader();

var stdout_buffer: [1024]u8 = undefined;
var stdout_writer = std.fs.File.stdout().writer(&stdout_buffer);
const stdout = &stdout_writer.interface;

while (!finalise_threads.isSet()) {
const zone = tracy.initZone(@src(), .{ .name = "IO loop" });
defer zone.deinit();

stdout.print("Enter string: ", .{}) catch break;
stdout.flush() catch break;

const stream_zone = tracy.initZone(@src(), .{ .name = "Writer.streamUntilDelimiter" });
stdin.streamUntilDelimiter(stack.writer(), '\n', null) catch break;
stdin.streamUntilDelimiter(stack.writer(allocator), '\n', null) catch break;
stream_zone.deinit();

const toowned_zone = tracy.initZone(@src(), .{ .name = "ArrayList.toOwnedSlice" });
const str = stack.toOwnedSlice() catch break;
defer tracing_allocator.allocator().free(str);
const str = stack.toOwnedSlice(allocator) catch break;
defer allocator.free(str);
toowned_zone.deinit();

const reverse_zone = tracy.initZone(@src(), .{ .name = "std.mem.reverse" });
Expand Down
135 changes: 121 additions & 14 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 20 additions & 34 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,46 +2,32 @@
description = "zig-tracy development environment";

inputs = {
zig-source = {
url = "https://ziglang.org/builds/zig-linux-x86_64-0.12.0-dev.3522+b88ae8dbd.tar.xz";
flake = false;
};
flake-utils.url = "github:numtide/flake-utils";
zig-overlay.url = "github:mitchellh/zig-overlay";
};

outputs = {
self,
nixpkgs,
zig-source
flake-utils,
zig-overlay
}:
let
default_system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${default_system};
zig_0_12_0_rc = pkgs.stdenv.mkDerivation rec {
pname = "zig";
version = "0.12.0-dev.3522+b88ae8dbd";
src = zig-source.outPath;
# https://github.com/mitchellh/zig-overlay/blob/a13f8e3f83ce51411d079579f28acb20472443f8/flake.nix#L21
systems = builtins.attrNames zig-overlay.packages;
in
flake-utils.lib.eachSystem systems (
system: let
pkgs = nixpkgs.legacyPackages.${system};
zigpkgs = zig-overlay.packages.${system};
in rec {
devShells.default = pkgs.mkShell {
nativeBuildInputs = with pkgs; [
zigpkgs."0.15.2"

installPhase = ''
mkdir -p "$out/bin"
cp zig "$out/bin"
cp -r lib "$out"
cp -r doc "$out"
'';

meta = with pkgs.lib; {
homepage = "https://ziglang.org/";
description = "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software";
license = licenses.mit;
platforms = platforms.unix;
};
};
in {
devShell.${default_system} = pkgs.mkShell {
nativeBuildInputs = [
zig_0_12_0_rc
pkgs.lldb_16
];
};
};
lldb
];
};
}
);
}