ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #2612 from swazrgb/shutdown-executor

Browse Source 
client: Also shutdown executor in PluginManager
This commit is contained in:
Owain van Brakel
2020-05-24 19:35:58 +02:00
committed by GitHub
parent 0df61a55cc 1644dbd245
commit f70794bc18
2 changed files with 47 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/plugins/ExternalPluginManager.java
View File

@@ -688,7 +688,7 @@ public class ExternalPluginManager
// some plugins get stuck on IO, so add some extra threads // some plugins get stuck on IO, so add some extra threads
ExecutorService exec = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() * 2, ExecutorService exec = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() * 2,
new ThreadFactoryBuilder() new ThreadFactoryBuilder()
.setNameFormat("plugin-manager-%d") .setNameFormat("external-plugin-manager-%d")
.build()); .build());
try try

77
runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
View File

@@ -34,6 +34,7 @@ import com.google.common.graph.Graphs;
import com.google.common.graph.MutableGraph; import com.google.common.graph.MutableGraph;
import com.google.common.reflect.ClassPath; import com.google.common.reflect.ClassPath;
import com.google.common.reflect.ClassPath.ClassInfo; import com.google.common.reflect.ClassPath.ClassInfo;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.google.inject.Binder; import com.google.inject.Binder;
import com.google.inject.CreationException; import com.google.inject.CreationException;
import com.google.inject.Injector; import com.google.inject.Injector;
@@ -401,47 +402,61 @@ public class PluginManager
final long start = System.currentTimeMillis(); final long start = System.currentTimeMillis();
// some plugins get stuck on IO, so add some extra threads // some plugins get stuck on IO, so add some extra threads
ExecutorService exec = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() * 2); ExecutorService exec = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() * 2,
new ThreadFactoryBuilder()
.setNameFormat("plugin-manager-%d")
.build());
List<Plugin> scannedPlugins = new CopyOnWriteArrayList<>(); try
sortedPlugins.forEach(group ->
{ {
List<Future<?>> curGroup = new ArrayList<>(); List<Plugin> scannedPlugins = new CopyOnWriteArrayList<>();
group.forEach(pluginClazz -> sortedPlugins.forEach(group ->
curGroup.add(exec.submit(() -> {
List<Future<?>> curGroup = new ArrayList<>();
group.forEach(pluginClazz ->
curGroup.add(exec.submit(() ->
{
Plugin plugin;
try
{
plugin = instantiate(scannedPlugins, (Class<Plugin>) pluginClazz);
scannedPlugins.add(plugin);
}
catch (PluginInstantiationException e)
{
log.warn("Error instantiating plugin!", e);
return;
}
loaded.getAndIncrement();
RuneLiteSplashScreen.stage(.60, .65, "Loading internal plugins", loaded.get(), scannedPlugins.size());
})));
curGroup.forEach(future ->
{ {
Plugin plugin;
try try
{ {
plugin = instantiate(scannedPlugins, (Class<Plugin>) pluginClazz); future.get();
scannedPlugins.add(plugin);
} }
catch (PluginInstantiationException e) catch (InterruptedException | ExecutionException e)
{ {
log.warn("Error instantiating plugin!", e); e.printStackTrace();
return;
} }
});
loaded.getAndIncrement();
RuneLiteSplashScreen.stage(.60, .65, "Loading internal plugins", loaded.get(), scannedPlugins.size());
})));
curGroup.forEach(future ->
{
try
{
future.get();
}
catch (InterruptedException | ExecutionException e)
{
e.printStackTrace();
}
}); });
});
log.info("Plugin instantiation took {}ms", System.currentTimeMillis() - start); log.info("Plugin instantiation took {}ms", System.currentTimeMillis() - start);
return scannedPlugins;
return scannedPlugins; }
finally
{
List<Runnable> unfinishedTasks = exec.shutdownNow();
if (!unfinishedTasks.isEmpty())
{
// This shouldn't happen since we Future#get all tasks submitted to the executor
log.warn("Did not complete all update tasks: {}", unfinishedTasks);
}
}
} }
public boolean startPlugin(Plugin plugin) throws PluginInstantiationException public boolean startPlugin(Plugin plugin) throws PluginInstantiationException