cmOrderDirectories: Reduce repeat realpath() calls

Since commit v3.1.0-rc1~110^2 (Tolerate symlinks during RPATH ordering,
2014-09-09) we call realpath() for every directory ordering constraint
check.  On some platforms/filesystems this is slow, so memoize the
result of the call for each directory.
This commit is contained in:
Brad King 2015-12-01 10:57:33 -05:00
parent 6b18528743
commit 4e3cf8b012
2 changed files with 18 additions and 2 deletions

View File

@ -641,6 +641,19 @@ void cmOrderDirectories::DiagnoseCycle()
bool cmOrderDirectories::IsSameDirectory(std::string const& l,
std::string const& r)
{
return (l == r ||
cmSystemTools::GetRealPath(l) == cmSystemTools::GetRealPath(r));
return this->GetRealPath(l) == this->GetRealPath(r);
}
std::string const& cmOrderDirectories::GetRealPath(std::string const& dir)
{
std::map<std::string, std::string>::iterator i =
this->RealPaths.lower_bound(dir);
if (i == this->RealPaths.end() ||
this->RealPaths.key_comp()(dir, i->first))
{
typedef std::map<std::string, std::string>::value_type value_type;
i = this->RealPaths.insert(
i, value_type(dir, cmSystemTools::GetRealPath(dir)));
}
return i->second;
}

View File

@ -83,6 +83,9 @@ private:
// Compare directories after resolving symlinks.
bool IsSameDirectory(std::string const& l, std::string const& r);
std::string const& GetRealPath(std::string const& dir);
std::map<std::string, std::string> RealPaths;
friend class cmOrderDirectoriesConstraint;
friend class cmOrderDirectoriesConstraintLibrary;
};