From c10c61449f954702ae6d8092120321744acd82ff Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Feb 2016 14:28:26 +0100 Subject: Eliminate the "store" global variable Also, move a few free-standing functions into StoreAPI and Derivation. Also, introduce a non-nullable smart pointer, ref, 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.) --- src/libstore/store-api.cc | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/libstore/store-api.cc') diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc index f5035d3230fd..98399cc485f2 100644 --- a/src/libstore/store-api.cc +++ b/src/libstore/store-api.cc @@ -284,12 +284,12 @@ string showPaths(const PathSet & paths) } -void exportPaths(StoreAPI & store, const Paths & paths, +void StoreAPI::exportPaths(const Paths & paths, bool sign, Sink & sink) { for (auto & i : paths) { sink << 1; - store.exportPath(i, sign, sink); + exportPath(i, sign, sink); } sink << 0; } @@ -306,10 +306,7 @@ void exportPaths(StoreAPI & store, const Paths & paths, namespace nix { -std::shared_ptr store; - - -std::shared_ptr openStore(bool reserveSpace) +ref openStore(bool reserveSpace) { enum { mDaemon, mLocal, mAuto } mode; @@ -325,8 +322,8 @@ std::shared_ptr openStore(bool reserveSpace) } return mode == mDaemon - ? (std::shared_ptr) std::make_shared() - : std::make_shared(reserveSpace); + ? make_ref() + : make_ref(reserveSpace); } -- cgit 1.4.1