actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix clean shutdown on abort (dtor order problem)

Browse Source
This commit is contained in:
Glenn Maynard
2006-10-15 20:50:27 +00:00
parent 1e3466997e
commit 84dc84627b
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/LuaManager.cpp
+16 -12
View File
@@ -16,8 +16,12 @@
#include <map> #include <map>
LuaManager *LUA = NULL; LuaManager *LUA = NULL;
static vector<lua_State *> g_FreeStateList; struct Impl
static map<lua_State *, bool> g_ActiveStates; {
vector<lua_State *> g_FreeStateList;
map<lua_State *, bool> g_ActiveStates;
};
static Impl *pImpl = NULL;
static LuaFunctionList *g_LuaFunctions = NULL; static LuaFunctionList *g_LuaFunctions = NULL;
#if defined(_MSC_VER) || defined (_XBOX) #if defined(_MSC_VER) || defined (_XBOX)
@@ -157,6 +161,7 @@ void LuaManager::Register( RegisterWithLuaFn pfn )
LuaManager::LuaManager() LuaManager::LuaManager()
{ {
pImpl = new Impl;
LUA = this; // so that LUA is available when we call the Register functions LUA = this; // so that LUA is available when we call the Register functions
m_pLock = new RageMutex( "Lua" ); m_pLock = new RageMutex( "Lua" );
@@ -185,8 +190,7 @@ LuaManager::~LuaManager()
{ {
lua_close( m_pLuaMain ); lua_close( m_pLuaMain );
delete m_pLock; delete m_pLock;
g_FreeStateList.clear(); SAFE_DELETE( pImpl );
g_ActiveStates.clear();
} }
Lua *LuaManager::Get() Lua *LuaManager::Get()
@@ -201,7 +205,7 @@ Lua *LuaManager::Get()
ASSERT( lua_gettop(m_pLuaMain) == 1 ); ASSERT( lua_gettop(m_pLuaMain) == 1 );
lua_State *pRet; lua_State *pRet;
if( g_FreeStateList.empty() ) if( pImpl->g_FreeStateList.empty() )
{ {
pRet = lua_newthread( m_pLuaMain ); pRet = lua_newthread( m_pLuaMain );
@@ -211,22 +215,22 @@ Lua *LuaManager::Get()
} }
else else
{ {
pRet = g_FreeStateList.back(); pRet = pImpl->g_FreeStateList.back();
g_FreeStateList.pop_back(); pImpl->g_FreeStateList.pop_back();
} }
g_ActiveStates[pRet] = bLocked; pImpl->g_ActiveStates[pRet] = bLocked;
return pRet; return pRet;
} }
void LuaManager::Release( Lua *&p ) void LuaManager::Release( Lua *&p )
{ {
g_FreeStateList.push_back( p ); pImpl->g_FreeStateList.push_back( p );
ASSERT( lua_gettop(p) == 0 ); ASSERT( lua_gettop(p) == 0 );
ASSERT( g_ActiveStates.find(p) != g_ActiveStates.end() ); ASSERT( pImpl->g_ActiveStates.find(p) != pImpl->g_ActiveStates.end() );
bool bDoUnlock = g_ActiveStates[p]; bool bDoUnlock = pImpl->g_ActiveStates[p];
g_ActiveStates.erase( p ); pImpl->g_ActiveStates.erase( p );
if( bDoUnlock ) if( bDoUnlock )
m_pLock->Unlock(); m_pLock->Unlock();