#5977: Safely close parser threads when the module is shut down

codereader · Jun 19, 2022 · 409ae7a · 409ae7a
1 parent 941062e
commit 409ae7a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/radiantcore/decl/DeclarationManager.cpp b/radiantcore/decl/DeclarationManager.cpp
@@ -119,6 +119,27 @@ void DeclarationManager::initialiseModule(const IApplicationContext& ctx)
     rMessage() << getName() << "::initialiseModule called." << std::endl;
 }
 
+void DeclarationManager::shutdownModule()
+{
+    auto declLock = std::make_unique<std::lock_guard<std::mutex>>(_declarationLock);
+    std::vector<std::unique_ptr<DeclarationParser>> parsersToFinish;
+
+    for (auto& [_, decl] : _declarationsByType)
+    {
+        if (decl.parser)
+        {
+            parsersToFinish.emplace_back(std::move(decl.parser));
+        }
+    }
+
+    // Release the lock, destruct all parsers
+    declLock.reset();
+    parsersToFinish.clear(); // might block if parsers are running
+
+    // All parsers have finished, clear the structure, no need to lock anything
+    _declarationsByType.clear();
+}
+
 module::StaticModuleRegistration<DeclarationManager> _declManagerModule;
 
 }
diff --git a/radiantcore/decl/DeclarationManager.h b/radiantcore/decl/DeclarationManager.h
@@ -51,6 +51,7 @@ class DeclarationManager :
     const std::string& getName() const override;
     const StringSet& getDependencies() const override;
     void initialiseModule(const IApplicationContext& ctx) override;
+    void shutdownModule() override;
 
     // Invoked once a parser thread has finished. It will move its data over to here.
     void onParserFinished(std::map<Type, NamedDeclarations>&& parsedDecls,