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

Store the ScriptInterface& in ModuleLoader::Result

Browse Source 
During hotloading the `ScriptRequest` was constructed from a
`JSContext*`. That requires that already an other `ScriptRequest` is
active. Which isn't always the case.
Now The `ScriptRequest` is constructed from a `ScriptInterface&`.

Storing a `ScriptInterface&` in the `ModuleLoader::Result` allows to
remove the `m_Result` as it is retrieved from the `ScriptInterface`.
This commit is contained in:
phosit
2025-06-11 14:51:52 +02:00
committed by phosit
parent 25c53cb0ac
commit b8348bec55
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/scriptinterface/ModuleLoader.cpp
+6 -6
View File
@@ -421,17 +421,17 @@ ModuleLoader::Result::iterator& ModuleLoader::Result::iterator::operator++(int)
}
ModuleLoader::Result::Result(const ScriptRequest& rq, const VfsPath& modulePath):
m_Cx{rq.cx},
m_Loader{rq.GetScriptInterface().GetModuleLoader()},
m_Script{rq.GetScriptInterface()},
m_ModulePath{modulePath},
m_Storage{rq, m_Loader, *this, m_ModulePath}
m_Storage{rq, m_Script.GetModuleLoader(), *this, m_ModulePath}
{
}
ModuleLoader::Result::~Result()
{
const auto modIter = m_Loader.m_Registry.find(m_ModulePath);
if (modIter == m_Loader.m_Registry.end())
ModuleLoader::RegistryType& registry{m_Script.GetModuleLoader().m_Registry};
const auto modIter = registry.find(m_ModulePath);
if (modIter == registry.end())
return;
std::get<1>(*modIter).RemoveRequester(this);
@@ -450,7 +450,7 @@ ModuleLoader::Result::~Result()
void ModuleLoader::Result::Resume()
{
if (m_Storage.IsWaiting())
m_Storage = ModuleLoader::Future{m_Cx, m_Loader, *this, m_ModulePath};
m_Storage = ModuleLoader::Future{m_Script, m_Script.GetModuleLoader(), *this, m_ModulePath};
}
ModuleLoader::ModuleLoader(ModuleLoader::AllowModuleFunc allowModule):