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

Merge topic 'index-directories' 

cda8c782 cmGlobalGenerator: Optimize FindMakefile method with an index
This commit is contained in:
Brad King 2016-09-27 08:22:57 -04:00 committed by CMake Topic Stage
parent ded15f26b8 cda8c782db
commit 069d0e2431
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Source/cmGlobalGenerator.cxx
View File

@ -1059,6 +1059,7 @@ void cmGlobalGenerator::Configure()
cmMakefile* dirMf = new cmMakefile(this, snapshot); cmMakefile* dirMf = new cmMakefile(this, snapshot);
this->Makefiles.push_back(dirMf); this->Makefiles.push_back(dirMf);
this->IndexMakefile(dirMf);
this->BinaryDirectories.insert( this->BinaryDirectories.insert(
this->CMakeInstance->GetHomeOutputDirectory()); this->CMakeInstance->GetHomeOutputDirectory());
@ -1528,6 +1529,7 @@ void cmGlobalGenerator::ClearGeneratorMembers()
this->TargetDependencies.clear(); this->TargetDependencies.clear();
this->TargetSearchIndex.clear(); this->TargetSearchIndex.clear();
this->GeneratorTargetSearchIndex.clear(); this->GeneratorTargetSearchIndex.clear();
this->MakefileSearchIndex.clear();
this->ProjectMap.clear(); this->ProjectMap.clear();
this->RuleHashes.clear(); this->RuleHashes.clear();
this->DirectoryContentMap.clear(); this->DirectoryContentMap.clear();
@ -1805,6 +1807,7 @@ std::string cmGlobalGenerator::GenerateCMakeBuildCommand(
void cmGlobalGenerator::AddMakefile(cmMakefile* mf) void cmGlobalGenerator::AddMakefile(cmMakefile* mf)
{ {
this->Makefiles.push_back(mf); this->Makefiles.push_back(mf);
this->IndexMakefile(mf);
// update progress // update progress
// estimate how many lg there will be // estimate how many lg there will be
@ -1962,12 +1965,9 @@ void cmGlobalGenerator::FillProjectMap()
cmMakefile* cmGlobalGenerator::FindMakefile(const std::string& start_dir) const cmMakefile* cmGlobalGenerator::FindMakefile(const std::string& start_dir) const
{ {
for (std::vector<cmMakefile*>::const_iterator it = this->Makefiles.begin(); MakefileMap::const_iterator i = this->MakefileSearchIndex.find(start_dir);
it != this->Makefiles.end(); ++it) { if (i != this->MakefileSearchIndex.end()) {
std::string sd = (*it)->GetCurrentSourceDirectory(); return i->second;
if (sd == start_dir) {
return *it;
}
} }
return CM_NULLPTR; return CM_NULLPTR;
} }
@ -2012,6 +2012,17 @@ void cmGlobalGenerator::IndexGeneratorTarget(cmGeneratorTarget* gt)
} }
} }
void cmGlobalGenerator::IndexMakefile(cmMakefile* mf)
{
// FIXME: add_subdirectory supports multiple build directories
// sharing the same source directory. We currently index only the
// first one, because that is what FindMakefile has always returned.
// All of its callers will need to be modified to support looking
// up directories by build directory path.
this->MakefileSearchIndex.insert(
MakefileMap::value_type(mf->GetCurrentSourceDirectory(), mf));
}
cmTarget* cmGlobalGenerator::FindTargetImpl(std::string const& name) const cmTarget* cmGlobalGenerator::FindTargetImpl(std::string const& name) const
{ {
TargetMap::const_iterator i = this->TargetSearchIndex.find(name); TargetMap::const_iterator i = this->TargetSearchIndex.find(name);

10
Source/cmGlobalGenerator.h
View File

@ -462,13 +462,16 @@ private:
typedef std::unordered_map<std::string, cmTarget*> TargetMap; typedef std::unordered_map<std::string, cmTarget*> TargetMap;
typedef std::unordered_map<std::string, cmGeneratorTarget*> typedef std::unordered_map<std::string, cmGeneratorTarget*>
GeneratorTargetMap; GeneratorTargetMap;
typedef std::unordered_map<std::string, cmMakefile*> MakefileMap;
#else #else
typedef cmsys::hash_map<std::string, cmTarget*> TargetMap; typedef cmsys::hash_map<std::string, cmTarget*> TargetMap;
typedef cmsys::hash_map<std::string, cmGeneratorTarget*> GeneratorTargetMap; typedef cmsys::hash_map<std::string, cmGeneratorTarget*> GeneratorTargetMap;
typedef cmsys::hash_map<std::string, cmMakefile*> MakefileMap;
#endif #endif
#else #else
typedef std::map<std::string, cmTarget*> TargetMap; typedef std::map<std::string, cmTarget*> TargetMap;
typedef std::map<std::string, cmGeneratorTarget*> GeneratorTargetMap; typedef std::map<std::string, cmGeneratorTarget*> GeneratorTargetMap;
typedef std::map<std::string, cmMakefile*> MakefileMap;
#endif #endif
// Map efficiently from target name to cmTarget instance. // Map efficiently from target name to cmTarget instance.
// Do not use this structure for looping over all targets. // Do not use this structure for looping over all targets.
@ -476,6 +479,11 @@ private:
TargetMap TargetSearchIndex; TargetMap TargetSearchIndex;
GeneratorTargetMap GeneratorTargetSearchIndex; GeneratorTargetMap GeneratorTargetSearchIndex;
// Map efficiently from source directory path to cmMakefile instance.
// Do not use this structure for looping over all directories.
// It may not contain all of them (see note in IndexMakefile method).
MakefileMap MakefileSearchIndex;
cmMakefile* TryCompileOuterMakefile; cmMakefile* TryCompileOuterMakefile;
// If you add a new map here, make sure it is copied // If you add a new map here, make sure it is copied
// in EnableLanguagesFromGenerator // in EnableLanguagesFromGenerator
@ -528,6 +536,8 @@ private:
void ClearGeneratorMembers(); void ClearGeneratorMembers();
void IndexMakefile(cmMakefile* mf);
virtual const char* GetBuildIgnoreErrorsFlag() const { return CM_NULLPTR; } virtual const char* GetBuildIgnoreErrorsFlag() const { return CM_NULLPTR; }
// Cache directory content and target files to be built. // Cache directory content and target files to be built.