Archives/ohwgiles_laminar
1
0
Fork 0
mirror of https://github.com/ohwgiles/laminar.git synced 2024-10-27 20:34:20 +00:00
Code Issues Projects Releases Wiki Activity

give capnp ownership of process output fd

Browse Source 
this fixes an intermittent issue (race condition?) where
the IoContext attempts to poll an already-closed fd
This commit is contained in:
Oliver Giles 2017-07-31 08:53:50 +03:00
parent 668ada74d1
commit 3068180f8e
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/laminar.cpp
View File

@ -518,7 +518,6 @@ void Laminar::reapAdvance() {
std::shared_ptr<Run> run = *it; std::shared_ptr<Run> run = *it;
bool completed = true; bool completed = true;
activeJobs.get<0>().modify(it, [&](std::shared_ptr<Run> run){ activeJobs.get<0>().modify(it, [&](std::shared_ptr<Run> run){
close(run->fd);
run->reaped(ret); run->reaped(ret);
completed = stepRun(run); completed = stepRun(run);
}); });

2
src/server.cpp
View File

@ -389,7 +389,7 @@ void Server::stop() {
} }
void Server::addDescriptor(int fd, std::function<void(char*,size_t)> cb) { void Server::addDescriptor(int fd, std::function<void(char*,size_t)> cb) {
auto event = this->ioContext.lowLevelProvider->wrapInputFd(fd); auto event = this->ioContext.lowLevelProvider->wrapInputFd(fd, kj::LowLevelAsyncIoProvider::TAKE_OWNERSHIP);
tasks.add(handleFdRead(event, cb).attach(std::move(event))); tasks.add(handleFdRead(event, cb).attach(std::move(event)));
} }