summaryrefslogtreecommitdiffstats
path: root/src/DeadlockDetect.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-12-07 15:01:36 +0100
committerMattes D <github@xoft.cz>2014-12-07 15:01:36 +0100
commitd00ebd7ee700fcd7f30ea27d238ba1f0d56dfe21 (patch)
treeb0dbd8a8396ad22cf77cb4b367295d25ad3055a7 /src/DeadlockDetect.cpp
parentReduced river height (diff)
parentMerge remote-tracking branch 'origin/master' into c++11 (diff)
downloadcuberite-d00ebd7ee700fcd7f30ea27d238ba1f0d56dfe21.tar
cuberite-d00ebd7ee700fcd7f30ea27d238ba1f0d56dfe21.tar.gz
cuberite-d00ebd7ee700fcd7f30ea27d238ba1f0d56dfe21.tar.bz2
cuberite-d00ebd7ee700fcd7f30ea27d238ba1f0d56dfe21.tar.lz
cuberite-d00ebd7ee700fcd7f30ea27d238ba1f0d56dfe21.tar.xz
cuberite-d00ebd7ee700fcd7f30ea27d238ba1f0d56dfe21.tar.zst
cuberite-d00ebd7ee700fcd7f30ea27d238ba1f0d56dfe21.zip
Diffstat (limited to 'src/DeadlockDetect.cpp')
-rw-r--r--src/DeadlockDetect.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/DeadlockDetect.cpp b/src/DeadlockDetect.cpp
index 7f703416c..3bb897221 100644
--- a/src/DeadlockDetect.cpp
+++ b/src/DeadlockDetect.cpp
@@ -13,7 +13,7 @@
-/// Number of milliseconds per cycle
+/** Number of milliseconds per cycle */
const int 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();
}