lix-project/lix
20
58
Fork 31
Code Issues 359 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #3097 from zimbatm/show-traces

Browse source 
function-trace: always show the trace
This commit is contained in:
Eelco Dolstra 2019-09-19 00:16:55 +02:00 committed by GitHub
parent c6a0f4c393 619cc4af85
commit 7f9a0033c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
contrib/stack-collapse.py
View file

@ -1,12 +1,11 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#!nix-shell -i python3 -p python3 --pure #!nix-shell -i python3 -p python3 --pure
# To be used with `--trace-function-calls` and `-vvvv` and # To be used with `--trace-function-calls` and `flamegraph.pl`.
# `flamegraph.pl`.
# #
# For example: # For example:
# #
# nix-instantiate --trace-function-calls -vvvv '<nixpkgs>' -A hello 2> nix-function-calls.trace # nix-instantiate --trace-function-calls '<nixpkgs>' -A hello 2> nix-function-calls.trace
# ./contrib/stack-collapse.py nix-function-calls.trace > nix-function-calls.folded # ./contrib/stack-collapse.py nix-function-calls.trace > nix-function-calls.folded
# nix-shell -p flamegraph --run "flamegraph.pl nix-function-calls.folded > nix-function-calls.svg" # nix-shell -p flamegraph --run "flamegraph.pl nix-function-calls.folded > nix-function-calls.svg"

4
src/libexpr/function-trace.hh
View file

@ -12,13 +12,13 @@ struct FunctionCallTrace
FunctionCallTrace(const Pos & pos) : pos(pos) { FunctionCallTrace(const Pos & pos) : pos(pos) {
auto duration = std::chrono::high_resolution_clock::now().time_since_epoch(); auto duration = std::chrono::high_resolution_clock::now().time_since_epoch();
auto ns = std::chrono::duration_cast<std::chrono::nanoseconds>(duration); auto ns = std::chrono::duration_cast<std::chrono::nanoseconds>(duration);
vomit("function-trace entered %1% at %2%", pos, ns.count()); printMsg(lvlInfo, "function-trace entered %1% at %2%", pos, ns.count());
} }
~FunctionCallTrace() { ~FunctionCallTrace() {
auto duration = std::chrono::high_resolution_clock::now().time_since_epoch(); auto duration = std::chrono::high_resolution_clock::now().time_since_epoch();
auto ns = std::chrono::duration_cast<std::chrono::nanoseconds>(duration); auto ns = std::chrono::duration_cast<std::chrono::nanoseconds>(duration);
vomit("function-trace exited %1% at %2%", pos, ns.count()); printMsg(lvlInfo, "function-trace exited %1% at %2%", pos, ns.count());
} }
}; };
} }

1
tests/function-trace.sh
View file

@ -8,7 +8,6 @@ expect_trace() {
actual=$( actual=$(
nix-instantiate \ nix-instantiate \
--trace-function-calls \ --trace-function-calls \
-vvvv \
--expr "$expr" 2>&1 \ --expr "$expr" 2>&1 \
| grep "function-trace" \ | grep "function-trace" \
| sed -e 's/ [0-9]*$//' | sed -e 's/ [0-9]*$//'