diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2007-08-28 09:39:03 +0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2007-08-28 09:39:03 +0000 |
| commit | e0d7e47862aa1b33292fb8d05e5d50ad4ebf3590 (patch) | |
| tree | a5d96132410ba858faaea0352ef75c11c0a80091 | |
| parent | 455a7b95776440a56fd5d545d3b9a01cbae1d8e7 (diff) | |
* PathLocks::lockPaths: don't allow reacquiring a lock we already
hold.
| -rw-r--r-- | src/libstore/gc.cc | 4 | ||||
| -rw-r--r-- | src/libstore/pathlocks.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc index 8ce717aaf..e2e6c23fd 100644 --- a/src/libstore/gc.cc +++ b/src/libstore/gc.cc @@ -61,6 +61,8 @@ void createSymlink(const Path & link, const Path & target, bool careful) /* Create directories up to `gcRoot'. */ createDirs(dirOf(link)); + /* !!! shouldn't removing and creating the symlink be atomic? */ + /* Remove the old symlink. */ if (pathExists(link)) { if (careful && (!isLink(link) || !isInStore(readLink(link)))) @@ -68,7 +70,7 @@ void createSymlink(const Path & link, const Path & target, bool careful) unlink(link.c_str()); } - /* And create the new own. */ + /* And create the new one. */ if (symlink(target.c_str(), link.c_str()) == -1) throw SysError(format("symlinking `%1%' to `%2%'") % link % target); diff --git a/src/libstore/pathlocks.cc b/src/libstore/pathlocks.cc index 03ba4f212..821d4d02f 100644 --- a/src/libstore/pathlocks.cc +++ b/src/libstore/pathlocks.cc @@ -161,10 +161,8 @@ void PathLocks::lockPaths(const PathSet & _paths, const string & waitMsg) debug(format("locking path `%1%'") % path); - if (lockedPaths.find(lockPath) != lockedPaths.end()) { - debug(format("already holding lock on `%1%'") % lockPath); - continue; - } + if (lockedPaths.find(lockPath) != lockedPaths.end()) + throw Error("deadlock: trying to re-acquire self-held lock"); AutoCloseFD fd; |