guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: asyncify some internal functions for later

Browse Source 
Change-Id: I288a5179694735b23675044f319924d638617109
This commit is contained in:
eldritch horrors
2025-01-24 18:20:44 +01:00
parent ca68979174
commit cb0fc85645
2 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lix/legacy/nix-store.cc
+22 -18
View File
@@ -61,8 +61,8 @@ static StorePath useDeriver(const StorePath & path)
/* Realise the given path. For a derivation that means build it; for
other paths it means ensure their validity. */
static PathSet realisePath(StorePathWithOutputs path, bool build = true)
{
static kj::Promise<Result<PathSet>> realisePath(StorePathWithOutputs path, bool build = true)
try {
auto store2 = std::dynamic_pointer_cast<LocalFSStore>(store);
if (path.path.isDerivation()) {
@@ -96,7 +96,7 @@ static PathSet realisePath(StorePathWithOutputs path, bool build = true)
}
outputs.insert(retPath);
}
return outputs;
co_return outputs;
}
else {
@@ -110,11 +110,13 @@ static PathSet realisePath(StorePathWithOutputs path, bool build = true)
Path rootName = gcRoot;
rootNr++;
if (rootNr > 1) rootName += "-" + std::to_string(rootNr);
return {store2->addPermRoot(path.path, rootName)};
co_return PathSet{store2->addPermRoot(path.path, rootName)};
}
}
return {store->printStorePath(path.path)};
co_return PathSet{store->printStorePath(path.path)};
}
} catch (...) {
co_return result::current_exception();
}
@@ -161,7 +163,7 @@ static void opRealise(AsyncIoRoot & aio, Strings opFlags, Strings opArgs)
if (!ignoreUnknown)
for (auto & i : paths) {
auto paths2 = realisePath(i, false);
auto paths2 = aio.blockOn(realisePath(i, false));
if (!noOutput)
for (auto & j : paths2)
cout << fmt("%1%\n", j);
@@ -225,22 +227,24 @@ static void opPrintFixedPath(AsyncIoRoot & aio, Strings opFlags, Strings opArgs)
}
static StorePathSet maybeUseOutputs(const StorePath & storePath, bool useOutput, bool forceRealise)
{
if (forceRealise) realisePath({storePath});
static kj::Promise<Result<StorePathSet>> maybeUseOutputs(const StorePath & storePath, bool useOutput, bool forceRealise)
try {
if (forceRealise) TRY_AWAIT(realisePath({storePath}));
if (useOutput && storePath.isDerivation()) {
auto drv = store->derivationFromPath(storePath);
StorePathSet outputs;
if (forceRealise)
return store->queryDerivationOutputs(storePath);
co_return store->queryDerivationOutputs(storePath);
for (auto & i : drv.outputsAndOptPaths(*store)) {
if (!i.second.second)
throw UsageError("Cannot use output path of floating content-addressed derivation until we know what it is (e.g. by building it)");
outputs.insert(*i.second.second);
}
return outputs;
co_return outputs;
}
else return {storePath};
else co_return StorePathSet{storePath};
} catch (...) {
co_return result::current_exception();
}
@@ -328,7 +332,7 @@ static void opQuery(AsyncIoRoot & aio, Strings opFlags, Strings opArgs)
case qOutputs: {
for (auto & i : opArgs) {
auto outputs = maybeUseOutputs(store->followLinksToStorePath(i), true, forceRealise);
auto outputs = aio.blockOn(maybeUseOutputs(store->followLinksToStorePath(i), true, forceRealise));
for (auto & outputPath : outputs)
cout << fmt("%1%\n", store->printStorePath(outputPath));
}
@@ -341,7 +345,7 @@ static void opQuery(AsyncIoRoot & aio, Strings opFlags, Strings opArgs)
case qReferrersClosure: {
StorePathSet paths;
for (auto & i : opArgs) {
auto ps = maybeUseOutputs(store->followLinksToStorePath(i), useOutput, forceRealise);
auto ps = aio.blockOn(maybeUseOutputs(store->followLinksToStorePath(i), useOutput, forceRealise));
for (auto & j : ps) {
if (query == qRequisites) store->computeFSClosure(j, paths, false, includeOutputs);
else if (query == qReferences) {
@@ -401,7 +405,7 @@ static void opQuery(AsyncIoRoot & aio, Strings opFlags, Strings opArgs)
case qHash:
case qSize:
for (auto & i : opArgs) {
for (auto & j : maybeUseOutputs(store->followLinksToStorePath(i), useOutput, forceRealise)) {
for (auto & j : aio.blockOn(maybeUseOutputs(store->followLinksToStorePath(i), useOutput, forceRealise))) {
auto info = store->queryPathInfo(j);
if (query == qHash) {
assert(info->narHash.type == HashType::SHA256);
@@ -422,7 +426,7 @@ static void opQuery(AsyncIoRoot & aio, Strings opFlags, Strings opArgs)
case qGraph: {
StorePathSet roots;
for (auto & i : opArgs)
for (auto & j : maybeUseOutputs(store->followLinksToStorePath(i), useOutput, forceRealise))
for (auto & j : aio.blockOn(maybeUseOutputs(store->followLinksToStorePath(i), useOutput, forceRealise)))
roots.insert(j);
printDotGraph(ref<Store>(store), std::move(roots));
break;
@@ -431,7 +435,7 @@ static void opQuery(AsyncIoRoot & aio, Strings opFlags, Strings opArgs)
case qGraphML: {
StorePathSet roots;
for (auto & i : opArgs)
for (auto & j : maybeUseOutputs(store->followLinksToStorePath(i), useOutput, forceRealise))
for (auto & j : aio.blockOn(maybeUseOutputs(store->followLinksToStorePath(i), useOutput, forceRealise)))
roots.insert(j);
printGraphML(ref<Store>(store), std::move(roots));
break;
@@ -446,7 +450,7 @@ static void opQuery(AsyncIoRoot & aio, Strings opFlags, Strings opArgs)
case qRoots: {
StorePathSet args;
for (auto & i : opArgs)
for (auto & p : maybeUseOutputs(store->followLinksToStorePath(i), useOutput, forceRealise))
for (auto & p : aio.blockOn(maybeUseOutputs(store->followLinksToStorePath(i), useOutput, forceRealise)))
args.insert(p);
StorePathSet referrers;
lix/nix/develop.cc
+6 -4
View File
@@ -209,8 +209,8 @@ const static std::string getEnvSh =
modified derivation with the same dependencies and nearly the same
initial environment variables, that just writes the resulting
environment to a file and exits. */
static StorePath getDerivationEnvironment(ref<Store> store, ref<Store> evalStore, const StorePath & drvPath)
{
static kj::Promise<Result<StorePath>> getDerivationEnvironment(ref<Store> store, ref<Store> evalStore, const StorePath & drvPath)
try {
auto drv = evalStore->derivationFromPath(drvPath);
auto builder = baseNameOf(drv.builder);
@@ -271,10 +271,12 @@ static StorePath getDerivationEnvironment(ref<Store> store, ref<Store> evalStore
assert(store->isValidPath(outPath));
auto outPathS = store->toRealPath(outPath);
if (lstat(outPathS).st_size)
return outPath;
co_return outPath;
}
throw Error("get-env.sh failed to produce an environment");
} catch (...) {
co_return result::current_exception();
}
struct Common : InstallableCommand, MixProfile
@@ -453,7 +455,7 @@ struct Common : InstallableCommand, MixProfile
auto & drvPath = *drvs.begin();
return getDerivationEnvironment(store, getEvalStore(), drvPath);
return state.aio.blockOn(getDerivationEnvironment(store, getEvalStore(), drvPath));
}
}