flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed timed event wait on Linux.

Browse Source 
Was causing an error message and the DeadlockDetect didn't work.
This commit is contained in:
madmaxoft 2013-08-19 10:51:18 +02:00
parent 493100bdb0
commit 539ae20466
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source/OSSupport/Event.cpp
View File

@ -144,24 +144,19 @@ cEvent::eWaitResult cEvent::Wait(int a_TimeoutMilliSec)
timeout.tv_sec = a_TimeoutMilliSec / 1000;
timeout.tv_nsec = (a_TimeoutMilliSec % 1000) * 1000000;
int res = sem_timedwait(m_Event, &timeout);
switch (res)
if (res == 0)
{
case 0:
{
// The semaphore was signalled
return wrSignalled;
}
case ETIMEDOUT:
{
// The timeout was hit
return wrTimeout;
}
default:
{
LOGWARNING("cEvent: timed-waiting for the event failed: %i, errno = %i. Continuing, but server may be unstable.", res, errno);
return wrError;
}
// The semaphore was signalled
return wrSignalled;
}
int err = errno;
if (err == ETIMEDOUT)
{
// The timeout was hit
return wrTimeout;
}
LOGWARNING("cEvent: timed-waiting for the event failed: %i, errno = %i. Continuing, but server may be unstable.", res, err);
return wrError;
#endif
}