async gamelists writes

Author: XenuIsWatching

es-app/src/Gamelist.cpp

@@ -1,6 +1,11 @@
 #include "Gamelist.h"
 
+#include <algorithm>
 #include <chrono>
+#include <fstream>
+#include <future>
+#include <mutex>
+#include <sstream>
 
 #include "utils/FileSystemUtil.h"
 #include "FileData.h"
@@ -9,6 +14,11 @@
 #include "Settings.h"
 #include "SystemData.h"
 #include <pugixml.hpp>
+#include <unordered_map>
+
+// Async gamelist write infrastructure
+static std::mutex sGamelistWriteMutex;
+static std::vector<std::future<void>> sGamelistPendingWrites;
 
 FileData* findOrCreateFile(SystemData* system, const std::string& path, FileType type)
 {
@@ -292,6 +302,7 @@ void updateGamelist(SystemData* system)
 					if(!pathNode)
 					{
 						LOG(LogError) << "<" << tag << "> node contains no <path> child!";
+						fileNode = nextNode;
 						continue;
 					}
 
@@ -325,22 +336,59 @@ void updateGamelist(SystemData* system)
 		// now write the file
 
 		if (numUpdated > 0) {
-			const auto startTs = std::chrono::system_clock::now();
-
 			//make sure the folders leading up to this path exist (or the write will fail)
 			std::string xmlWritePath(system->getGamelistPath(true));
 			Utils::FileSystem::createDirectory(Utils::FileSystem::getParent(xmlWritePath));
 
 			LOG(LogInfo) << "Added/Updated " << numUpdated << " entities in '" << xmlReadPath << "'";
 
-			if (!doc.save_file(xmlWritePath.c_str())) {
-				LOG(LogError) << "Error saving gamelist.xml to \"" << xmlWritePath << "\" (for system " << system->getName() << ")!";
-			}
+			// Serialize the XML document to a string on the main thread,
+			// then write the string to file on a background thread to
+			// avoid blocking the UI on slow NAS I/O.
+			std::stringstream ss;
+			doc.save(ss);
+			std::string xmlContent = ss.str();
+			std::string sysName = system->getName();
+
+			{
+				// Clean up finished futures
+				std::lock_guard<std::mutex> lock(sGamelistWriteMutex);
+				sGamelistPendingWrites.erase(
+					std::remove_if(sGamelistPendingWrites.begin(), sGamelistPendingWrites.end(),
+						[](std::future<void>& f) {
+							return f.wait_for(std::chrono::seconds(0)) == std::future_status::ready;
+						}),
+					sGamelistPendingWrites.end());
+
+				sGamelistPendingWrites.push_back(std::async(std::launch::async,
+					[xmlContent, xmlWritePath, sysName]() {
+						const auto startTs = std::chrono::system_clock::now();
+
+						std::ofstream outFile(xmlWritePath, std::ios::out | std::ios::trunc);
+						if (outFile.is_open()) {
+							outFile << xmlContent;
+							outFile.close();
+						} else {
+							LOG(LogError) << "Error saving gamelist.xml to \"" << xmlWritePath << "\" (for system " << sysName << ")!";
+						}
 
-			const auto endTs = std::chrono::system_clock::now();
-			LOG(LogInfo) << "Saved gamelist.xml for system \"" << system->getName() << "\" in " << std::chrono::duration_cast<std::chrono::milliseconds>(endTs - startTs).count() << " ms";
+						const auto endTs = std::chrono::system_clock::now();
+						LOG(LogInfo) << "Saved gamelist.xml for system \"" << sysName << "\" in " << std::chrono::duration_cast<std::chrono::milliseconds>(endTs - startTs).count() << " ms";
+					}));
+			}
 		}
 	}else{
 		LOG(LogError) << "Found no root folder for system \"" << system->getName() << "\"!";
 	}
 }
+
+void waitForGamelistWrites()
+{
+	std::lock_guard<std::mutex> lock(sGamelistWriteMutex);
+	for (auto& f : sGamelistPendingWrites)
+	{
+		if (f.valid())
+			f.wait();
+	}
+	sGamelistPendingWrites.clear();
+}

es-app/src/Gamelist.h

@@ -10,4 +10,8 @@ void parseGamelist(SystemData* system);
 // Writes currently loaded metadata for a SystemData to gamelist.xml.
 void updateGamelist(SystemData* system);
 
+// Blocks until all pending async gamelist writes have completed.
+// Must be called before process exit to avoid data loss.
+void waitForGamelistWrites();
+
 #endif // ES_APP_GAME_LIST_H

es-app/src/main.cpp

@@ -8,6 +8,7 @@
 #include "views/ViewController.h"
 #include "CollectionSystemManager.h"
 #include "EmulationStation.h"
+#include "Gamelist.h"
 #include "InputManager.h"
 #include "Log.h"
 #include "MameNames.h"
@@ -484,6 +485,7 @@ int main(int argc, char* argv[])
 
 	MameNames::deinit();
 	CollectionSystemManager::deinit();
+	waitForGamelistWrites();
 	SystemData::deleteSystems();
 
 	// call this ONLY when linking with FreeImage as a static library