Make CollectionParent::generate_key() threadsafe

realm · May 15, 2023 · ab8da70 · ab8da70
1 parent 69814d7
commit ab8da70
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/realm/collection_parent.cpp b/src/realm/collection_parent.cpp
@@ -262,11 +262,13 @@ CollectionBasePtr CollectionParent::get_collection_ptr(ColKey col_key) const
 }
 
 
-int64_t CollectionParent::generate_key(size_t sz) const
+int64_t CollectionParent::generate_key(size_t sz)
 {
     static std::mt19937 gen32;
+    static std::mutex mutex;
 
     int64_t key;
+    const std::lock_guard<std::mutex> lock(mutex);
     do {
         if (sz < 0x10) {
             key = int8_t(gen32());

diff --git a/src/realm/collection_parent.hpp b/src/realm/collection_parent.hpp
@@ -173,7 +173,7 @@ class CollectionParent : public std::enable_shared_from_this<CollectionParent> {
     SetBasePtr get_setbase_ptr(ColKey col_key) const;
     CollectionBasePtr get_collection_ptr(ColKey col_key) const;
 
-    int64_t generate_key(size_t sz) const;
+    static int64_t generate_key(size_t sz);
 };
 
 } // namespace realm