mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1632 from AmineChikhaoui/sigint-copy

Browse source 
run query paths in parallel during nix copy and handle SIGINT
This commit is contained in:
Eelco Dolstra 2017-11-06 13:36:28 +01:00 committed by GitHub
commit dc30856141
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libstore/store-api.cc
View file

@ -389,8 +389,10 @@ PathSet Store::queryValidPaths(const PathSet & paths, SubstituteFlag maybeSubsti
Sync<State> state_(State{paths.size(), PathSet()}); Sync<State> state_(State{paths.size(), PathSet()});
std::condition_variable wakeup; std::condition_variable wakeup;
ThreadPool pool;
for (auto & path : paths) auto doQuery = [&](const Path & path ) {
checkInterrupt();
queryPathInfo(path, queryPathInfo(path,
[path, &state_, &wakeup](ref<ValidPathInfo> info) { [path, &state_, &wakeup](ref<ValidPathInfo> info) {
auto state(state_.lock()); auto state(state_.lock());
@ -411,6 +413,12 @@ PathSet Store::queryValidPaths(const PathSet & paths, SubstituteFlag maybeSubsti
if (!--state->left) if (!--state->left)
wakeup.notify_one(); wakeup.notify_one();
}); });
};
for (auto & path : paths)
pool.enqueue(std::bind(doQuery, path));
pool.process();
while (true) { while (true) {
auto state(state_.lock()); auto state(state_.lock());