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

plugin manager: optimize plugin dependency sorting

Browse Source 
Previously, PluginManager.loadPlugins would make a graph of reverse
dependencies, topologically sort them, then reverse the list. This commit
changes loadPlugins to build a graph of dependencies so no reversal is needed.

Co-authored-by: Adam <Adam@sigterm.info>
This commit is contained in:
LootBagger
2022-02-05 11:24:18 -08:00
committed by Adam
parent e17baf1aee
commit 57622f3bad
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,6 @@ package net.runelite.client.plugins;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.graph.Graph; import com.google.common.graph.Graph;
import com.google.common.graph.GraphBuilder; import com.google.common.graph.GraphBuilder;
import com.google.common.graph.Graphs; import com.google.common.graph.Graphs;
@@ -320,8 +319,7 @@ public class PluginManager
continue; continue;
} }
Class<Plugin> pluginClass = (Class<Plugin>) clazz; graph.addNode((Class<Plugin>) clazz);
graph.addNode(pluginClass);
} }
// Build plugin graph // Build plugin graph
@@ -333,7 +331,7 @@ public class PluginManager
{ {
if (graph.nodes().contains(pluginDependency.value())) if (graph.nodes().contains(pluginDependency.value()))
{ {
graph.putEdge(pluginClazz, pluginDependency.value()); graph.putEdge(pluginDependency.value(), pluginClazz);
} }
} }
} }
@@ -344,7 +342,6 @@ public class PluginManager
} }
List<Class<? extends Plugin>> sortedPlugins = topologicalSort(graph); List<Class<? extends Plugin>> sortedPlugins = topologicalSort(graph);
sortedPlugins = Lists.reverse(sortedPlugins);
int loaded = 0; int loaded = 0;
List<Plugin> newPlugins = new ArrayList<>(); List<Plugin> newPlugins = new ArrayList<>();