blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 10:30:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add mutexes to marker manager

Browse source
This commit is contained in:
AdenKoperczak 2024-10-17 17:50:17 -04:00
parent a8845514c6
commit ee998232f7
1 changed files with 73 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

19
scwx-qt/source/scwx/qt/manager/marker_manager.cpp
View file

@ -5,6 +5,7 @@
#include <scwx/util/logger.hpp> #include <scwx/util/logger.hpp>
#include <filesystem> #include <filesystem>
#include <shared_mutex>
#include <vector> #include <vector>
#include <string> #include <string>
@ -41,6 +42,7 @@ public:
MarkerManager* self_; MarkerManager* self_;
boost::asio::thread_pool threadPool_ {1u}; boost::asio::thread_pool threadPool_ {1u};
std::shared_mutex markerRecordLock_ {};
void InitializeMarkerSettings(); void InitializeMarkerSettings();
void ReadMarkerSettings(); void ReadMarkerSettings();
@ -109,6 +111,8 @@ void MarkerManager::Impl::ReadMarkerSettings()
logger_->info("Reading location marker settings"); logger_->info("Reading location marker settings");
boost::json::value markerJson = nullptr; boost::json::value markerJson = nullptr;
{
std::unique_lock lock(markerRecordLock_);
// Determine if marker settings exists // Determine if marker settings exists
if (std::filesystem::exists(markerSettingsPath_)) if (std::filesystem::exists(markerSettingsPath_))
@ -142,6 +146,7 @@ void MarkerManager::Impl::ReadMarkerSettings()
logger_->debug("{} location marker entries", markerRecords_.size()); logger_->debug("{} location marker entries", markerRecords_.size());
} }
}
Q_EMIT self_->MarkersUpdated(); Q_EMIT self_->MarkersUpdated();
} }
@ -150,6 +155,7 @@ void MarkerManager::Impl::WriteMarkerSettings()
{ {
logger_->info("Saving location marker settings"); logger_->info("Saving location marker settings");
std::shared_lock lock(markerRecordLock_);
auto markerJson = boost::json::value_from(markerRecords_); auto markerJson = boost::json::value_from(markerRecords_);
util::json::WriteJsonFile(markerSettingsPath_, markerJson); util::json::WriteJsonFile(markerSettingsPath_, markerJson);
} }
@ -203,6 +209,7 @@ size_t MarkerManager::marker_count()
std::optional<types::MarkerInfo> MarkerManager::get_marker(size_t index) std::optional<types::MarkerInfo> MarkerManager::get_marker(size_t index)
{ {
std::shared_lock lock(p->markerRecordLock_);
if (index >= p->markerRecords_.size()) if (index >= p->markerRecords_.size())
{ {
return {}; return {};
@ -214,6 +221,8 @@ std::optional<types::MarkerInfo> MarkerManager::get_marker(size_t index)
void MarkerManager::set_marker(size_t index, const types::MarkerInfo& marker) void MarkerManager::set_marker(size_t index, const types::MarkerInfo& marker)
{ {
{
std::unique_lock lock(p->markerRecordLock_);
if (index >= p->markerRecords_.size()) if (index >= p->markerRecords_.size())
{ {
return; return;
@ -221,25 +230,32 @@ void MarkerManager::set_marker(size_t index, const types::MarkerInfo& marker)
std::shared_ptr<MarkerManager::Impl::MarkerRecord>& markerRecord = std::shared_ptr<MarkerManager::Impl::MarkerRecord>& markerRecord =
p->markerRecords_[index]; p->markerRecords_[index];
markerRecord->markerInfo_ = marker; markerRecord->markerInfo_ = marker;
}
Q_EMIT MarkerChanged(index); Q_EMIT MarkerChanged(index);
Q_EMIT MarkersUpdated(); Q_EMIT MarkersUpdated();
} }
void MarkerManager::add_marker(const types::MarkerInfo& marker) void MarkerManager::add_marker(const types::MarkerInfo& marker)
{ {
{
std::unique_lock lock(p->markerRecordLock_);
p->markerRecords_.emplace_back(std::make_shared<Impl::MarkerRecord>(marker)); p->markerRecords_.emplace_back(std::make_shared<Impl::MarkerRecord>(marker));
}
Q_EMIT MarkerAdded(); Q_EMIT MarkerAdded();
Q_EMIT MarkersUpdated(); Q_EMIT MarkersUpdated();
} }
void MarkerManager::remove_marker(size_t index) void MarkerManager::remove_marker(size_t index)
{ {
{
std::unique_lock lock(p->markerRecordLock_);
if (index >= p->markerRecords_.size()) if (index >= p->markerRecords_.size())
{ {
return; return;
} }
p->markerRecords_.erase(std::next(p->markerRecords_.begin(), index)); p->markerRecords_.erase(std::next(p->markerRecords_.begin(), index));
}
Q_EMIT MarkerRemoved(index); Q_EMIT MarkerRemoved(index);
Q_EMIT MarkersUpdated(); Q_EMIT MarkersUpdated();
@ -247,6 +263,8 @@ void MarkerManager::remove_marker(size_t index)
void MarkerManager::move_marker(size_t from, size_t to) void MarkerManager::move_marker(size_t from, size_t to)
{ {
{
std::unique_lock lock(p->markerRecordLock_);
if (from >= p->markerRecords_.size() || to >= p->markerRecords_.size()) if (from >= p->markerRecords_.size() || to >= p->markerRecords_.size())
{ {
return; return;
@ -271,6 +289,7 @@ void MarkerManager::move_marker(size_t from, size_t to)
} }
p->markerRecords_[to] = markerRecord; p->markerRecords_[to] = markerRecord;
} }
}
Q_EMIT MarkersUpdated(); Q_EMIT MarkersUpdated();
} }