Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'singu/breakforce' into breakforce

Browse Source
This commit is contained in:
Aleric Inglewood
2012-08-07 16:19:20 +02:00
parent cc50e620c0 761439cc8d
commit 477c657f60
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/llmessage/aicurlthread.cpp
View File

@@ -911,12 +911,22 @@ void AICurlThread::create_wakeup_fds(void)
if (dumb_socketpair(socks, false) == SOCKET_ERROR) if (dumb_socketpair(socks, false) == SOCKET_ERROR)
{ {
llerrs << "Failed to generate wake-up socket pair" << formatWSAError() << llendl; llerrs << "Failed to generate wake-up socket pair" << formatWSAError() << llendl;
return;
} }
else u_long nonblocking_enable = TRUE;
int error = ioctlsocket(socks[0], FIONBIO, &nonblocking_enable);
if(error)
{ {
mWakeUpFd = socks[0]; llerrs << "Failed to set wake-up socket nonblocking: " << formatWSAError() << llendl;
mWakeUpFd_in = socks[1];
} }
llassert(nonblocking_enable);
error = ioctlsocket(socks[1], FIONBIO, &nonblocking_enable);
if(error)
{
llerrs << "Failed to set wake-up input socket nonblocking: " << formatWSAError() << llendl;
}
mWakeUpFd = socks[0];
mWakeUpFd_in = socks[1];
#else #else
int pipefd[2]; int pipefd[2];
if (pipe(pipefd)) if (pipe(pipefd))