lix-project/lix
20
55
Fork 31
Code Issues 345 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* Handle exceptions and stderr for all protocol functions.

Browse source 
* SIGIO -> SIGPOLL (POSIX calls it that).
* Use sigaction instead of signal to register the SIGPOLL handler.
  Sigaction is better defined, and a handler registered with signal
  appears not to interrupt fcntl(..., F_SETLKW, ...), which is bad.
This commit is contained in:
Eelco Dolstra 2006-12-04 17:55:14 +00:00
parent 0130ef88ea
commit 40c3529909
2 changed files with 64 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libstore/remote-store.cc
View file

@ -147,6 +147,7 @@ bool RemoteStore::isValidPath(const Path & path)
{
writeInt(wopIsValidPath, to);
writeString(path, to);
processStderr();
unsigned int reply = readInt(from);
return reply != 0;
}
@ -162,6 +163,7 @@ bool RemoteStore::hasSubstitutes(const Path & path)
{
writeInt(wopHasSubstitutes, to);
writeString(path, to);
processStderr();
unsigned int reply = readInt(from);
return reply != 0;
}
@ -171,6 +173,7 @@ Hash RemoteStore::queryPathHash(const Path & path)
{
writeInt(wopQueryPathHash, to);
writeString(path, to);
processStderr();
string hash = readString(from);
return parseHash(htSHA256, hash);
}
@ -181,6 +184,7 @@ void RemoteStore::queryReferences(const Path & path,
{
writeInt(wopQueryReferences, to);
writeString(path, to);
processStderr();
PathSet references2 = readStringSet(from);
references.insert(references2.begin(), references2.end());
}
@ -191,6 +195,7 @@ void RemoteStore::queryReferrers(const Path & path,
{
writeInt(wopQueryReferrers, to);
writeString(path, to);
processStderr();
PathSet referrers2 = readStringSet(from);
referrers.insert(referrers2.begin(), referrers2.end());
}
@ -207,6 +212,7 @@ Path RemoteStore::addToStore(const Path & _srcPath, bool fixed,
writeInt(recursive ? 1 : 0, to);
writeString(hashAlgo, to);
dumpPath(srcPath, to);
processStderr();
Path path = readString(from);
return path;
}
@ -220,6 +226,7 @@ Path RemoteStore::addTextToStore(const string & suffix, const string & s,
writeString(s, to);
writeStringSet(references, to);
processStderr();
Path path = readString(from);
return path;
}
@ -238,6 +245,7 @@ void RemoteStore::ensurePath(const Path & path)
{
writeInt(wopEnsurePath, to);
writeString(path, to);
processStderr();
readInt(from);
}
@ -246,6 +254,7 @@ void RemoteStore::addTempRoot(const Path & path)
{
writeInt(wopAddTempRoot, to);
writeString(path, to);
processStderr();
readInt(from);
}
@ -253,6 +262,7 @@ void RemoteStore::addTempRoot(const Path & path)
void RemoteStore::syncWithGC()
{
writeInt(wopSyncWithGC, to);
processStderr();
readInt(from);
}

73
src/nix-worker/main.cc
View file

@ -61,28 +61,39 @@ static void tunnelStderr(const unsigned char * buf, size_t count)
}
/* A SIGIO signal is received when data is available on the client
/* A SIGPOLL signal is received when data is available on the client
communication scoket, or when the client has closed its side of the
socket. This handler is enabled at precisely those moments in the
protocol when we're doing work and the client is supposed to be
quiet. Thus, if we get a SIGIO signal, it means that the client
quiet. Thus, if we get a SIGPOLL signal, it means that the client
has quit. So we should quit as well.
Too bad most operating systems don't support the POLL_HUP value for
si_code in siginfo_t. That would make most of the SIGIO complexity
unnecessary, i.e., we could just enable SIGIO all the time and
wouldn't have to worry about races. */
si_code in siginfo_t. That would make most of the SIGPOLL
complexity unnecessary, i.e., we could just enable SIGPOLL all the
time and wouldn't have to worry about races. */
static void sigioHandler(int sigNo)
{
if (!blockInt) {
_isInterrupted = 1;
blockInt = 1;
canSendStderr = false;
write(STDERR_FILENO, "SIGIO\n", 6);
write(STDERR_FILENO, "SIGPOLL\n", 8);
}
}
static void setSigPollAction(bool ignore)
{
struct sigaction act, oact;
act.sa_handler = ignore ? SIG_IGN : sigioHandler;
sigfillset(&act.sa_mask);
act.sa_flags = 0;
if (sigaction(SIGPOLL, &act, &oact))
throw SysError("setting handler for SIGPOLL");
}
/* startWork() means that we're starting an operation for which we
want to send out stderr to the client. */
static void startWork()
@ -90,13 +101,12 @@ static void startWork()
canSendStderr = true;
/* Handle client death asynchronously. */
if (signal(SIGIO, sigioHandler) == SIG_ERR)
throw SysError("setting handler for SIGIO");
setSigPollAction(false);
/* Of course, there is a race condition here: the socket could
have closed between when we last read from / wrote to it, and
between the time we set the handler for SIGIO. In that case we
won't get the signal. So do a non-blocking select() to find
between the time we set the handler for SIGPOLL. In that case
we won't get the signal. So do a non-blocking select() to find
out if any input is available on the socket. If there is, it
has to be the 0-byte read that indicates that the socket has
closed. */
@ -128,8 +138,7 @@ static void stopWork(bool success = true, const string & msg = "")
/* Stop handling async client death; we're going to a state where
we're either sending or receiving from the client, so we'll be
notified of client death anyway. */
if (signal(SIGIO, SIG_IGN) == SIG_ERR)
throw SysError("ignoring SIGIO");
setSigPollAction(true);
canSendStderr = false;
@ -157,30 +166,41 @@ static void performOp(Source & from, Sink & to, unsigned int op)
case wopIsValidPath: {
Path path = readStorePath(from);
writeInt(store->isValidPath(path), to);
startWork();
bool result = store->isValidPath(path);
stopWork();
writeInt(result, to);
break;
}
case wopHasSubstitutes: {
Path path = readStorePath(from);
writeInt(store->hasSubstitutes(path), to);
startWork();
bool result = store->hasSubstitutes(path);
stopWork();
writeInt(result, to);
break;
}
case wopQueryPathHash: {
Path path = readStorePath(from);
writeString(printHash(store->queryPathHash(path)), to);
startWork();
Hash hash = store->queryPathHash(path);
stopWork();
writeString(printHash(hash), to);
break;
}
case wopQueryReferences:
case wopQueryReferrers: {
Path path = readStorePath(from);
startWork();
PathSet paths;
if (op == wopQueryReferences)
store->queryReferences(path, paths);
else
store->queryReferrers(path, paths);
stopWork();
writeStringSet(paths, to);
break;
}
@ -196,7 +216,11 @@ static void performOp(Source & from, Sink & to, unsigned int op)
Path tmp2 = tmp + "/" + baseName;
restorePath(tmp2, from);
writeString(store->addToStore(tmp2, fixed, recursive, hashAlgo), to);
startWork();
Path path = store->addToStore(tmp2, fixed, recursive, hashAlgo);
stopWork();
writeString(path, to);
deletePath(tmp);
break;
@ -206,7 +230,10 @@ static void performOp(Source & from, Sink & to, unsigned int op)
string suffix = readString(from);
string s = readString(from);
PathSet refs = readStorePaths(from);
writeString(store->addTextToStore(suffix, s, refs), to);
startWork();
Path path = store->addTextToStore(suffix, s, refs);
stopWork();
writeString(path, to);
break;
}
@ -221,20 +248,26 @@ static void performOp(Source & from, Sink & to, unsigned int op)
case wopEnsurePath: {
Path path = readStorePath(from);
startWork();
store->ensurePath(path);
stopWork();
writeInt(1, to);
break;
}
case wopAddTempRoot: {
Path path = readStorePath(from);
startWork();
store->addTempRoot(path);
stopWork();
writeInt(1, to);
break;
}
case wopSyncWithGC: {
startWork();
store->syncWithGC();
stopWork();
writeInt(1, to);
break;
}
@ -250,8 +283,8 @@ static void processConnection()
canSendStderr = false;
writeToStderr = tunnelStderr;
/* Allow us to receive SIGIO for events on the client socket. */
signal(SIGIO, SIG_IGN);
/* Allow us to receive SIGPOLL for events on the client socket. */
setSigPollAction(true);
if (fcntl(from.fd, F_SETOWN, getpid()) == -1)
throw SysError("F_SETOWN");
if (fcntl(from.fd, F_SETFL, fcntl(from.fd, F_GETFL, 0) | FASYNC) == -1)
@ -301,6 +334,8 @@ static void processConnection()
} catch (Error & e) {
stopWork(false, e.msg());
}
assert(!canSendStderr);
};
printMsg(lvlError, format("%1% worker operations") % opCount);