status-im
/
realm-js
mirror of https://github.com/status-im/realm-js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reduce s_init_mutex's scope

This commit is contained in:
Thomas Goyne 2015-08-24 13:14:59 -07:00
parent b4f856bdd0
commit 348f4a7b39
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
shared_realm.cpp
View File

@ -23,11 +23,11 @@
#include <realm/lang_bind_helper.hpp> #include <realm/lang_bind_helper.hpp>
#include <memory> #include <memory>
#include <mutex>
using namespace realm; using namespace realm;
RealmCache Realm::s_global_cache; RealmCache Realm::s_global_cache;
std::mutex Realm::s_init_mutex;
Realm::Config::Config(const Config& c) : path(c.path), read_only(c.read_only), in_memory(c.in_memory), schema_version(c.schema_version), migration_function(c.migration_function) Realm::Config::Config(const Config& c) : path(c.path), read_only(c.read_only), in_memory(c.in_memory), schema_version(c.schema_version), migration_function(c.migration_function)
{ {
@ -108,6 +108,7 @@ SharedRealm Realm::get_shared_realm(Config &config)
realm = SharedRealm(new Realm(config)); realm = SharedRealm(new Realm(config));
// we want to ensure we are only initializing a single realm at a time // we want to ensure we are only initializing a single realm at a time
static std::mutex s_init_mutex;
std::lock_guard<std::mutex> lock(s_init_mutex); std::lock_guard<std::mutex> lock(s_init_mutex);
uint64_t old_version = ObjectStore::get_schema_version(realm->read_group()); uint64_t old_version = ObjectStore::get_schema_version(realm->read_group());

3
shared_realm.hpp
View File

@ -22,7 +22,6 @@
#include <memory> #include <memory>
#include <thread> #include <thread>
#include <vector> #include <vector>
#include <mutex>
#include <set> #include <set>
#include <map> #include <map>
@ -117,8 +116,6 @@ namespace realm {
Group *m_group; Group *m_group;
static std::mutex s_init_mutex;
public: public:
ExternalNotificationFunction m_external_notifier; ExternalNotificationFunction m_external_notifier;