lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proper handling for Quest timers concurrency.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-01-30 11:59:53 +00:00
parent 25d3220ce2
commit 99c209f0ba
18 changed files with 1240 additions and 1547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/quest/Quest.java
View File

@ -23,13 +23,12 @@ import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.function.Predicate;
import java.util.logging.Level;
import java.util.logging.Logger;
@ -88,10 +87,7 @@ public class Quest extends AbstractScript implements IIdentifiable
public static final Logger LOGGER = Logger.getLogger(Quest.class.getName());
/** Map containing lists of timers from the name of the timer. */
private Map<String, List<QuestTimer>> _questTimers = null;
private final ReentrantReadWriteLock _rwLock = new ReentrantReadWriteLock();
private final WriteLock _writeLock = _rwLock.writeLock();
private final ReadLock _readLock = _rwLock.readLock();
private final Map<String, List<QuestTimer>> _questTimers = new HashMap<>();
/** Map containing all the start conditions. */
private Set<QuestCondition> _startCondition = null;
@ -254,7 +250,7 @@ public class Quest extends AbstractScript implements IIdentifiable
* Add a timer to the quest (if it doesn't exist already) and start it.
* @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, PlayerInstance)})
* @param time time in ms for when to fire the timer
* @param npc the npc associated with this timer (can be null)
* @param npc the NPC associated with this timer (can be null)
* @param player the player associated with this timer (can be null)
* @see #startQuestTimer(String, long, Npc, PlayerInstance, boolean)
*/
@ -269,16 +265,6 @@ public class Quest extends AbstractScript implements IIdentifiable
*/
public Map<String, List<QuestTimer>> getQuestTimers()
{
if (_questTimers == null)
{
synchronized (this)
{
if (_questTimers == null)
{
_questTimers = new ConcurrentHashMap<>(1);
}
}
}
return _questTimers;
}
@ -286,26 +272,21 @@ public class Quest extends AbstractScript implements IIdentifiable
* Add a timer to the quest (if it doesn't exist already) and start it.
* @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, PlayerInstance)})
* @param time time in ms for when to fire the timer
* @param npc the npc associated with this timer (can be null)
* @param npc the NPC associated with this timer (can be null)
* @param player the player associated with this timer (can be null)
* @param repeating indicates whether the timer is repeatable or one-time.<br>
* If {@code true}, the task is repeated every {@code time} milliseconds until explicitly stopped.
*/
public void startQuestTimer(String name, long time, Npc npc, PlayerInstance player, boolean repeating)
{
final List<QuestTimer> timers = getQuestTimers().computeIfAbsent(name, k -> new ArrayList<>(1));
// If there exists a timer with this name, allow the timer only if the [npc, player] set is unique nulls act as wildcards.
if (getQuestTimer(name, npc, player) == null)
synchronized (_questTimers)
{
_writeLock.lock();
try
final List<QuestTimer> timers = _questTimers.computeIfAbsent(name, k -> new CopyOnWriteArrayList<>());
// If there exists a timer with this name, allow the timer only if the [npc, player] set is unique nulls act as wildcards.
if (getQuestTimer(name, npc, player) == null)
{
timers.add(new QuestTimer(this, name, time, npc, player, repeating));
}
finally
{
_writeLock.unlock();
}
}
}
@ -318,31 +299,28 @@ public class Quest extends AbstractScript implements IIdentifiable
*/
public QuestTimer getQuestTimer(String name, Npc npc, PlayerInstance player)
{
if (_questTimers == null)
if (name == null)
{
return null;
}
final List<QuestTimer> timers = getQuestTimers().get(name);
if (timers != null)
synchronized (_questTimers)
{
_readLock.lock();
try
final List<QuestTimer> timers = _questTimers.get(name);
if ((timers == null) || timers.isEmpty())
{
for (QuestTimer timer : timers)
return null;
}
for (QuestTimer timer : timers)
{
if ((timer != null) && timer.equals(this, name, npc, player))
{
if ((timer != null) && timer.equals(this, name, npc, player))
{
return timer;
}
return timer;
}
}
finally
{
_readLock.unlock();
}
return null;
}
return null;
}
/**
@ -351,30 +329,27 @@ public class Quest extends AbstractScript implements IIdentifiable
*/
public void cancelQuestTimers(String name)
{
if (_questTimers == null)
if (name == null)
{
return;
}
final List<QuestTimer> timers = getQuestTimers().get(name);
if (timers != null)
synchronized (_questTimers)
{
_writeLock.lock();
try
final List<QuestTimer> timers = _questTimers.get(name);
if ((timers == null) || timers.isEmpty())
{
for (QuestTimer timer : timers)
return;
}
for (QuestTimer timer : timers)
{
if (timer != null)
{
if (timer != null)
{
timer.cancel();
}
timer.cancel();
}
timers.clear();
}
finally
{
_writeLock.unlock();
}
timers.clear();
}
}
@ -386,10 +361,28 @@ public class Quest extends AbstractScript implements IIdentifiable
*/
public void cancelQuestTimer(String name, Npc npc, PlayerInstance player)
{
final QuestTimer timer = getQuestTimer(name, npc, player);
if (timer != null)
if (name == null)
{
timer.cancel();
return;
}
synchronized (_questTimers)
{
final List<QuestTimer> timers = _questTimers.get(name);
if ((timers == null) || timers.isEmpty())
{
return;
}
for (QuestTimer timer : timers)
{
if ((timer != null) && timer.equals(this, name, npc, player))
{
timer.cancel();
timers.remove(timer);
return;
}
}
}
}
@ -400,20 +393,17 @@ public class Quest extends AbstractScript implements IIdentifiable
*/
public void removeQuestTimer(QuestTimer timer)
{
if ((timer != null) && (_questTimers != null))
if (timer == null)
{
final List<QuestTimer> timers = getQuestTimers().get(timer.toString());
return;
}
synchronized (_questTimers)
{
final List<QuestTimer> timers = _questTimers.get(timer.toString());
if (timers != null)
{
_writeLock.lock();
try
{
timers.remove(timer);
}
finally
{
_writeLock.unlock();
}
timers.remove(timer);
}
}
}
@ -2835,25 +2825,17 @@ public class Quest extends AbstractScript implements IIdentifiable
// cancel all pending timers before reloading.
// if timers ought to be restarted, the quest can take care of it
// with its code (example: save global data indicating what timer must be restarted).
if (_questTimers != null)
synchronized (_questTimers)
{
for (List<QuestTimer> timers : getQuestTimers().values())
for (List<QuestTimer> timers : _questTimers.values())
{
_readLock.lock();
try
for (QuestTimer timer : timers)
{
for (QuestTimer timer : timers)
{
timer.cancel();
}
}
finally
{
_readLock.unlock();
timer.cancel();
}
timers.clear();
}
getQuestTimers().clear();
_questTimers.clear();
}
if (removeFromList)