max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-10 00:08:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Path locking in addToStore() and expandPath().

Browse source
This commit is contained in:
Eelco Dolstra 2003-08-04 07:09:36 +00:00
parent c95b4ad290
commit d2e963f7a3
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/normalise.cc
View file

@ -86,7 +86,7 @@ FSId normaliseFState(FSId id, FSIdSet pending)
/* Obtain locks on all output paths. The locks are automatically
released when we exit this function or Nix crashes. */
PathLocks outputLock(pathsFromOutPaths(outPaths));
PathLocks outputLocks(pathsFromOutPaths(outPaths));
/* Now check again whether there is a successor. This is because
another process may have started building in parallel. After

15
src/store.cc
View file

@ -7,6 +7,7 @@
#include "globals.hh"
#include "db.hh"
#include "archive.hh"
#include "pathlocks.hh"
#include "normalise.hh"
@ -211,10 +212,19 @@ string expandId(const FSId & id, const string & target,
if (target.empty())
return path;
else {
/* Acquire a lock on the target path. */
Strings lockPaths;
lockPaths.push_back(target);
PathLocks outputLock(lockPaths);
/* Copy. */
copyPath(path, target);
/* Register the target path. */
Transaction txn(nixDB);
registerPath(txn, target, id);
txn.commit();
return target;
}
}
@ -265,7 +275,12 @@ void addToStore(string srcPath, string & dstPath, FSId & id,
} catch (...) {
}
Strings lockPaths;
lockPaths.push_back(dstPath);
PathLocks outputLock(lockPaths);
copyPath(srcPath, dstPath);
Transaction txn(nixDB);
registerPath(txn, dstPath, id);
txn.commit();