about summary refs log tree commit diff
diff options
context:
space:
mode:
authorzimbatm <zimbatm@zimbatm.com>2019-09-18T11·40+0000
committerEelco Dolstra <edolstra@gmail.com>2020-01-05T15·30+0100
commitc94fd5f51a3c11e07a278d43bcf453c16507e58e (patch)
treedced4f9106ac649f78ae6cade59d90541c60c66c
parent60429b86ba51c62b7a3f50a9ee46572a369a9e92 (diff)
function-trace: always show the trace
If the user invokes nix with --trace-function-calls it means that they
want to see the trace.

(cherry picked from commit 619cc4af855fab7b0400586a4fd40745b23e72ad)
-rwxr-xr-xcontrib/stack-collapse.py5
-rw-r--r--src/libexpr/function-trace.hh4
-rwxr-xr-xtests/function-trace.sh1
3 files changed, 4 insertions, 6 deletions
diff --git a/contrib/stack-collapse.py b/contrib/stack-collapse.py
index ee77e158945c..f5602c95c48e 100755
--- a/contrib/stack-collapse.py
+++ b/contrib/stack-collapse.py
@@ -1,12 +1,11 @@
 #!/usr/bin/env nix-shell
 #!nix-shell -i python3 -p python3 --pure
 
-# To be used with `--trace-function-calls` and `-vvvv` and
-# `flamegraph.pl`.
+# To be used with `--trace-function-calls` and `flamegraph.pl`.
 #
 # 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
 # nix-shell -p flamegraph --run "flamegraph.pl nix-function-calls.folded > nix-function-calls.svg"
 
diff --git a/src/libexpr/function-trace.hh b/src/libexpr/function-trace.hh
index 8234b760312f..8b0ec848d5a8 100644
--- a/src/libexpr/function-trace.hh
+++ b/src/libexpr/function-trace.hh
@@ -12,13 +12,13 @@ struct FunctionCallTrace
     FunctionCallTrace(const Pos & pos) : pos(pos) {
         auto duration = std::chrono::high_resolution_clock::now().time_since_epoch();
         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() {
         auto duration = std::chrono::high_resolution_clock::now().time_since_epoch();
         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());
     }
 };
 }
diff --git a/tests/function-trace.sh b/tests/function-trace.sh
index f7d93b4356e5..182a4d5c287a 100755
--- a/tests/function-trace.sh
+++ b/tests/function-trace.sh
@@ -8,7 +8,6 @@ expect_trace() {
     actual=$(
         nix-instantiate \
             --trace-function-calls \
-            -vvvv \
             --expr "$expr" 2>&1 \
             | grep "function-trace" \
             | sed -e 's/ [0-9]*$//'