nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-27 20:51:00 +01:00
Code Activity

State dirs/files to be versioned and state rights (user,grp,chmod) are now store in the db. Thuss we can remove their derivations at garbage collection time.

Browse source
This commit is contained in:
Wouter den Breejen 2007-10-18 17:45:31 +00:00
parent 2d84c9e50c
commit 53e31381fa
9 changed files with 282 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/libstore/build.cc
View file

@ -1889,9 +1889,8 @@ void DerivationGoal::computeClosure()
for (DerivationOutputs::iterator i = drv.outputs.begin();
i != drv.outputs.end(); ++i)
{
//Register the path as a store-state path
if(isStateDrvPathTxn(txn, drvPath))
setStateComponentTxn(txn, i->second.path);
setStateComponentTxn(txn, i->second.path); //Register the path as a store-state path
registerValidPath(txn,
i->second.path, //component path
@ -1919,6 +1918,27 @@ void DerivationGoal::computeClosure()
//Save the new revision
setStateRevisionsTxn(txn, rivisionMapping, statePath, "Initial build revision.");
//Convert stateInfo from drv to DB format
DerivationStateOutputDirs stateOutputDirs = drv.stateOutputDirs;
StateInfos infos;
for (DerivationStateOutputDirs::const_reverse_iterator j = stateOutputDirs.rbegin(); j != stateOutputDirs.rend(); ++j){
DerivationStateOutputDir d = j->second;
StateInfo si;
si.path = d.path;
si.type = d.type;
if(d.interval != ""){
bool succeed = string2UnsignedInt(d.interval, si.interval);
if(!succeed)
throw Error(format("Malformed interval value '%1%' in drv '%2%'") % d.interval % drvPath);
}
else
si.interval = 0;
infos.push_back(si);
}
setVersionedStateEntriesTxn(txn, statePath, infos); //register subdirs/files and their types of versioning
setStateUserGroupTxn(txn, statePath, queryCallingUsername(), "nixbld", 700); //register the user and group
//Shared state
Path sharedState = drv.stateOutputs.find("state")->second.sharedState;
@ -2598,7 +2618,7 @@ void Worker::getInfo()
args.push_back("--query-info");
args.insert(args.end(), paths2.begin(), paths2.end());
string res = runProgram(sub, false, args);
printMsg(lvlError, format("run: '%1%' res: '%2%'") % sub % res);
//printMsg(lvlError, format("run: '%1%' res: '%2%'") % sub % res);
std::istringstream str(res);
while (true) {
@ -2623,8 +2643,6 @@ void Worker::getInfo()
}
}
}
printMsg(lvlError, format("AAAAAAAAA: '%1%'") % store->isStateComponent("/nix/store/3pw7vmdwdf3ccx6h6i2w0j52ribjswzn-hellotest-1.0"));
}
}