EvalState inherits from enable_shared_from_this (added in b4c24a29 for
debugRepl), but was being stack-allocated or created with make_unique
in several places. This causes bad_weak_ptr errors when shared_from_this
is called.
Convert all EvalState allocations to use make_shared.
76 lines
1.5 KiB
C++
76 lines
1.5 KiB
C++
#ifndef NIX_API_EXPR_INTERNAL_H
|
|
#define NIX_API_EXPR_INTERNAL_H
|
|
|
|
#include "nix/fetchers/fetch-settings.hh"
|
|
#include "nix/expr/eval.hh"
|
|
#include "nix/expr/eval-settings.hh"
|
|
#include "nix/expr/attr-set.hh"
|
|
#include "nix_api_value.h"
|
|
#include "nix/expr/search-path.hh"
|
|
|
|
extern "C" {
|
|
|
|
struct nix_eval_state_builder
|
|
{
|
|
nix::ref<nix::Store> store;
|
|
nix::EvalSettings settings;
|
|
nix::fetchers::Settings fetchSettings;
|
|
nix::LookupPath lookupPath;
|
|
// TODO: make an EvalSettings setting own this instead?
|
|
bool readOnlyMode;
|
|
};
|
|
|
|
struct EvalState
|
|
{
|
|
nix::fetchers::Settings fetchSettings;
|
|
nix::EvalSettings settings;
|
|
std::shared_ptr<nix::EvalState> statePtr;
|
|
nix::EvalState & state;
|
|
};
|
|
|
|
struct BindingsBuilder
|
|
{
|
|
nix::BindingsBuilder builder;
|
|
};
|
|
|
|
struct ListBuilder
|
|
{
|
|
nix::ListBuilder builder;
|
|
};
|
|
|
|
struct nix_value
|
|
{
|
|
nix::Value * value;
|
|
/**
|
|
* As we move to a managed heap, we need EvalMemory in more places. Ideally, we would take in EvalState or
|
|
* EvalMemory as an argument when we need it, but we don't want to make changes to the stable C api, so we stuff it
|
|
* into the nix_value that will get passed in to the relevant functions.
|
|
*/
|
|
nix::EvalMemory * mem;
|
|
};
|
|
|
|
struct nix_string_return
|
|
{
|
|
std::string str;
|
|
};
|
|
|
|
struct nix_printer
|
|
{
|
|
std::ostream & s;
|
|
};
|
|
|
|
struct nix_string_context
|
|
{
|
|
nix::NixStringContext & ctx;
|
|
};
|
|
|
|
struct nix_realised_string
|
|
{
|
|
std::string str;
|
|
std::vector<StorePath> storePaths;
|
|
};
|
|
|
|
} // extern "C"
|
|
|
|
#endif // NIX_API_EXPR_INTERNAL_H
|