mirror of
https://github.com/NixOS/nix
synced 2025-06-26 20:01:15 +02:00
Eliminate the "store" global variable
Also, move a few free-standing functions into StoreAPI and Derivation. Also, introduce a non-nullable smart pointer, ref<T>, which is just a wrapper around std::shared_ptr ensuring that the pointer is never null. (For reference-counted values, this is better than passing a "T&", because the latter doesn't maintain the refcount. Usually, the caller will have a shared_ptr keeping the value alive, but that's not always the case, e.g., when passing a reference to a std::thread via std::bind.)
This commit is contained in:
parent
4f7824c58e
commit
c10c61449f
36 changed files with 511 additions and 458 deletions
|
@ -16,6 +16,7 @@
|
|||
namespace nix {
|
||||
|
||||
|
||||
class StoreAPI;
|
||||
class EvalState;
|
||||
|
||||
|
||||
|
@ -82,6 +83,8 @@ public:
|
|||
|
||||
Value vEmptySet;
|
||||
|
||||
const ref<StoreAPI> store;
|
||||
|
||||
private:
|
||||
SrcToStore srcToStore;
|
||||
|
||||
|
@ -97,7 +100,7 @@ private:
|
|||
|
||||
public:
|
||||
|
||||
EvalState(const Strings & _searchPath);
|
||||
EvalState(const Strings & _searchPath, ref<StoreAPI> store);
|
||||
~EvalState();
|
||||
|
||||
void addToSearchPath(const string & s, bool warn = false);
|
||||
|
@ -240,6 +243,8 @@ public:
|
|||
/* Print statistics. */
|
||||
void printStats();
|
||||
|
||||
void realiseContext(const PathSet & context);
|
||||
|
||||
private:
|
||||
|
||||
unsigned long nrEnvs = 0;
|
||||
|
@ -290,7 +295,4 @@ struct InvalidPathError : EvalError
|
|||
#endif
|
||||
};
|
||||
|
||||
/* Realise all paths in `context' */
|
||||
void realiseContext(const PathSet & context);
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue