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

Removed TimedWait from cEvent.

Browse Source 
Unsupported on MacOS.
This commit is contained in:
madmaxoft 2013-09-05 15:22:16 +02:00 committed by Tiger Wang
parent 7aabc1f5d8
commit a80be25c92
2 changed files with 0 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
source/OSSupport/Event.cpp
View File

@ -116,50 +116,3 @@ void cEvent::Set(void)
cEvent::eWaitResult cEvent::Wait(int a_TimeoutMilliSec)
{
#ifdef _WIN32
DWORD res = WaitForSingleObject(m_Event, (DWORD)a_TimeoutMilliSec);
switch (res)
{
case WAIT_OBJECT_0:
{
// The semaphore was signalled
return wrSignalled;
}
case WAIT_TIMEOUT:
{
// The timeout was hit
return wrTimeout;
}
default:
{
LOGWARNING("cEvent: timed-waiting for the event failed: %d, GLE = %d. Continuing, but server may be unstable.", res, GetLastError());
return wrError;
}
}
#else
timespec timeout;
timeout.tv_sec = time(NULL) + a_TimeoutMilliSec / 1000;
timeout.tv_nsec = (a_TimeoutMilliSec % 1000) * 1000000;
int res = sem_timedwait(m_Event, &timeout);
if (res == 0)
{
// 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
}

10
source/OSSupport/Event.h
View File

@ -19,22 +19,12 @@
class cEvent
{
public:
enum eWaitResult
{
wrSignalled,
wrTimeout,
wrError,
} ;
cEvent(void);
~cEvent();
void Wait(void);
void Set (void);
/// Waits for the semaphore with a timeout
eWaitResult Wait(int a_TimeoutMilliSec);
private:
#ifdef _WIN32