chaostheorie/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #1358 from shlevy/store-nesting

Browse source 
Add Store nesting to fix import-from-derivation within filterSource
This commit is contained in:
Eelco Dolstra 2017-04-26 20:28:49 +02:00 committed by GitHub
parent 45ce2c7413 4bc00760f9
commit 39b08f4c0c
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/remote-store.cc
View file

@ -414,7 +414,9 @@ Path RemoteStore::addToStore(const string & name, const Path & _srcPath,
try {
conn->to.written = 0;
conn->to.warn = true;
connections->incCapacity();
dumpPath(srcPath, conn->to, filter);
connections->decCapacity();
conn->to.warn = false;
conn->processStderr();
} catch (SysError & e) {

16
src/libutil/pool.hh
View file

@ -68,6 +68,22 @@ public:
state_->max = max;
}
void incCapacity()
{
auto state_(state.lock());
state_->max++;
/* we could wakeup here, but this is only used when we're
* about to nest Pool usages, and we want to save the slot for
* the nested use if we can
*/
}
void decCapacity()
{
auto state_(state.lock());
state_->max--;
}
~Pool()
{
auto state_(state.lock());