From 3ed30aaf4bd83a3f7a4c041380cc74af5fdc6738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac=20Jacqu=C3=A9?= Date: Tue, 6 Feb 2024 15:18:00 +0100 Subject: [PATCH] Tracy Build system setup --- .gitmodules | 3 +++ src/libexpr/eval.cc | 2 ++ src/libexpr/local.mk | 5 +++-- src/libexpr/tracy | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 .gitmodules create mode 160000 src/libexpr/tracy diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..91bf561e2 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "src/libexpr/tracy"] + path = src/libexpr/tracy + url = git@github.com:wolfpld/tracy.git diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index bebc94873..7943f73ad 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -25,6 +25,7 @@ #include "flake/flakeref.hh" #include "parser-tab.hh" +#include #include #include #include @@ -1372,6 +1373,7 @@ static std::string showAttrPath(EvalState & state, Env & env, const AttrPath & a void ExprSelect::eval(EvalState & state, Env & env, Value & v) { + ZoneScopedN("select"); Value vTmp; PosIdx pos2; Value * vAttrs = &vTmp; diff --git a/src/libexpr/local.mk b/src/libexpr/local.mk index 0c3e36750..2290d6f9a 100644 --- a/src/libexpr/local.mk +++ b/src/libexpr/local.mk @@ -10,9 +10,10 @@ libexpr_SOURCES := \ $(wildcard $(d)/primops/*.cc) \ $(wildcard $(d)/flake/*.cc) \ $(d)/lexer-tab.cc \ - $(d)/parser-tab.cc + $(d)/parser-tab.cc \ + $(d)/tracy/public/TracyClient.cpp -libexpr_CXXFLAGS += -I src/libutil -I src/libstore -I src/libfetchers -I src/libmain -I src/libexpr +libexpr_CXXFLAGS += -I src/libutil -I src/libstore -I src/libfetchers -I src/libmain -I src/libexpr -I src/libexpr/tracy/public libexpr_LIBS = libutil libstore libfetchers diff --git a/src/libexpr/tracy b/src/libexpr/tracy new file mode 160000 index 000000000..37aff70df --- /dev/null +++ b/src/libexpr/tracy @@ -0,0 +1 @@ +Subproject commit 37aff70dfa50cf6307b3fee6074d627dc2929143