gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Allow the future request stop from the callback

Browse Source 
In `Future` there is a notion of cancelation / stop-request. The task
callback doesn't have such a notion.
Some tasks (like the map-generation) are stopable. It did that in a
thread unsave way.

A task is canceled when the future is destroied or when `CancelOrWait`
is called on it.
This commit is contained in:
phosit
2024-10-17 19:50:11 +02:00
parent 3e4238876f
commit 778972602a
8 changed files with 154 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/MapReader.cpp
+12 -4
View File
@@ -59,6 +59,8 @@
#include <boost/algorithm/string/predicate.hpp>
extern bool IsQuitRequested();
#if defined(_MSC_VER) && _MSC_VER > 1900
#pragma warning(disable: 4456) // Declaration hides previous local declaration.
#pragma warning(disable: 4458) // Declaration hides class member.
@@ -1342,7 +1344,7 @@ int CMapReader::StartMapGeneration(const CStrW& scriptFile)
// The settings are stringified to pass them to the task.
m_GeneratorState->task = Threading::TaskManager::Instance().PushTask(
[&progress = m_GeneratorState->progress, scriptFile,
settings = Script::StringifyJSON(rq, &m_ScriptSettings)]
settings = Script::StringifyJSON(rq, &m_ScriptSettings)](const StopToken stopToken)
{
PROFILE2("Map Generation");
@@ -1352,7 +1354,7 @@ int CMapReader::StartMapGeneration(const CStrW& scriptFile)
MAP_GENERATION_CONTEXT_SIZE)};
ScriptInterface mapgenInterface{"Engine", "MapGenerator", mapgenContext};
return RunMapGenerationScript(progress, mapgenInterface, scriptPath, settings);
return RunMapGenerationScript(stopToken, progress, mapgenInterface, scriptPath, settings);
});
return 0;
@@ -1362,13 +1364,19 @@ int CMapReader::StartMapGeneration(const CStrW& scriptFile)
{
throw PSERROR_Game_World_MapLoadFailed{
"Error generating random map.\nCheck application log for details."};
};
}
int CMapReader::PollMapGeneration()
{
ENSURE(m_GeneratorState);
if (!m_GeneratorState->task.IsReady())
if (IsQuitRequested())
{
LOGWARNING("Quit requested!");
return -1;
}
if (!m_GeneratorState->task.IsDone())
return m_GeneratorState->progress.load();
const Script::StructuredClone results{m_GeneratorState->task.Get()};