flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Removed the cPluginLua::cResettable class.

Browse Source 
The functionality provided by that class has been superseded by cLuaState::cCallback, with better multithreading support.
This commit is contained in:
Mattes D
2016-03-17 19:29:02 +01:00
parent d0a04a7a82
commit 5dfcc15d1f
2 changed files with 1 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Bindings/PluginLua.cpp
-45
View File
@@ -60,7 +60,6 @@ void cPluginLua::Close(void)
// If already closed, bail out:
if (!m_LuaState.IsValid())
{
ASSERT(m_Resettables.empty());
ASSERT(m_HookMap.empty());
return;
}
@@ -70,18 +69,6 @@ void cPluginLua::Close(void)
ClearConsoleCommands();
ClearWebTabs();
// Notify and remove all m_Resettables (unlock the m_CriticalSection while resetting them):
cResettablePtrs resettables;
std::swap(m_Resettables, resettables);
{
cCSUnlock Unlock(Lock);
for (auto resettable: resettables)
{
resettable->Reset();
}
m_Resettables.clear();
} // cCSUnlock (m_CriticalSection)
// Release all the references in the hook map:
m_HookMap.clear();
@@ -1244,16 +1231,6 @@ int cPluginLua::CallFunctionFromForeignState(
void cPluginLua::AddResettable(cPluginLua::cResettablePtr a_Resettable)
{
cCSLock Lock(m_CriticalSection);
m_Resettables.push_back(a_Resettable);
}
void cPluginLua::BindCommand(const AString & a_Command, int a_FnRef)
{
ASSERT(m_Commands.find(a_Command) == m_Commands.end());
@@ -1322,25 +1299,3 @@ void cPluginLua::ClearWebTabs(void)
////////////////////////////////////////////////////////////////////////////////
// cPluginLua::cResettable:
cPluginLua::cResettable::cResettable(cPluginLua & a_Plugin):
m_Plugin(&a_Plugin)
{
}
void cPluginLua::cResettable::Reset(void)
{
cCSLock Lock(m_CSPlugin);
m_Plugin = nullptr;
}