loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Skip second BFS when checking for paths in both direction

Browse Source 
It's actually significantly faster to just check if the path you're
trying to create has already been cached than to check if it actually
already exists. This improves sorting performance by 15%.
This commit is contained in:
Oliver Hamlet
2025-01-18 10:29:05 +00:00
parent 628666e4ce
commit 3df560646d
2 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/sorting/plugin_graph.cpp
+7 -20
View File
@@ -259,7 +259,8 @@ private:
for (const auto& toVertex : toPlugins) {
const auto& toPlugin = pluginGraph_->GetPlugin(toVertex);
if (!pluginGraph_->PathExistsInEitherDirection(toVertex, fromVertex)) {
if (!pluginGraph_->IsPathCached(fromVertex, toVertex) &&
!pluginGraph_->PathExists(toVertex, fromVertex)) {
const auto involvesUserMetadata = groupPathInvolvesUserMetadata ||
fromPlugin.IsGroupUserMetadata() ||
toPlugin.IsGroupUserMetadata();
@@ -738,24 +739,9 @@ bool PluginGraph::PathExists(const vertex_t& fromVertex,
return loot::FindPath(graph_, fromVertex, toVertex, visitor);
}
bool PluginGraph::PathExistsInEitherDirection(const vertex_t& vertex,
const vertex_t& otherVertex) {
if (pathsCache_.IsPathCached(vertex, otherVertex) ||
pathsCache_.IsPathCached(otherVertex, vertex)) {
return true;
}
{
PathCacher visitor(pathsCache_, vertex, otherVertex);
if (loot::FindPath(graph_, vertex, otherVertex, visitor)) {
return true;
}
}
PathCacher visitor(pathsCache_, otherVertex, vertex);
return loot::FindPath(graph_, otherVertex, vertex, visitor);
bool PluginGraph::IsPathCached(const vertex_t& fromVertex,
const vertex_t& toVertex) {
return pathsCache_.IsPathCached(fromVertex, toVertex);
}
std::optional<std::vector<vertex_t>> PluginGraph::FindPath(
@@ -1052,7 +1038,8 @@ void PluginGraph::AddOverlapEdges() {
const auto fromVertex = thisPluginLoadsFirst ? vertex : otherVertex;
const auto toVertex = thisPluginLoadsFirst ? otherVertex : vertex;
if (!PathExistsInEitherDirection(toVertex, fromVertex)) {
if (!IsPathCached(fromVertex, toVertex) &&
!PathExists(toVertex, fromVertex)) {
AddEdge(fromVertex, toVertex, edgeType);
} else if (logger) {
logger->debug(
src/api/sorting/plugin_graph.h
+1 -2
View File
@@ -90,8 +90,7 @@ public:
bool EdgeExists(const vertex_t& fromVertex, const vertex_t& toVertex);
bool PathExists(const vertex_t& fromVertex, const vertex_t& toVertex);
bool PathExistsInEitherDirection(const vertex_t& vertex,
const vertex_t& otherVertex);
bool IsPathCached(const vertex_t& fromVertex, const vertex_t& toVertex);
std::optional<std::vector<vertex_t>> FindPath(const vertex_t& fromVertex,
const vertex_t& toVertex);