Merge pull request #2372 from akortunov/sync

Fix some thread sync issues

CHANGELOG.md

@@ -51,6 +51,7 @@
     Bug #4828: Potion looping effects VFX are not shown for NPCs
     Bug #4837: CTD when a mesh with NiLODNode root node with particles is loaded
     Bug #4841: Russian localization ignores implicit keywords
+    Bug #4844: Data race in savegame loading / GlobalMap render
     Bug #4847: Idle animation reset oddities
     Bug #4851: No shadows since switch to OSG
     Bug #4860: Actors outside of processing range visible for one frame after spawning
@@ -88,6 +89,7 @@
     Bug #5001: Possible data race in the Animation::setAlpha()
     Bug #5004: Werewolves shield their eyes during storm
     Bug #5018: Spell tooltips don't support purely negative magnitudes
+    Bug #5025: Data race in the ICO::setMaximumNumOfObjectsToCompilePerFrame()
     Bug #5028: Offered price caps are not trading-specific
     Bug #5038: Enchanting success chance calculations are blatantly wrong
     Feature #1774: Handle AvoidNode

apps/openmw/engine.cpp

@@ -257,10 +257,10 @@ OMW::Engine::~Engine()
 
     mWorkQueue = nullptr;
 
-    mResourceSystem.reset();
-
     mViewer = nullptr;
 
+    mResourceSystem.reset();
+
     delete mEncoder;
     mEncoder = nullptr;
 

apps/openmw/mwgui/loadingscreen.cpp

@@ -165,11 +165,6 @@ namespace MWGui
         if (mMainWidget->getVisible())
             return;
 
-        if (mViewer->getIncrementalCompileOperation())
-        {
-            mViewer->getIncrementalCompileOperation()->setMaximumNumOfObjectsToCompilePerFrame(100);
-        }
-
         // Assign dummy bounding sphere callback to avoid the bounding sphere of the entire scene being recomputed after each frame of loading
         // We are already using node masks to avoid the scene from being updated/rendered, but node masks don't work for computeBound()
         mViewer->getSceneData()->setComputeBoundingSphereCallback(new DontComputeBoundCallback);

apps/openmw/mwrender/renderingmanager.cpp

@@ -268,6 +268,7 @@ namespace MWRender
         {
             mViewer->setIncrementalCompileOperation(new osgUtil::IncrementalCompileOperation);
             mViewer->getIncrementalCompileOperation()->setTargetFrameRate(Settings::Manager::getFloat("target framerate", "Cells"));
+            mViewer->getIncrementalCompileOperation()->setMaximumNumOfObjectsToCompilePerFrame(100);
         }
 
         mResourceSystem->getSceneManager()->setIncrementalCompileOperation(mViewer->getIncrementalCompileOperation());

apps/openmw/mwworld/store.cpp

@@ -500,7 +500,12 @@ namespace MWWorld
     }
     void Store<ESM::Land>::setUp()
     {
+        // The land is static for given game session, there is no need to refresh it every load.
+        if (mBuilt)
+            return;
+
         std::sort(mStatic.begin(), mStatic.end(), Compare());
+        mBuilt = true;
     }
 
 

apps/openmw/mwworld/store.hpp

@@ -247,6 +247,8 @@ namespace MWWorld
 
         RecordId load(ESM::ESMReader &esm);
         void setUp();
+    private:
+        bool mBuilt = false;
     };
 
     template <>

components/esmterrain/storage.cpp

@@ -353,11 +353,11 @@ namespace ESMTerrain
     std::string Storage::getTextureName(UniqueTextureId id)
     {
         // Goes under used terrain blend transitions
-        static const std::string baseTexture = "textures\\tx_black_01.dds";
+        static constexpr char baseTexture[] = "textures\\tx_black_01.dds";
         if (id.first == -1)
             return baseTexture;
 
-        static const std::string defaultTexture = "textures\\_land_default.dds";
+        static constexpr char defaultTexture[] = "textures\\_land_default.dds";
         if (id.first == 0)
             return defaultTexture; // Not sure if the default texture really is hardcoded?
 

extern/osg-ffmpeg-videoplayer/videostate.hpp

@@ -80,8 +80,8 @@ struct PacketQueue {
 
     AVPacketList *first_pkt, *last_pkt;
     std::atomic<bool> flushing;
-    int nb_packets;
-    int size;
+    std::atomic<int> nb_packets;
+    std::atomic<int> size;
 
     OpenThreads::Mutex mutex;
     OpenThreads::Condition cond;