kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: speed up actual path name by cache on windows

Browse Source
This commit is contained in:
Bill Hoffman 2007-10-02 15:48:21 -04:00
parent 019a0989d5
commit e0899bcaf2
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/kwsys/SystemTools.cxx
View File

@ -1464,7 +1464,8 @@ kwsys_stl::string SystemTools::ConvertToWindowsOutputPath(const char* path)
// make it big enough for all of path and double quotes // make it big enough for all of path and double quotes
ret.reserve(strlen(path)+3); ret.reserve(strlen(path)+3);
// put path into the string // put path into the string
ret.insert(0,path); ret.assign(path);
ret = path;
kwsys_stl::string::size_type pos = 0; kwsys_stl::string::size_type pos = 0;
// first convert all of the slashes // first convert all of the slashes
while((pos = ret.find('/', pos)) != kwsys_stl::string::npos) while((pos = ret.find('/', pos)) != kwsys_stl::string::npos)
@ -2879,6 +2880,14 @@ kwsys_stl::string SystemTools::GetActualCaseForPath(const char* p)
#ifndef _WIN32 #ifndef _WIN32
return p; return p;
#else #else
// Check to see if actual case has already been called
// for this path, and the result is stored in the LongPathMap
SystemToolsTranslationMap::iterator i =
SystemTools::LongPathMap->find(p);
if(i != SystemTools::LongPathMap->end())
{
return i->second;
}
kwsys_stl::string shortPath; kwsys_stl::string shortPath;
if(!SystemTools::GetShortPath(p, shortPath)) if(!SystemTools::GetShortPath(p, shortPath))
{ {
@ -2895,6 +2904,7 @@ kwsys_stl::string SystemTools::GetActualCaseForPath(const char* p)
{ {
longPath[0] = toupper(longPath[0]); longPath[0] = toupper(longPath[0]);
} }
(*SystemTools::LongPathMap)[p] = longPath;
return longPath; return longPath;
#endif #endif
} }
@ -4192,6 +4202,7 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion()
// necessary. // necessary.
unsigned int SystemToolsManagerCount; unsigned int SystemToolsManagerCount;
SystemToolsTranslationMap *SystemTools::TranslationMap; SystemToolsTranslationMap *SystemTools::TranslationMap;
SystemToolsTranslationMap *SystemTools::LongPathMap;
// SystemToolsManager manages the SystemTools singleton. // SystemToolsManager manages the SystemTools singleton.
// SystemToolsManager should be included in any translation unit // SystemToolsManager should be included in any translation unit
@ -4219,6 +4230,7 @@ void SystemTools::ClassInitialize()
{ {
// Allocate the translation map first. // Allocate the translation map first.
SystemTools::TranslationMap = new SystemToolsTranslationMap; SystemTools::TranslationMap = new SystemToolsTranslationMap;
SystemTools::LongPathMap = new SystemToolsTranslationMap;
// Add some special translation paths for unix. These are not added // Add some special translation paths for unix. These are not added
// for windows because drive letters need to be maintained. Also, // for windows because drive letters need to be maintained. Also,
@ -4274,6 +4286,7 @@ void SystemTools::ClassInitialize()
void SystemTools::ClassFinalize() void SystemTools::ClassFinalize()
{ {
delete SystemTools::TranslationMap; delete SystemTools::TranslationMap;
delete SystemTools::LongPathMap;
} }

1
Source/kwsys/SystemTools.hxx.in
View File

@ -813,6 +813,7 @@ private:
* Each time 'dir' will be found it will be replace by 'refdir' * Each time 'dir' will be found it will be replace by 'refdir'
*/ */
static SystemToolsTranslationMap *TranslationMap; static SystemToolsTranslationMap *TranslationMap;
static SystemToolsTranslationMap *LongPathMap;
friend class SystemToolsManager; friend class SystemToolsManager;
}; };