PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Use multimap in scheduler

Browse Source
This commit is contained in:
md_5 2013-05-03 14:33:04 +10:00
parent b91564f77a
commit 779582d441
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
proxy/src/main/java/net/md_5/bungee/scheduler/BungeeScheduler.java
View File

@ -1,6 +1,10 @@
package net.md_5.bungee.scheduler; package net.md_5.bungee.scheduler;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps;
import gnu.trove.TCollections; import gnu.trove.TCollections;
import gnu.trove.map.TIntObjectMap; import gnu.trove.map.TIntObjectMap;
import gnu.trove.map.hash.TIntObjectHashMap; import gnu.trove.map.hash.TIntObjectHashMap;
@ -18,11 +22,13 @@ public class BungeeScheduler implements TaskScheduler
private final AtomicInteger taskCounter = new AtomicInteger(); private final AtomicInteger taskCounter = new AtomicInteger();
private final TIntObjectMap<BungeeTask> tasks = TCollections.synchronizedMap( new TIntObjectHashMap<BungeeTask>() ); private final TIntObjectMap<BungeeTask> tasks = TCollections.synchronizedMap( new TIntObjectHashMap<BungeeTask>() );
private final Multimap<Plugin, BungeeTask> tasksByPlugin = Multimaps.synchronizedMultimap( HashMultimap.<Plugin, BungeeTask>create() );
@Override @Override
public void cancel(int id) public void cancel(int id)
{ {
BungeeTask task = tasks.remove( id ); BungeeTask task = tasks.remove( id );
tasksByPlugin.values().remove( task );
task.getFuture().cancel( false ); task.getFuture().cancel( false );
} }
@ -36,13 +42,9 @@ public class BungeeScheduler implements TaskScheduler
public int cancel(Plugin plugin) public int cancel(Plugin plugin)
{ {
Set<ScheduledTask> toRemove = new HashSet<>(); Set<ScheduledTask> toRemove = new HashSet<>();
for ( ScheduledTask task : tasks.valueCollection() ) for ( ScheduledTask task : tasksByPlugin.get( plugin ) )
{ {
// TODO: proper checking? toRemove.add( task );
if ( task.getOwner() == plugin )
{
toRemove.add( task );
}
} }
for ( ScheduledTask task : toRemove ) for ( ScheduledTask task : toRemove )
{ {