games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-06 23:26:26 +02:00
Code Issues Releases Activity

Fix freeze if AI initiates large number of async requests during turn

Browse Source
This commit is contained in:
Ivan Savenko 2025-03-11 14:58:26 +00:00
parent e273263334
commit dff37ce81f
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
AI/Nullkiller/AIGateway.cpp
View File

@ -593,12 +593,11 @@ void AIGateway::yourTurn(QueryID queryID)
nullkiller->makingTurnInterrupption.reset(); nullkiller->makingTurnInterrupption.reset();
asyncTasks->run([this]() executeActionAsyncArena.enqueue(asyncTasks->defer([this]()
{ {
ScopedThreadName guard("NKAI::makingTurn"); ScopedThreadName guard("NKAI::makingTurn");
makeTurn(); makeTurn();
}); }));
executeActionAsyncArena.enqueue([this](){asyncTasks->wait();});
} }
void AIGateway::heroGotLevel(const CGHeroInstance * hero, PrimarySkill pskill, std::vector<SecondarySkill> & skills, QueryID queryID) void AIGateway::heroGotLevel(const CGHeroInstance * hero, PrimarySkill pskill, std::vector<SecondarySkill> & skills, QueryID queryID)
@ -1609,14 +1608,13 @@ void AIGateway::executeActionAsync(const std::string & description, const std::f
if (!asyncTasks) if (!asyncTasks)
throw std::runtime_error("Attempt to execute task on shut down AI state!"); throw std::runtime_error("Attempt to execute task on shut down AI state!");
asyncTasks->run([this, description, whatToDo]() executeActionAsyncArena.enqueue(asyncTasks->defer([this, description, whatToDo]()
{ {
ScopedThreadName guard("NKAI::" + description); ScopedThreadName guard("NKAI::" + description);
SET_GLOBAL_STATE(this); SET_GLOBAL_STATE(this);
std::shared_lock gsLock(CGameState::mutex); std::shared_lock gsLock(CGameState::mutex);
whatToDo(); whatToDo();
}); }));
executeActionAsyncArena.enqueue([this](){asyncTasks->wait();});
} }
void AIGateway::lostHero(HeroPtr h) void AIGateway::lostHero(HeroPtr h)

12
AI/VCAI/VCAI.cpp
View File

@ -653,12 +653,11 @@ void VCAI::yourTurn(QueryID queryID)
status.startedTurn(); status.startedTurn();
makingTurnInterrupption.reset(); makingTurnInterrupption.reset();
asyncTasks->run([this]() executeActionAsyncArena.enqueue(asyncTasks->defer([this]()
{ {
ScopedThreadName guard("VCAI::makingTurn"); ScopedThreadName guard("VCAI::makingTurn");
makeTurn(); makeTurn();
}); }));
executeActionAsyncArena.enqueue([this](){asyncTasks->wait();});
} }
void VCAI::heroGotLevel(const CGHeroInstance * hero, PrimarySkill pskill, std::vector<SecondarySkill> & skills, QueryID queryID) void VCAI::heroGotLevel(const CGHeroInstance * hero, PrimarySkill pskill, std::vector<SecondarySkill> & skills, QueryID queryID)
@ -2508,19 +2507,16 @@ void VCAI::finish()
void VCAI::executeActionAsync(const std::string & description, const std::function<void()> & whatToDo) void VCAI::executeActionAsync(const std::string & description, const std::function<void()> & whatToDo)
{ {
if (!asyncTasks) if (!asyncTasks)
throw std::runtime_error("Attempt to execute task on shut down AI state!"); throw std::runtime_error("Attempt to execute task on shut down AI state!");
asyncTasks->run([this, description, whatToDo]() executeActionAsyncArena.enqueue(asyncTasks->defer([this, description, whatToDo]()
{ {
ScopedThreadName guard("VCAI::" + description); ScopedThreadName guard("VCAI::" + description);
SET_GLOBAL_STATE(this); SET_GLOBAL_STATE(this);
std::shared_lock gsLock(CGameState::mutex); std::shared_lock gsLock(CGameState::mutex);
whatToDo(); whatToDo();
}); }));
executeActionAsyncArena.enqueue([this](){asyncTasks->wait();});
} }
void VCAI::lostHero(HeroPtr h) void VCAI::lostHero(HeroPtr h)