Merge pull request #7547 from howard-stearns/lock-trees-on-import-export

Lock trees on import export

interface/src/Application.cpp

@@ -2816,8 +2816,9 @@ bool Application::exportEntities(const QString& filename, const QVector<EntityIt
     auto entityTree = getEntities()->getTree();
     auto exportTree = std::make_shared<EntityTree>();
     exportTree->createRootElement();
-
     glm::vec3 root(TREE_SCALE, TREE_SCALE, TREE_SCALE);
+    bool success = true;
+    entityTree->withReadLock([&] {
         for (auto entityID : entityIDs) { // Gather entities and properties.
             auto entityItem = entityTree->findEntityByEntityItemID(entityID);
             if (!entityItem) {
@@ -2838,7 +2839,8 @@ bool Application::exportEntities(const QString& filename, const QVector<EntityIt
         }
 
         if (entities.size() == 0) {
-        return false;
+            success = false;
+            return;
         }
 
         if (givenOffset) {
@@ -2849,27 +2851,33 @@ bool Application::exportEntities(const QString& filename, const QVector<EntityIt
             EntityItemID parentID = properties.getParentID();
             if (parentID.isInvalidID()) {
                 properties.setPosition(properties.getPosition() - root);
-        } else if (!entities.contains(parentID)) {
+            }
+            else if (!entities.contains(parentID)) {
                 entityDatum->globalizeProperties(properties, "Parent %3 of %2 %1 is not selected for export.", -root);
             } // else valid parent -- don't offset
             exportTree->addEntity(entityDatum->getEntityItemID(), properties);
         }
-
+    });
+    if (success) {
         exportTree->writeToJSONFile(filename.toLocal8Bit().constData());
 
         // restore the main window's active state
         _window->activateWindow();
-    return true;
+    }
+    return success;
 }
 
 bool Application::exportEntities(const QString& filename, float x, float y, float z, float scale) {
     glm::vec3 offset(x, y, z);
     QVector<EntityItemPointer> entities;
     QVector<EntityItemID> ids;
-    getEntities()->getTree()->findEntities(AACube(offset, scale), entities);
+    auto entityTree = getEntities()->getTree();
+    entityTree->withReadLock([&] {
+        entityTree->findEntities(AACube(offset, scale), entities);
         foreach(EntityItemPointer entity, entities) {
             ids << entity->getEntityItemID();
         }
+    });
     return exportEntities(filename, ids, &offset);
 }
 
@@ -2899,12 +2907,15 @@ void Application::saveSettings() {
 }
 
 bool Application::importEntities(const QString& urlOrFilename) {
+    bool success = false;
+    _entityClipboard->withWriteLock([&] {
         _entityClipboard->eraseAllOctreeElements();
 
-    bool success = _entityClipboard->readFromURL(urlOrFilename);
+        success = _entityClipboard->readFromURL(urlOrFilename);
         if (success) {
             _entityClipboard->reaverageOctreeElements();
         }
+    });
     return success;
 }
 

libraries/entities/src/EntityTree.cpp

@@ -1323,7 +1323,9 @@ QVector<EntityItemID> EntityTree::sendEntities(EntityEditPacketSender* packetSen
     // We need to keep a map so that we can map parent identifiers correctly.
     QHash<EntityItemID, EntityItemID> map;
     args.map = &map;
+    withReadLock([&] {
         recurseTreeWithOperation(sendEntitiesOperation, &args);
+    });
     packetSender->releaseQueuedMessages();
 
     return map.values().toVector();