Sky/EQ2Emu
1
0
Fork 0
Code Issues Activity

spell scripts mutex locking fixes

Browse Source
This commit is contained in:
Emagi 2024-09-07 14:50:01 -04:00
parent fb592b4d76
commit 98c0aaf73b
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/WorldServer/LuaInterface.cpp
View File

@ -612,7 +612,7 @@ void LuaInterface::RemoveCurrentSpell(lua_State* state, LuaSpell* cur_spell, boo
} }
map<lua_State*, LuaSpell*>::iterator itr = current_spells.find(state); map<lua_State*, LuaSpell*>::iterator itr = current_spells.find(state);
if(removeSpellScript && itr->second) { if(removeSpellScript && itr->second) {
MSpellScripts.readlock(__FUNCTION__, __LINE__); MSpellScripts.writelock(__FUNCTION__, __LINE__);
map<string, map<lua_State*, LuaSpell*> >::iterator spell_script_itr = spell_scripts.find(cur_spell->file_name); map<string, map<lua_State*, LuaSpell*> >::iterator spell_script_itr = spell_scripts.find(cur_spell->file_name);
if(spell_script_itr != spell_scripts.end()) { if(spell_script_itr != spell_scripts.end()) {
LogWrite(SPELL__DEBUG, 9, "Spell", "LuaInterface::RemoveCurrentSpell spell %s. Queue Entries %u.", cur_spell->file_name.c_str(), spell_script_itr->second.size()); LogWrite(SPELL__DEBUG, 9, "Spell", "LuaInterface::RemoveCurrentSpell spell %s. Queue Entries %u.", cur_spell->file_name.c_str(), spell_script_itr->second.size());
@ -624,7 +624,7 @@ void LuaInterface::RemoveCurrentSpell(lua_State* state, LuaSpell* cur_spell, boo
} }
mutex->releasewritelock(__FUNCTION__, __LINE__); mutex->releasewritelock(__FUNCTION__, __LINE__);
} }
MSpellScripts.releasereadlock(__FUNCTION__, __LINE__); MSpellScripts.releasewritelock(__FUNCTION__, __LINE__);
} }
if(itr != current_spells.end() && removeCurSpell) if(itr != current_spells.end() && removeCurSpell)
current_spells.erase(itr); current_spells.erase(itr);
@ -2295,6 +2295,7 @@ LuaSpell* LuaInterface::GetSpellScript(const char* name, bool create_new, bool u
LuaSpell* ret = 0; LuaSpell* ret = 0;
Mutex* mutex = 0; Mutex* mutex = 0;
MSpellScripts.readlock(__FUNCTION__, __LINE__);
itr = spell_scripts.find(name); itr = spell_scripts.find(name);
if(itr != spell_scripts.end()) { if(itr != spell_scripts.end()) {
mutex = GetSpellScriptMutex(name); mutex = GetSpellScriptMutex(name);
@ -2303,14 +2304,19 @@ LuaSpell* LuaInterface::GetSpellScript(const char* name, bool create_new, bool u
if(spell_script_itr->second == nullptr){ //not in use if(spell_script_itr->second == nullptr){ //not in use
if (use) if (use)
{ {
spell_script_itr->second = CreateSpellScript(name, spell_script_itr->first); lua_State* state = spell_script_itr->first;
ret = spell_script_itr->second; ret = spell_script_itr->second;
MSpellScripts.releasereadlock(__FUNCTION__, __LINE__);
CreateSpellScript(name, state);
break; // don't keep iterating, we already have our result break; // don't keep iterating, we already have our result
} }
} }
} }
mutex->releasereadlock(__FUNCTION__, __LINE__); mutex->releasereadlock(__FUNCTION__, __LINE__);
} }
if(!ret) {
MSpellScripts.releasereadlock(__FUNCTION__, __LINE__);
}
if(!ret && create_new){ if(!ret && create_new){
if(!name || (ret = LoadSpellScript(name)) == nullptr) { if(!name || (ret = LoadSpellScript(name)) == nullptr) {
LogError("Error LUA Spell Script '%s'", name == nullptr ? "unknown" : name); LogError("Error LUA Spell Script '%s'", name == nullptr ? "unknown" : name);