Skip to content

Commit

Permalink
Fix memory leak in CScriptEngine.
Browse files Browse the repository at this point in the history
  • Loading branch information
intorr committed Feb 15, 2018
1 parent 16987f7 commit e3680b7
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 27 deletions.
39 changes: 13 additions & 26 deletions src/xrScriptEngine/script_engine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,18 +98,14 @@ bool RunJITCommand(lua_State* ls, const char* command)

const char* const CScriptEngine::GlobalNamespace = SCRIPT_GLOBAL_NAMESPACE;
Lock CScriptEngine::stateMapLock;
xr_unordered_map<lua_State*, CScriptEngine*>* CScriptEngine::stateMap = nullptr;
xr_unordered_map<lua_State*, CScriptEngine*> CScriptEngine::stateMap;

string4096 CScriptEngine::g_ca_stdout;

void CScriptEngine::reinit()
{
stateMapLock.Enter();
if (!stateMap)
{
stateMap = new xr_unordered_map<lua_State*, CScriptEngine*>();
stateMap->reserve(32); // 32 lua states should be enough
}
stateMap.reserve(32); // 32 lua states should be enough
stateMapLock.Leave();
if (m_virtual_machine)
{
Expand Down Expand Up @@ -1192,12 +1188,9 @@ CScriptEngine* CScriptEngine::GetInstance(lua_State* state)
{
CScriptEngine* instance = nullptr;
stateMapLock.Enter();
if (stateMap)
{
auto it = stateMap->find(state);
if (it != stateMap->end())
instance = it->second;
}
auto it = stateMap.find(state);
if (it != stateMap.end())
instance = it->second;
stateMapLock.Leave();
return instance;
}
Expand All @@ -1206,14 +1199,11 @@ bool CScriptEngine::RegisterState(lua_State* state, CScriptEngine* scriptEngine)
{
bool result = false;
stateMapLock.Enter();
if (stateMap)
auto it = stateMap.find(state);
if (it == stateMap.end())
{
auto it = stateMap->find(state);
if (it == stateMap->end())
{
stateMap->insert({state, scriptEngine});
result = true;
}
stateMap.insert({state, scriptEngine});
result = true;
}
stateMapLock.Leave();
return result;
Expand All @@ -1225,14 +1215,11 @@ bool CScriptEngine::UnregisterState(lua_State* state)
return true;
bool result = false;
stateMapLock.Enter();
if (stateMap)
auto it = stateMap.find(state);
if (it != stateMap.end())
{
auto it = stateMap->find(state);
if (it != stateMap->end())
{
stateMap->erase(it);
result = true;
}
stateMap.erase(it);
result = true;
}
stateMapLock.Leave();
return result;
Expand Down
2 changes: 1 addition & 1 deletion src/xrScriptEngine/script_engine.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class XRSCRIPTENGINE_API CScriptEngine

private:
static Lock stateMapLock;
static xr_unordered_map<lua_State*, CScriptEngine*>* stateMap;
static xr_unordered_map<lua_State*, CScriptEngine*> stateMap;
lua_State* m_virtual_machine;
CScriptThread* m_current_thread;
bool m_reload_modules;
Expand Down

0 comments on commit e3680b7

Please sign in to comment.