gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Do we need mutex for Settings? This code will show it up.

Browse source
This commit is contained in:
Alex Zolotarev 2015-06-01 21:52:16 +03:00
parent 1e1328f85b
commit eb7610224b
2 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
platform/settings.cpp
View file

@ -1,9 +1,8 @@
#include "platform/settings.hpp"
#include "settings.hpp"
#include "platform.hpp"
#include "defines.hpp"
#include "base/logging.hpp"
#include "coding/reader_streambuf.hpp"
#include "coding/file_writer.hpp"
#include "coding/file_reader.hpp"
@ -11,11 +10,11 @@
#include "geometry/rect2d.hpp"
#include "geometry/any_rect2d.hpp"
#include "platform/platform.hpp"
#include "base/logging.hpp"
#include "std/sstream.hpp"
#include "std/iostream.hpp"
#include "std/cmath.hpp"
#include "std/iostream.hpp"
#include "std/sstream.hpp"
#define FIRST_LAUNCH_KEY "FirstLaunchOnDate"
@ -26,6 +25,8 @@ namespace Settings
{
StringStorage::StringStorage()
{
lock_guard<mutex> guard(m_mutex);
try
{
ReaderStreamBuf buffer(new FileReader(GetPlatform().SettingsPathForFile(SETTINGS_FILE_NAME)));
@ -56,7 +57,6 @@ namespace Settings
void StringStorage::Save() const
{
// @TODO(AlexZ): Should we use mutex here?
try
{
FileWriter file(GetPlatform().SettingsPathForFile(SETTINGS_FILE_NAME));
@ -82,8 +82,10 @@ namespace Settings
return inst;
}
bool StringStorage::GetValue(string const & key, string & outValue)
bool StringStorage::GetValue(string const & key, string & outValue) const
{
lock_guard<mutex> guard(m_mutex);
auto const found = m_values.find(key);
if (found == m_values.end())
return false;
@ -92,14 +94,18 @@ namespace Settings
return true;
}
void StringStorage::SetValue(string const & key, string const & value)
void StringStorage::SetValue(string const & key, string && value)
{
m_values[key] = value;
lock_guard<mutex> guard(m_mutex);
m_values[key] = move(value);
Save();
}
void StringStorage::DeleteKeyAndValue(string const & key)
{
lock_guard<mutex> guard(m_mutex);
auto const found = m_values.find(key);
if (found != m_values.end())
{

7
platform/settings.hpp
View file

@ -2,6 +2,7 @@
#include "std/string.hpp"
#include "std/map.hpp"
#include "std/mutex.hpp"
namespace Settings
{
@ -13,14 +14,16 @@ namespace Settings
typedef map<string, string> ContainerT;
ContainerT m_values;
mutable mutex m_mutex;
StringStorage();
void Save() const;
public:
static StringStorage & Instance();
bool GetValue(string const & key, string & outValue);
void SetValue(string const & key, string const & value);
bool GetValue(string const & key, string & outValue) const;
void SetValue(string const & key, string && value);
void DeleteKeyAndValue(string const & key);
};