mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-08 06:40:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmOutputConverter: Cache Short Paths

Browse Source 
Cache the Short Paths since we only convert the same few paths anyway
and calling `GetShortPathNameW` is really expensive.

Also, compile the code path only on Windows hosts since it only runs
when using a Windows Shell anyway.
This commit is contained in:
Clemens Wasser
2022-01-22 10:44:48 +01:00
committed by Brad King
parent 850bdc4203
commit 6f835c3699
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Source/cmOutputConverter.cxx
View File

@@ -8,6 +8,11 @@
#include <set>
#include <vector>
#ifdef _WIN32
# include <unordered_map>
# include <utility>
#endif
#include "cmState.h"
#include "cmStateDirectory.h"
#include "cmStringAlgorithms.h"
@@ -117,17 +122,34 @@ std::string cmOutputConverter::MaybeRelativeToCurBinDir(
std::string cmOutputConverter::ConvertToOutputForExisting(
const std::string& remote, OutputFormat format) const
{
#ifdef _WIN32
// Cache the Short Paths since we only convert the same few paths anyway and
// calling `GetShortPathNameW` is really expensive.
static std::unordered_map<std::string, std::string> shortPathCache{};
// If this is a windows shell, the result has a space, and the path
// already exists, we can use a short-path to reference it without a
// space.
if (this->GetState()->UseWindowsShell() &&
remote.find_first_of(" #") != std::string::npos &&
cmSystemTools::FileExists(remote)) {
std::string tmp;
if (cmSystemTools::GetShortPath(remote, tmp)) {
return this->ConvertToOutputFormat(tmp, format);
}
std::string shortPath = [&]() {
auto cachedShortPathIt = shortPathCache.find(remote);
if (cachedShortPathIt != shortPathCache.end()) {
return cachedShortPathIt->second;
}
std::string tmp{};
cmSystemTools::GetShortPath(remote, tmp);
shortPathCache[remote] = tmp;
return tmp;
}();
return this->ConvertToOutputFormat(shortPath, format);
}
#endif
// Otherwise, perform standard conversion.
return this->ConvertToOutputFormat(remote, format);