summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authortycho <work.tycho@gmail.com>2015-12-19 22:48:19 +0100
committerMattes D <github@xoft.cz>2015-12-20 00:56:55 +0100
commitd4289eee3c0e282459ca0301efe15a475c6c5fda (patch)
tree30dd68a59171a856782cd5732d1527fdeec78cc0 /src
parentMerge pull request #2779 from cuberite/seadragon91-patch-clang-3.7 (diff)
downloadcuberite-d4289eee3c0e282459ca0301efe15a475c6c5fda.tar
cuberite-d4289eee3c0e282459ca0301efe15a475c6c5fda.tar.gz
cuberite-d4289eee3c0e282459ca0301efe15a475c6c5fda.tar.bz2
cuberite-d4289eee3c0e282459ca0301efe15a475c6c5fda.tar.lz
cuberite-d4289eee3c0e282459ca0301efe15a475c6c5fda.tar.xz
cuberite-d4289eee3c0e282459ca0301efe15a475c6c5fda.tar.zst
cuberite-d4289eee3c0e282459ca0301efe15a475c6c5fda.zip
Diffstat (limited to 'src')
-rw-r--r--src/SpawnPrepare.cpp2
-rw-r--r--src/SpawnPrepare.h4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/SpawnPrepare.cpp b/src/SpawnPrepare.cpp
index 9f1e645b1..ba9fc1117 100644
--- a/src/SpawnPrepare.cpp
+++ b/src/SpawnPrepare.cpp
@@ -119,7 +119,7 @@ void cSpawnPrepare::PreparedChunkCallback(int a_ChunkX, int a_ChunkZ)
float PercentDone = static_cast<float>(m_NumPrepared * 100) / m_MaxIdx;
float ChunkSpeed = static_cast<float>((m_NumPrepared - m_LastReportChunkCount) * 1000) / std::chrono::duration_cast<std::chrono::milliseconds>(Now - m_LastReportTime).count();
LOG("Preparing spawn (%s): %.02f%% (%d/%d; %.02f chunks / sec)",
- m_World.GetName().c_str(), PercentDone, m_NumPrepared, m_MaxIdx, ChunkSpeed
+ m_World.GetName().c_str(), PercentDone, m_NumPrepared.load(std::memory_order_seq_cst), m_MaxIdx, ChunkSpeed
);
m_LastReportTime = Now;
m_LastReportChunkCount = m_NumPrepared;
diff --git a/src/SpawnPrepare.h b/src/SpawnPrepare.h
index cc0da504e..3f4a3b377 100644
--- a/src/SpawnPrepare.h
+++ b/src/SpawnPrepare.h
@@ -1,6 +1,8 @@
#pragma once
+#include <atomic>
+
class cWorld;
@@ -25,7 +27,7 @@ protected:
int m_MaxIdx;
/** Total number of chunks already finished preparing. Preparation finishes when this number reaches m_MaxIdx. */
- int m_NumPrepared;
+ std::atomic<int> m_NumPrepared;
/** Event used to signal that the preparation is finished. */
cEvent m_EvtFinished;