mirror of
https://github.com/NixOS/nix
synced 2025-07-01 08:28:00 +02:00
11919bc471
The underlying issue is that debugger code path was calling PosTable::operator[] in each eval method. This has become incredibly expensive since5d9fdab3de. While we are it it, I've reworked the code to not use std::shared_ptr where it really isn't necessary. As I've documented in previous commits, this is actually more a workaround for recursive header dependencies now and is only necessary in `error.hh` code. Some ad-hoc benchmarking: After this commit: ``` Benchmark 1: nix eval nixpkgs#hello --impure --ignore-try --no-eval-cache --debugger Time (mean ± σ): 784.2 ms ± 7.1 ms [User: 561.4 ms, System: 147.7 ms] Range (min … max): 773.5 ms … 792.6 ms 10 runs ``` On master 3604c7c51: ``` Benchmark 1: nix eval nixpkgs#hello --impure --ignore-try --no-eval-cache --debugger Time (mean ± σ): 22.914 s ± 0.178 s [User: 18.524 s, System: 4.151 s] Range (min … max): 22.738 s … 23.290 s 10 runs ``` (cherry picked from commitadbd08399c)
114 lines
3.1 KiB
C++
114 lines
3.1 KiB
C++
#include "eval-error.hh"
|
|
#include "eval.hh"
|
|
#include "value.hh"
|
|
|
|
namespace nix {
|
|
|
|
template<class T>
|
|
EvalErrorBuilder<T> & EvalErrorBuilder<T>::withExitStatus(unsigned int exitStatus)
|
|
{
|
|
error.withExitStatus(exitStatus);
|
|
return *this;
|
|
}
|
|
|
|
template<class T>
|
|
EvalErrorBuilder<T> & EvalErrorBuilder<T>::atPos(PosIdx pos)
|
|
{
|
|
error.err.pos = error.state.positions[pos];
|
|
return *this;
|
|
}
|
|
|
|
template<class T>
|
|
EvalErrorBuilder<T> & EvalErrorBuilder<T>::atPos(Value & value, PosIdx fallback)
|
|
{
|
|
return atPos(value.determinePos(fallback));
|
|
}
|
|
|
|
template<class T>
|
|
EvalErrorBuilder<T> & EvalErrorBuilder<T>::withTrace(PosIdx pos, const std::string_view text)
|
|
{
|
|
error.addTrace(error.state.positions[pos], text);
|
|
return *this;
|
|
}
|
|
|
|
template<class T>
|
|
EvalErrorBuilder<T> & EvalErrorBuilder<T>::withSuggestions(Suggestions & s)
|
|
{
|
|
error.err.suggestions = s;
|
|
return *this;
|
|
}
|
|
|
|
template<class T>
|
|
EvalErrorBuilder<T> & EvalErrorBuilder<T>::withFrame(const Env & env, const Expr & expr)
|
|
{
|
|
// NOTE: This is abusing side-effects.
|
|
// TODO: check compatibility with nested debugger calls.
|
|
// TODO: What side-effects??
|
|
error.state.debugTraces.push_front(DebugTrace{
|
|
.pos = expr.getPos(),
|
|
.expr = expr,
|
|
.env = env,
|
|
.hint = HintFmt("Fake frame for debugging purposes"),
|
|
.isError = true});
|
|
return *this;
|
|
}
|
|
|
|
template<class T>
|
|
EvalErrorBuilder<T> & EvalErrorBuilder<T>::addTrace(PosIdx pos, HintFmt hint)
|
|
{
|
|
error.addTrace(error.state.positions[pos], hint);
|
|
return *this;
|
|
}
|
|
|
|
template<class T>
|
|
template<typename... Args>
|
|
EvalErrorBuilder<T> &
|
|
EvalErrorBuilder<T>::addTrace(PosIdx pos, std::string_view formatString, const Args &... formatArgs)
|
|
{
|
|
|
|
addTrace(error.state.positions[pos], HintFmt(std::string(formatString), formatArgs...));
|
|
return *this;
|
|
}
|
|
|
|
template<class T>
|
|
EvalErrorBuilder<T> & EvalErrorBuilder<T>::setIsFromExpr()
|
|
{
|
|
error.err.isFromExpr = true;
|
|
return *this;
|
|
}
|
|
|
|
template<class T>
|
|
void EvalErrorBuilder<T>::debugThrow()
|
|
{
|
|
error.state.runDebugRepl(&error);
|
|
|
|
// `EvalState` is the only class that can construct an `EvalErrorBuilder`,
|
|
// and it does so in dynamic storage. This is the final method called on
|
|
// any such instance and must delete itself before throwing the underlying
|
|
// error.
|
|
auto error = std::move(this->error);
|
|
delete this;
|
|
|
|
throw error;
|
|
}
|
|
|
|
template<class T>
|
|
void EvalErrorBuilder<T>::panic()
|
|
{
|
|
logError(error.info());
|
|
printError("This is a bug! An unexpected condition occurred, causing the Nix evaluator to have to stop. If you could share a reproducible example or a core dump, please open an issue at https://github.com/NixOS/nix/issues");
|
|
abort();
|
|
}
|
|
|
|
template class EvalErrorBuilder<EvalBaseError>;
|
|
template class EvalErrorBuilder<EvalError>;
|
|
template class EvalErrorBuilder<AssertionError>;
|
|
template class EvalErrorBuilder<ThrownError>;
|
|
template class EvalErrorBuilder<Abort>;
|
|
template class EvalErrorBuilder<TypeError>;
|
|
template class EvalErrorBuilder<UndefinedVarError>;
|
|
template class EvalErrorBuilder<MissingArgumentError>;
|
|
template class EvalErrorBuilder<InfiniteRecursionError>;
|
|
template class EvalErrorBuilder<InvalidPathError>;
|
|
|
|
}
|