Skip to content

Commit 4bc9ae6

Browse files
committed
Give DerivationBuilder a LocalStore not Store
This is just more honest, since we downcasted it to `LocalStore` in many places. We had the downcast before because it wasn't needed in the hook case, just the local building case, but now that `DerivationBuilder` is separated and just does the building case, we have formalized the boundary where the single downcast should occur.
1 parent 14e355d commit 4bc9ae6

File tree

6 files changed

+24
-34
lines changed

6 files changed

+24
-34
lines changed

src/libstore/build/derivation-building-goal.cc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,10 +673,13 @@ Goal::Co DerivationBuildingGoal::tryToBuild()
673673
}
674674
};
675675

676+
auto * localStoreP = dynamic_cast<LocalStore *>(&worker.store);
677+
assert(localStoreP);
678+
676679
/* If we have to wait and retry (see below), then `builder` will
677680
already be created, so we don't need to create it again. */
678681
builder = makeDerivationBuilder(
679-
worker.store,
682+
*localStoreP,
680683
std::make_unique<DerivationBuildingGoalCallbacks>(*this, builder),
681684
DerivationBuilderParams{
682685
drvPath,

src/libstore/unix/build/chroot-derivation-builder.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace nix {
55
struct ChrootDerivationBuilder : virtual DerivationBuilderImpl
66
{
77
ChrootDerivationBuilder(
8-
Store & store, std::unique_ptr<DerivationBuilderCallbacks> miscMethods, DerivationBuilderParams params)
8+
LocalStore & store, std::unique_ptr<DerivationBuilderCallbacks> miscMethods, DerivationBuilderParams params)
99
: DerivationBuilderImpl{store, std::move(miscMethods), std::move(params)}
1010
{
1111
}
@@ -178,7 +178,7 @@ struct ChrootDerivationBuilder : virtual DerivationBuilderImpl
178178
continue;
179179
if (buildMode != bmCheck && status.known->isValid())
180180
continue;
181-
auto p = store.toRealPath(status.known->path);
181+
auto p = store.Store::toRealPath(status.known->path);
182182
if (pathExists(chrootRootDir + p))
183183
std::filesystem::rename((chrootRootDir + p), p);
184184
}

src/libstore/unix/build/darwin-derivation-builder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ struct DarwinDerivationBuilder : DerivationBuilderImpl
2121
bool useSandbox;
2222

2323
DarwinDerivationBuilder(
24-
Store & store,
24+
LocalStore & store,
2525
std::unique_ptr<DerivationBuilderCallbacks> miscMethods,
2626
DerivationBuilderParams params,
2727
bool useSandbox)

src/libstore/unix/build/derivation-builder.cc

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ class DerivationBuilderImpl : public DerivationBuilder, public DerivationBuilder
6161
{
6262
protected:
6363

64-
Store & store;
64+
LocalStore & store;
6565

6666
std::unique_ptr<DerivationBuilderCallbacks> miscMethods;
6767

6868
public:
6969

7070
DerivationBuilderImpl(
71-
Store & store, std::unique_ptr<DerivationBuilderCallbacks> miscMethods, DerivationBuilderParams params)
71+
LocalStore & store, std::unique_ptr<DerivationBuilderCallbacks> miscMethods, DerivationBuilderParams params)
7272
: DerivationBuilderParams{std::move(params)}
7373
, store{store}
7474
, miscMethods{std::move(miscMethods)}
@@ -424,13 +424,6 @@ void handleDiffHook(
424424

425425
const Path DerivationBuilderImpl::homeDir = "/homeless-shelter";
426426

427-
static LocalStore & getLocalStore(Store & store)
428-
{
429-
auto p = dynamic_cast<LocalStore *>(&store);
430-
assert(p);
431-
return *p;
432-
}
433-
434427
void DerivationBuilderImpl::killSandbox(bool getStats)
435428
{
436429
if (buildUser) {
@@ -631,10 +624,9 @@ bool DerivationBuilderImpl::decideWhetherDiskFull()
631624
so, we don't mark this build as a permanent failure. */
632625
#if HAVE_STATVFS
633626
{
634-
auto & localStore = getLocalStore(store);
635627
uint64_t required = 8ULL * 1024 * 1024; // FIXME: make configurable
636628
struct statvfs st;
637-
if (statvfs(localStore.config->realStoreDir.get().c_str(), &st) == 0
629+
if (statvfs(store.config->realStoreDir.get().c_str(), &st) == 0
638630
&& (uint64_t) st.f_bavail * st.f_bsize < required)
639631
diskFull = true;
640632
if (statvfs(tmpDir.c_str(), &st) == 0 && (uint64_t) st.f_bavail * st.f_bsize < required)
@@ -712,7 +704,7 @@ void DerivationBuilderImpl::startBuilder()
712704
Magenta(drv.platform),
713705
concatStringsSep(", ", drvOptions.getRequiredSystemFeatures(drv)),
714706
Magenta(settings.thisSystem),
715-
concatStringsSep<StringSet>(", ", store.config.systemFeatures));
707+
concatStringsSep<StringSet>(", ", store.Store::config.systemFeatures));
716708

717709
// since aarch64-darwin has Rosetta 2, this user can actually run x86_64-darwin on their hardware - we should
718710
// tell them to run the command to install Darwin 2
@@ -724,7 +716,7 @@ void DerivationBuilderImpl::startBuilder()
724716
throw BuildError(msg);
725717
}
726718

727-
auto buildDir = getLocalStore(store).config->getBuildDir();
719+
auto buildDir = store.config->getBuildDir();
728720

729721
createDirs(buildDir);
730722

@@ -1173,7 +1165,7 @@ void DerivationBuilderImpl::startDaemon()
11731165

11741166
auto store = makeRestrictedStore(
11751167
[&] {
1176-
auto config = make_ref<LocalStore::Config>(*getLocalStore(this->store).config);
1168+
auto config = make_ref<LocalStore::Config>(*this->store.config);
11771169
config->pathInfoCacheSize = 0;
11781170
config->stateDir = "/no-such-path";
11791171
config->logDir = "/no-such-path";
@@ -1839,8 +1831,6 @@ SingleDrvOutputs DerivationBuilderImpl::registerOutputs()
18391831
}
18401832
}
18411833

1842-
auto & localStore = getLocalStore(store);
1843-
18441834
if (buildMode == bmCheck) {
18451835

18461836
if (!store.isValidPath(newInfo.path))
@@ -1876,8 +1866,8 @@ SingleDrvOutputs DerivationBuilderImpl::registerOutputs()
18761866
/* Since we verified the build, it's now ultimately trusted. */
18771867
if (!oldInfo.ultimate) {
18781868
oldInfo.ultimate = true;
1879-
localStore.signPathInfo(oldInfo);
1880-
localStore.registerValidPaths({{oldInfo.path, oldInfo}});
1869+
store.signPathInfo(oldInfo);
1870+
store.registerValidPaths({{oldInfo.path, oldInfo}});
18811871
}
18821872

18831873
continue;
@@ -1891,20 +1881,20 @@ SingleDrvOutputs DerivationBuilderImpl::registerOutputs()
18911881
debug("unreferenced input: '%1%'", store.printStorePath(i));
18921882
}
18931883

1894-
localStore.optimisePath(actualPath, NoRepair); // FIXME: combine with scanForReferences()
1884+
store.optimisePath(actualPath, NoRepair); // FIXME: combine with scanForReferences()
18951885
miscMethods->markContentsGood(newInfo.path);
18961886

18971887
newInfo.deriver = drvPath;
18981888
newInfo.ultimate = true;
1899-
localStore.signPathInfo(newInfo);
1889+
store.signPathInfo(newInfo);
19001890

19011891
finish(newInfo.path);
19021892

19031893
/* If it's a CA path, register it right away. This is necessary if it
19041894
isn't statically known so that we can safely unlock the path before
19051895
the next iteration */
19061896
if (newInfo.ca)
1907-
localStore.registerValidPaths({{newInfo.path, newInfo}});
1897+
store.registerValidPaths({{newInfo.path, newInfo}});
19081898

19091899
infos.emplace(outputName, std::move(newInfo));
19101900
}
@@ -1925,13 +1915,11 @@ SingleDrvOutputs DerivationBuilderImpl::registerOutputs()
19251915
paths referenced by each of them. If there are cycles in the
19261916
outputs, this will fail. */
19271917
{
1928-
auto & localStore = getLocalStore(store);
1929-
19301918
ValidPathInfos infos2;
19311919
for (auto & [outputName, newInfo] : infos) {
19321920
infos2.insert_or_assign(newInfo.path, newInfo);
19331921
}
1934-
localStore.registerValidPaths(infos2);
1922+
store.registerValidPaths(infos2);
19351923
}
19361924

19371925
/* In case of a fixed-output derivation hash mismatch, throw an
@@ -2164,7 +2152,7 @@ StorePath DerivationBuilderImpl::makeFallbackPath(const StorePath & path)
21642152
namespace nix {
21652153

21662154
std::unique_ptr<DerivationBuilder> makeDerivationBuilder(
2167-
Store & store, std::unique_ptr<DerivationBuilderCallbacks> miscMethods, DerivationBuilderParams params)
2155+
LocalStore & store, std::unique_ptr<DerivationBuilderCallbacks> miscMethods, DerivationBuilderParams params)
21682156
{
21692157
bool useSandbox = false;
21702158

@@ -2191,8 +2179,7 @@ std::unique_ptr<DerivationBuilder> makeDerivationBuilder(
21912179
useSandbox = params.drv.type().isSandboxed() && !params.drvOptions.noChroot;
21922180
}
21932181

2194-
auto & localStore = getLocalStore(store);
2195-
if (localStore.storeDir != localStore.config->realStoreDir.get()) {
2182+
if (store.storeDir != store.config->realStoreDir.get()) {
21962183
#ifdef __linux__
21972184
useSandbox = true;
21982185
#else

src/libstore/unix/build/linux-derivation-builder.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ struct ChrootLinuxDerivationBuilder : ChrootDerivationBuilder, LinuxDerivationBu
191191
std::optional<Path> cgroup;
192192

193193
ChrootLinuxDerivationBuilder(
194-
Store & store, std::unique_ptr<DerivationBuilderCallbacks> miscMethods, DerivationBuilderParams params)
194+
LocalStore & store, std::unique_ptr<DerivationBuilderCallbacks> miscMethods, DerivationBuilderParams params)
195195
: DerivationBuilderImpl{store, std::move(miscMethods), std::move(params)}
196196
, ChrootDerivationBuilder{store, std::move(miscMethods), std::move(params)}
197197
, LinuxDerivationBuilder{store, std::move(miscMethods), std::move(params)}
@@ -492,7 +492,7 @@ struct ChrootLinuxDerivationBuilder : ChrootDerivationBuilder, LinuxDerivationBu
492492
createDirs(chrootRootDir + "/dev/shm");
493493
createDirs(chrootRootDir + "/dev/pts");
494494
ss.push_back("/dev/full");
495-
if (store.config.systemFeatures.get().count("kvm") && pathExists("/dev/kvm"))
495+
if (store.Store::config.systemFeatures.get().count("kvm") && pathExists("/dev/kvm"))
496496
ss.push_back("/dev/kvm");
497497
ss.push_back("/dev/null");
498498
ss.push_back("/dev/random");

src/libstore/unix/include/nix/store/build/derivation-builder.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,6 @@ struct DerivationBuilder : RestrictionContext
179179
};
180180

181181
std::unique_ptr<DerivationBuilder> makeDerivationBuilder(
182-
Store & store, std::unique_ptr<DerivationBuilderCallbacks> miscMethods, DerivationBuilderParams params);
182+
LocalStore & store, std::unique_ptr<DerivationBuilderCallbacks> miscMethods, DerivationBuilderParams params);
183183

184184
} // namespace nix

0 commit comments

Comments
 (0)