Connect Rust code to Tracy (and upgrade Tracy to latest).

Author: graydon

Cargo.lock

@@ -1,5 +1,8 @@
 [workspace]
-members = ["src/rust"]
+members = ["src/rust", "lib/tracy-client-sys"]
+
+[patch.crates-io]
+tracy-client-sys = { path = "lib/tracy-client-sys" }
 
 # [patch."https://github.com/stellar/rs-soroban-env"]
 # soroban-env-common = { path = "../rs-soroban-env/soroban-env-common" }

Cargo.toml

@@ -32,7 +32,7 @@ TRACY_GUI_SOURCE=$(TRACY_GUI_DIR)/src
 TRACY_GUI_BUILD=$(TRACY_GUI_DIR)/build/unix
 
 $(TRACY_GUI_BUILD)/Tracy-release: $(wildcard $(TRACY_GUI_SOURCE)/*.*)
-	$(MAKE) -C $(TRACY_GUI_BUILD) release CC="$(CC)" CXX="$(CXX)" TRACY_NO_ISA_EXTENSIONS=1
+	$(MAKE) -C $(TRACY_GUI_BUILD) release CC="$(CC)" CXX="$(CXX)" TRACY_NO_ISA_EXTENSIONS=1 TRACY_NO_LTO=1 LEGACY=1
 
 tracy-gui: $(TRACY_GUI_BUILD)/Tracy-release
 	cp -v $< $@
@@ -46,7 +46,7 @@ TRACY_CAPTURE_SOURCE=$(TRACY_CAPTURE_DIR)/src
 TRACY_CAPTURE_BUILD=$(TRACY_CAPTURE_DIR)/build/unix
 
 $(TRACY_CAPTURE_BUILD)/capture-release: $(wildcard $(TRACY_CAPTURE_SOURCE)/*.*)
-	$(MAKE) -C $(TRACY_CAPTURE_BUILD) release CC="$(CC)" CXX="$(CXX)" TRACY_NO_ISA_EXTENSIONS=1
+	$(MAKE) -C $(TRACY_CAPTURE_BUILD) release CC="$(CC)" CXX="$(CXX)" TRACY_NO_ISA_EXTENSIONS=1 TRACY_NO_LTO=1 LEGACY=1
 
 tracy-capture: $(TRACY_CAPTURE_BUILD)/capture-release
 	cp -v $< $@
@@ -60,7 +60,7 @@ TRACY_CSVEXPORT_SOURCE=$(TRACY_CSVEXPORT_DIR)/src
 TRACY_CSVEXPORT_BUILD=$(TRACY_CSVEXPORT_DIR)/build/unix
 
 $(TRACY_CSVEXPORT_BUILD)/csvexport-release: $(wildcard $(TRACY_CSVEXPORT_SOURCE)/*.*)
-	$(MAKE) -C $(TRACY_CSVEXPORT_BUILD) release CC="$(CC)" CXX="$(CXX)" TRACY_NO_ISA_EXTENSIONS=1
+	$(MAKE) -C $(TRACY_CSVEXPORT_BUILD) release CC="$(CC)" CXX="$(CXX)" TRACY_NO_ISA_EXTENSIONS=1 TRACY_NO_LTO=1 LEGACY=1
 
 tracy-csvexport: $(TRACY_CSVEXPORT_BUILD)/csvexport-release
 	cp -v $< $@

Makefile.am

@@ -9,7 +9,7 @@ AM_CPPFLAGS += -isystem "$(top_srcdir)/lib"             \
 	-isystem "$(top_srcdir)/lib/util"                   \
 	-isystem "$(top_srcdir)/lib/fmt/include"            \
 	-isystem "$(top_srcdir)/lib/soci/src/core"          \
-	-isystem "$(top_srcdir)/lib/tracy"                  \
+	-isystem "$(top_srcdir)/lib/tracy/public/tracy"     \
 	-isystem "$(top_srcdir)/lib/spdlog/include"         \
 	-isystem "$(top_srcdir)/rust/src"
 

common.mk

@@ -335,7 +335,7 @@ AC_ARG_ENABLE(tracy,
     AS_HELP_STRING([--enable-tracy],
         [Enable 'tracy' profiler/tracer client stub]))
 AM_CONDITIONAL(USE_TRACY, [test x$enable_tracy = xyes])
-tracy_CFLAGS='-DTRACY_ENABLE -DTRACY_ON_DEMAND -DTRACY_NO_BROADCAST -DTRACY_ONLY_LOCALHOST -DTRACY_ONLY_IPV4'
+tracy_CFLAGS='-DTRACY_ENABLE -DTRACY_ON_DEMAND -DTRACY_NO_BROADCAST -DTRACY_ONLY_LOCALHOST -DTRACY_ONLY_IPV4 -DTRACY_DELAYED_INIT -DTRACY_MANUAL_LIFETIME'
 if test x"$enable_tracy" = xyes; then
     case "${host_os}" in
         *darwin*)

configure.ac

@@ -0,0 +1,24 @@
+# Note this is a local override of tracy-client-sys with its generated.rs file
+# manually regenerated from the in-tree copy of Tracy that we use.
+
+[package]
+name = "tracy-client-sys"
+version = "0.21.0"
+authors = ["Simonas Kazlauskas <[email protected]>"]
+license = "(MIT OR Apache-2.0) AND BSD-3-Clause"
+edition = "2018"
+repository = "https://github.com/nagisa/rust_tracy_client"
+homepage = "https://github.com/nagisa/rust_tracy_client"
+documentation = "https://docs.rs/tracy-client-sys"
+description = """
+Low level bindings to the client libraries for the Tracy profiler
+"""
+
+[features]
+default = [ "enable" ]
+enable = []
+broadcast = []
+code-transfer = []
+context-switch-tracing = []
+sampling = []
+system-tracing = []