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

Receive reserveSpace before calling startWork()

Browse source 
Otherwise we can get a SIGPOLL.  Reported by Ludovic.
This commit is contained in:
Eelco Dolstra 2012-08-22 10:58:24 -04:00
parent d950cfe70b
commit 4aa1e5c554
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/nix-worker/nix-worker.cc
View file

@ -619,6 +619,10 @@ static void processConnection()
to.flush(); to.flush();
unsigned int clientVersion = readInt(from); unsigned int clientVersion = readInt(from);
bool reserveSpace = true;
if (GET_PROTOCOL_MINOR(clientVersion) >= 11)
reserveSpace = readInt(from) != 0;
/* Send startup error messages to the client. */ /* Send startup error messages to the client. */
startWork(); startWork();
@ -634,10 +638,6 @@ static void processConnection()
throw Error("if you run `nix-worker' as root, then you MUST set `build-users-group'!"); throw Error("if you run `nix-worker' as root, then you MUST set `build-users-group'!");
#endif #endif
bool reserveSpace = true;
if (GET_PROTOCOL_MINOR(clientVersion) >= 11)
reserveSpace = readInt(from) != 0;
/* Open the store. */ /* Open the store. */
store = boost::shared_ptr<StoreAPI>(new LocalStore(reserveSpace)); store = boost::shared_ptr<StoreAPI>(new LocalStore(reserveSpace));