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

Migrated cSleep and cTimer to std::chrono

Browse Source
This commit is contained in:
Tiger Wang
2014-10-20 18:59:40 +01:00
parent aa19a3afb0
commit bde99d684e
18 changed files with 45 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/DeadlockDetect.cpp
View File

@@ -13,8 +13,8 @@
/// Number of milliseconds per cycle
const int CYCLE_MILLISECONDS = 100;
/** Number of milliseconds per cycle */
#define CYCLE_MILLISECONDS 100
@@ -87,7 +87,7 @@ void cDeadlockDetect::Execute(void)
} Checker(this);
cRoot::Get()->ForEachWorld(Checker);
cSleep::MilliSleep(CYCLE_MILLISECONDS);
std::this_thread::sleep_for(std::chrono::milliseconds(CYCLE_MILLISECONDS));
} // while (should run)
}
@@ -119,7 +119,7 @@ void cDeadlockDetect::CheckWorldAge(const AString & a_WorldName, Int64 a_Age)
if (WorldAge.m_Age == a_Age)
{
WorldAge.m_NumCyclesSame += 1;
if (WorldAge.m_NumCyclesSame > (1000 * m_IntervalSec) / CYCLE_MILLISECONDS)
if (WorldAge.m_NumCyclesSame > (m_IntervalSec * 1000) / CYCLE_MILLISECONDS)
{
DeadlockDetected();
}