From 4e3cf8b012404e4d9602c16d473480cc3d0c7928 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 1 Dec 2015 10:57:33 -0500 Subject: 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. --- Source/cmOrderDirectories.cxx | 17 +++++++++++++++-- Source/cmOrderDirectories.h | 3 +++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Source/cmOrderDirectories.cxx b/Source/cmOrderDirectories.cxx index 9491204..e3406a8 100644 --- a/Source/cmOrderDirectories.cxx +++ b/Source/cmOrderDirectories.cxx @@ -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::iterator i = + this->RealPaths.lower_bound(dir); + if (i == this->RealPaths.end() || + this->RealPaths.key_comp()(dir, i->first)) + { + typedef std::map::value_type value_type; + i = this->RealPaths.insert( + i, value_type(dir, cmSystemTools::GetRealPath(dir))); + } + return i->second; } diff --git a/Source/cmOrderDirectories.h b/Source/cmOrderDirectories.h index 0657e92..477216b 100644 --- a/Source/cmOrderDirectories.h +++ b/Source/cmOrderDirectories.h @@ -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 RealPaths; + friend class cmOrderDirectoriesConstraint; friend class cmOrderDirectoriesConstraintLibrary; }; -- cgit v0.12