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

openLockFile: Return an AutoCloseFD

Browse source
This commit is contained in:
Eelco Dolstra 2017-01-25 12:51:35 +01:00
parent c0f2f4eeef
commit a55f589720
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/build-remote/build-remote.cc
View file

@ -109,7 +109,7 @@ static std::vector<machine> read_conf()
static string currentLoad; static string currentLoad;
static int openSlotLock(const machine & m, unsigned long long slot) static AutoCloseFD openSlotLock(const machine & m, unsigned long long slot)
{ {
std::ostringstream fn_stream(currentLoad, std::ios_base::ate | std::ios_base::out); std::ostringstream fn_stream(currentLoad, std::ios_base::ate | std::ios_base::out);
fn_stream << "/"; fn_stream << "/";
@ -187,7 +187,7 @@ int main (int argc, char * * argv)
AutoCloseFD free; AutoCloseFD free;
unsigned long long load = 0; unsigned long long load = 0;
for (unsigned long long slot = 0; slot < m.maxJobs; ++slot) { for (unsigned long long slot = 0; slot < m.maxJobs; ++slot) {
AutoCloseFD slotLock = openSlotLock(m, slot); auto slotLock = openSlotLock(m, slot);
if (lockFile(slotLock.get(), ltWrite, false)) { if (lockFile(slotLock.get(), ltWrite, false)) {
if (!free) { if (!free) {
free = std::move(slotLock); free = std::move(slotLock);

4
src/libstore/pathlocks.cc
View file

@ -13,7 +13,7 @@
namespace nix { namespace nix {
int openLockFile(const Path & path, bool create) AutoCloseFD openLockFile(const Path & path, bool create)
{ {
AutoCloseFD fd; AutoCloseFD fd;
@ -21,7 +21,7 @@ int openLockFile(const Path & path, bool create)
if (!fd && (create || errno != ENOENT)) if (!fd && (create || errno != ENOENT))
throw SysError(format("opening lock file ‘%1%’") % path); throw SysError(format("opening lock file ‘%1%’") % path);
return fd.release(); return fd;
} }

6
src/libstore/pathlocks.hh
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "types.hh" #include "util.hh"
namespace nix { namespace nix {
@ -9,7 +9,7 @@ namespace nix {
/* Open (possibly create) a lock file and return the file descriptor. /* Open (possibly create) a lock file and return the file descriptor.
-1 is returned if create is false and the lock could not be opened -1 is returned if create is false and the lock could not be opened
because it doesn't exist. Any other error throws an exception. */ because it doesn't exist. Any other error throws an exception. */
int openLockFile(const Path & path, bool create); AutoCloseFD openLockFile(const Path & path, bool create);
/* Delete an open lock file. */ /* Delete an open lock file. */
void deleteLockFile(const Path & path, int fd); void deleteLockFile(const Path & path, int fd);
@ -19,7 +19,7 @@ enum LockType { ltRead, ltWrite, ltNone };
bool lockFile(int fd, LockType lockType, bool wait); bool lockFile(int fd, LockType lockType, bool wait);
class PathLocks class PathLocks
{ {
private: private:
typedef std::pair<int, Path> FDPair; typedef std::pair<int, Path> FDPair;