zhenyan121/Cubed
1
0
Fork 0
mirror of https://github.com/zhenyan121/Cubed.git synced 2026-06-17 16:17:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: data race in world::init_world()

Browse Source
This commit is contained in:
zhenyan121
2026-04-18 15:14:11 +08:00
parent 11b6e88d0d
commit de4df4b476
6 changed files with 71 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -107,12 +107,14 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
target_compile_options(${PROJECT_NAME} PRIVATE
-fsanitize=address
#-fsanitize=thread
-fno-omit-frame-pointer
-g
)
target_link_options(${PROJECT_NAME} PRIVATE
-fsanitize=address
#-fsanitize=thread
)
target_compile_definitions(${PROJECT_NAME} PRIVATE DEBUG_MODE)

5
include/Cubed/tools/cubed_random.hpp
View File

@@ -4,8 +4,8 @@ namespace Cubed {
class Random {
public:
Random();
static unsigned get_base_seed();
static unsigned get_thread_seed();
static Random& get();
bool random_bool(double probability);
@@ -13,6 +13,7 @@ public:
unsigned seed();
private:
Random();
unsigned int m_seed = 0;
std::mt19937 m_engine;
};

23
include/Cubed/tools/log.hpp
View File

@@ -1,4 +1,5 @@
#pragma once
#include <syncstream>
#include <iostream>
#include <chrono>
#include <format>
@@ -21,11 +22,11 @@ namespace Logger {
(std::chrono::system_clock::now());
std::string msg = std::vformat(fmt.get(), std::make_format_args(args...));
std::cout << "\033[1;32m"
std::osyncstream(std::cout) << "\033[1;32m"
<< std::format("[INFO][{:%Y-%m-%d %H:%M:%S}]", now_time)
<< msg
<< "\033[0m"
<< std::endl;
<< "\n";
}
template<typename... Args>
@@ -34,11 +35,11 @@ namespace Logger {
time_point_cast<std::chrono::seconds>
(std::chrono::system_clock::now());
std::string msg = std::vformat(fmt.get(), std::make_format_args(args...));
std::cerr << "\033[1;31m"
std::osyncstream(std::cerr) << "\033[1;31m"
<< std::format("[ERROR][{:%Y-%m-%d %H:%M:%S}]", now_time)
<< msg
<< "\033[0m"
<< std::endl;
<< "\n";
}
@@ -48,11 +49,11 @@ namespace Logger {
time_point_cast<std::chrono::seconds>
(std::chrono::system_clock::now());
std::string msg = std::vformat(fmt.get(), std::make_format_args(args...));
std::cout << "\033[1;33m"
std::osyncstream(std::cout) << "\033[1;33m"
<< std::format("[WARN][{:%Y-%m-%d %H:%M:%S}]", now_time)
<< msg
<< "\033[0m"
<< std::endl;
<< "\n";
}
template<typename... Args>
@@ -63,7 +64,7 @@ namespace Logger {
std::string msg = std::vformat(fmt.get(), std::make_format_args(args...));
switch (level) {
case Logger::Level::TRACE:
std::cout << "\033[1;34m"
std::osyncstream(std::cout) << "\033[1;34m"
<< std::format("[TRACE][{:%Y-%m-%d %H:%M:%S}]", now_time)
<< "[" << loc.file_name() << ":" << loc.line() << "]"
<< "[" << loc.function_name() << "]"
@@ -72,20 +73,20 @@ namespace Logger {
<< "\n";
break;
case Logger::Level::DEBUG:
std::cout << "\033[1;34m"
std::osyncstream(std::cout) << "\033[1;34m"
<< std::format("[DEBUG][{:%Y-%m-%d %H:%M:%S}]", now_time)
<< msg
<< "\033[0m"
<< "\n";
break;
case Logger::Level::INFO:
info(fmt, std::forward<Args...>(args)...);
info(fmt, std::forward<Args>(args)...);
break;
case Logger::Level::WARN:
warn(fmt, std::forward<Args...>(args)...);
warn(fmt, std::forward<Args>(args)...);
break;
case Logger::Level::ERROR:
error(fmt, std::forward<Args...>(args)...);
error(fmt, std::forward<Args>(args)...);
break;
}

30
src/gameplay/world.cpp
View File

@@ -106,11 +106,22 @@ void World::init_world() {
chunk.gen_vertex_data(neighbor_block);
}
*/
std::for_each(std::execution::par, m_chunks.begin(), m_chunks.end(), [](auto& chunk_map){
auto& [chunk_pos, chunk] = chunk_map;
chunk.init_chunk();
std::vector<Chunk*> chunk_ptrs;
chunk_ptrs.reserve(m_chunks.size());
for (auto& [pos, chunk] : m_chunks) {
chunk_ptrs.push_back(&chunk);
}
std::for_each(std::execution::par, chunk_ptrs.begin(), chunk_ptrs.end(), [](auto& chunk){
chunk->init_chunk();
});
std::atomic<int> sync{0};
sync.store(1, std::memory_order_release);
sync.load(std::memory_order_acquire);
std::vector<ChunkRenderData> pending_gen_data;
pending_gen_data.reserve(m_chunks.size());
for (auto& [pos, chunk] : m_chunks) {
ChunkRenderData data;
data.chunk = &chunk;
@@ -239,7 +250,7 @@ void World::gen_chunks_internal() {
new_chunks.push_back({pos, Chunk(*this, pos)});
}
std::unordered_map<ChunkPos, const Chunk&, ChunkPos::Hash> neighbor;
std::unordered_map<ChunkPos, const Chunk*, ChunkPos::Hash> neighbor;
{
std::lock_guard lk(m_chunks_mutex);
@@ -247,7 +258,7 @@ void World::gen_chunks_internal() {
for (const auto& dir : CHUNK_DIR) {
auto it = m_chunks.find(pos + dir);
if (it != m_chunks.end()) {
neighbor.insert({it->first, (it->second)});
neighbor.insert({it->first, &(it->second)});
}
}
}
@@ -258,7 +269,7 @@ void World::gen_chunks_internal() {
for (auto& [pos, chunk] : new_chunks) {
chunk.init_chunk();
neighbor.insert({pos, chunk});
neighbor.insert({pos, &chunk});
}
@@ -266,7 +277,7 @@ void World::gen_chunks_internal() {
for (int i = 0; i < 4; i++) {
auto it = neighbor.find(pos + CHUNK_DIR[i]);
if (it != neighbor.end()) {
neighbor_block[i] = &(it->second.get_chunk_blocks());
neighbor_block[i] = &(it->second->get_chunk_blocks());
} else {
neighbor_block[i] = nullptr;
}
@@ -340,7 +351,7 @@ bool World::is_aabb_in_frustum(const glm::vec3& center, const glm::vec3& half_ex
int World::get_block(const glm::ivec3& block_pos) const {
auto [chunk_x, chunk_z] = chunk_pos(block_pos.x, block_pos.z);
std::lock_guard lk(m_chunks_mutex);
auto it = m_chunks.find(ChunkPos{chunk_x, chunk_z});
if (it == m_chunks.end()) {
@@ -361,6 +372,7 @@ int World::get_block(const glm::ivec3& block_pos) const {
bool World::is_block(const glm::ivec3& block_pos) const{
auto [chunk_x, chunk_z] = chunk_pos(block_pos.x, block_pos.z);
std::lock_guard lk(m_chunks_mutex);
auto it = m_chunks.find(ChunkPos{chunk_x, chunk_z});
if (it == m_chunks.end()) {
@@ -390,7 +402,7 @@ void World::set_block(const glm::ivec3& block_pos, unsigned id) {
world_z = block_pos.z;
auto [chunk_x, chunk_z] = chunk_pos(world_x, world_z);
std::lock_guard lk(m_chunks_mutex);
auto it = m_chunks.find(ChunkPos{chunk_x, chunk_z});
if (it == m_chunks.end()) {

21
src/tools/cubed_random.cpp
View File

@@ -2,17 +2,32 @@
#include <Cubed/tools/log.hpp>
#include <atomic>
namespace Cubed {
unsigned Random::get_base_seed() {
static unsigned base = [] {
std::random_device rd;
return rd();
}();
return base;
}
unsigned Random::get_thread_seed() {
static std::atomic<unsigned> counter{0};
thread_local static unsigned seed = get_base_seed() + counter.fetch_add(1);
return seed;
}
Random::Random() {
std::random_device d;
m_seed = d();
m_seed = get_thread_seed();
Logger::info("Seed: {}", m_seed);
m_engine.seed(m_seed);
}
Random& Random::get() {
static Random instance;
thread_local Random instance;
return instance;
}

15
tsan.supp Normal file
View File

@@ -0,0 +1,15 @@
# tsan.supp
race:g_queue_pop_tail
race:g_strsplit
race:g_variant_type_info_get
race:g_rec_mutex_lock
race:libgallium
race:libEGL_mesa
race:libglib-2.0
race:libglycin-2
race:tbb::detail::d1::fold_tree
race:libgio-2.0
race:libtbb
race:tbb::detail
race:libpangoft2
race:libfontconfig