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

cmConditionEvaluator: Pre-allocate keyword strings

Browse Source 
Calls to `IsKeyword("...")` cause runtime construction of std::string.
Avoid possible repeated allocation by pre-allocating keyword strings
during initialization.
This commit is contained in:
Brad King 2016-03-29 10:31:21 -04:00
parent 90f24f016e
commit 5c324294ce
1 changed files with 58 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
Source/cmConditionEvaluator.cxx
View File

@ -14,6 +14,33 @@
#include "cmOutputConverter.h" #include "cmOutputConverter.h"
#include "cmAlgorithms.h" #include "cmAlgorithms.h"
static std::string const keyAND = "AND";
static std::string const keyCOMMAND = "COMMAND";
static std::string const keyDEFINED = "DEFINED";
static std::string const keyEQUAL = "EQUAL";
static std::string const keyEXISTS = "EXISTS";
static std::string const keyGREATER = "GREATER";
static std::string const keyIN_LIST = "IN_LIST";
static std::string const keyIS_ABSOLUTE = "IS_ABSOLUTE";
static std::string const keyIS_DIRECTORY = "IS_DIRECTORY";
static std::string const keyIS_NEWER_THAN = "IS_NEWER_THAN";
static std::string const keyIS_SYMLINK = "IS_SYMLINK";
static std::string const keyLESS = "LESS";
static std::string const keyMATCHES = "MATCHES";
static std::string const keyNOT = "NOT";
static std::string const keyOR = "OR";
static std::string const keyParenL = "(";
static std::string const keyParenR = ")";
static std::string const keyPOLICY = "POLICY";
static std::string const keySTREQUAL = "STREQUAL";
static std::string const keySTRGREATER = "STRGREATER";
static std::string const keySTRLESS = "STRLESS";
static std::string const keyTARGET = "TARGET";
static std::string const keyTEST = "TEST";
static std::string const keyVERSION_EQUAL = "VERSION_EQUAL";
static std::string const keyVERSION_GREATER = "VERSION_GREATER";
static std::string const keyVERSION_LESS = "VERSION_LESS";
cmConditionEvaluator::cmConditionEvaluator(cmMakefile& makefile, cmConditionEvaluator::cmConditionEvaluator(cmMakefile& makefile,
const cmListFileContext &context, const cmListFileContext &context,
const cmListFileBacktrace& bt): const cmListFileBacktrace& bt):
@ -400,7 +427,7 @@ bool cmConditionEvaluator::HandleLevel0(cmArgumentList &newArgs,
cmArgumentList::iterator arg = newArgs.begin(); cmArgumentList::iterator arg = newArgs.begin();
while (arg != newArgs.end()) while (arg != newArgs.end())
{ {
if (IsKeyword("(", *arg)) if (IsKeyword(keyParenL, *arg))
{ {
// search for the closing paren for this opening one // search for the closing paren for this opening one
cmArgumentList::iterator argClose; cmArgumentList::iterator argClose;
@ -409,11 +436,11 @@ bool cmConditionEvaluator::HandleLevel0(cmArgumentList &newArgs,
unsigned int depth = 1; unsigned int depth = 1;
while (argClose != newArgs.end() && depth) while (argClose != newArgs.end() && depth)
{ {
if (this->IsKeyword("(", *argClose)) if (this->IsKeyword(keyParenL, *argClose))
{ {
depth++; depth++;
} }
if (this->IsKeyword(")", *argClose)) if (this->IsKeyword(keyParenR, *argClose))
{ {
depth--; depth--;
} }
@ -474,35 +501,35 @@ bool cmConditionEvaluator::HandleLevel1(cmArgumentList &newArgs,
argP1 = arg; argP1 = arg;
this->IncrementArguments(newArgs,argP1,argP2); this->IncrementArguments(newArgs,argP1,argP2);
// does a file exist // does a file exist
if (this->IsKeyword("EXISTS", *arg) && argP1 != newArgs.end()) if (this->IsKeyword(keyEXISTS, *arg) && argP1 != newArgs.end())
{ {
this->HandlePredicate( this->HandlePredicate(
cmSystemTools::FileExists(argP1->c_str()), cmSystemTools::FileExists(argP1->c_str()),
reducible, arg, newArgs, argP1, argP2); reducible, arg, newArgs, argP1, argP2);
} }
// does a directory with this name exist // does a directory with this name exist
if (this->IsKeyword("IS_DIRECTORY", *arg) && argP1 != newArgs.end()) if (this->IsKeyword(keyIS_DIRECTORY, *arg) && argP1 != newArgs.end())
{ {
this->HandlePredicate( this->HandlePredicate(
cmSystemTools::FileIsDirectory(argP1->c_str()), cmSystemTools::FileIsDirectory(argP1->c_str()),
reducible, arg, newArgs, argP1, argP2); reducible, arg, newArgs, argP1, argP2);
} }
// does a symlink with this name exist // does a symlink with this name exist
if (this->IsKeyword("IS_SYMLINK", *arg) && argP1 != newArgs.end()) if (this->IsKeyword(keyIS_SYMLINK, *arg) && argP1 != newArgs.end())
{ {
this->HandlePredicate( this->HandlePredicate(
cmSystemTools::FileIsSymlink(argP1->c_str()), cmSystemTools::FileIsSymlink(argP1->c_str()),
reducible, arg, newArgs, argP1, argP2); reducible, arg, newArgs, argP1, argP2);
} }
// is the given path an absolute path ? // is the given path an absolute path ?
if (this->IsKeyword("IS_ABSOLUTE", *arg) && argP1 != newArgs.end()) if (this->IsKeyword(keyIS_ABSOLUTE, *arg) && argP1 != newArgs.end())
{ {
this->HandlePredicate( this->HandlePredicate(
cmSystemTools::FileIsFullPath(argP1->c_str()), cmSystemTools::FileIsFullPath(argP1->c_str()),
reducible, arg, newArgs, argP1, argP2); reducible, arg, newArgs, argP1, argP2);
} }
// does a command exist // does a command exist
if (this->IsKeyword("COMMAND", *arg) && argP1 != newArgs.end()) if (this->IsKeyword(keyCOMMAND, *arg) && argP1 != newArgs.end())
{ {
cmCommand* command = cmCommand* command =
this->Makefile.GetState()->GetCommand(argP1->c_str()); this->Makefile.GetState()->GetCommand(argP1->c_str());
@ -511,7 +538,7 @@ bool cmConditionEvaluator::HandleLevel1(cmArgumentList &newArgs,
reducible, arg, newArgs, argP1, argP2); reducible, arg, newArgs, argP1, argP2);
} }
// does a policy exist // does a policy exist
if (this->IsKeyword("POLICY", *arg) && argP1 != newArgs.end()) if (this->IsKeyword(keyPOLICY, *arg) && argP1 != newArgs.end())
{ {
cmPolicies::PolicyID pid; cmPolicies::PolicyID pid;
this->HandlePredicate( this->HandlePredicate(
@ -519,7 +546,7 @@ bool cmConditionEvaluator::HandleLevel1(cmArgumentList &newArgs,
reducible, arg, newArgs, argP1, argP2); reducible, arg, newArgs, argP1, argP2);
} }
// does a target exist // does a target exist
if (this->IsKeyword("TARGET", *arg) && argP1 != newArgs.end()) if (this->IsKeyword(keyTARGET, *arg) && argP1 != newArgs.end())
{ {
this->HandlePredicate( this->HandlePredicate(
this->Makefile.FindTargetToUse(argP1->GetValue())?true:false, this->Makefile.FindTargetToUse(argP1->GetValue())?true:false,
@ -529,7 +556,7 @@ bool cmConditionEvaluator::HandleLevel1(cmArgumentList &newArgs,
if(this->Policy64Status != cmPolicies::OLD && if(this->Policy64Status != cmPolicies::OLD &&
this->Policy64Status != cmPolicies::WARN) this->Policy64Status != cmPolicies::WARN)
{ {
if (this->IsKeyword("TEST", *arg) && argP1 != newArgs.end()) if (this->IsKeyword(keyTEST, *arg) && argP1 != newArgs.end())
{ {
const cmTest* haveTest = this->Makefile.GetTest(argP1->c_str()); const cmTest* haveTest = this->Makefile.GetTest(argP1->c_str());
this->HandlePredicate( this->HandlePredicate(
@ -538,7 +565,7 @@ bool cmConditionEvaluator::HandleLevel1(cmArgumentList &newArgs,
} }
} }
else if(this->Policy64Status == cmPolicies::WARN && else if(this->Policy64Status == cmPolicies::WARN &&
this->IsKeyword("TEST", *arg)) this->IsKeyword(keyTEST, *arg))
{ {
std::ostringstream e; std::ostringstream e;
e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0064) << "\n"; e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0064) << "\n";
@ -549,7 +576,7 @@ bool cmConditionEvaluator::HandleLevel1(cmArgumentList &newArgs,
this->Makefile.IssueMessage(cmake::AUTHOR_WARNING, e.str()); this->Makefile.IssueMessage(cmake::AUTHOR_WARNING, e.str());
} }
// is a variable defined // is a variable defined
if (this->IsKeyword("DEFINED", *arg) && argP1 != newArgs.end()) if (this->IsKeyword(keyDEFINED, *arg) && argP1 != newArgs.end())
{ {
size_t argP1len = argP1->GetValue().size(); size_t argP1len = argP1->GetValue().size();
bool bdef = false; bool bdef = false;
@ -593,7 +620,7 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList &newArgs,
argP1 = arg; argP1 = arg;
this->IncrementArguments(newArgs,argP1,argP2); this->IncrementArguments(newArgs,argP1,argP2);
if (argP1 != newArgs.end() && argP2 != newArgs.end() && if (argP1 != newArgs.end() && argP2 != newArgs.end() &&
IsKeyword("MATCHES", *argP1)) IsKeyword(keyMATCHES, *argP1))
{ {
def = this->GetVariableOrString(*arg); def = this->GetVariableOrString(*arg);
if (def != arg->c_str() // yes, we compare the pointer value if (def != arg->c_str() // yes, we compare the pointer value
@ -631,7 +658,7 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList &newArgs,
reducible = 1; reducible = 1;
} }
if (argP1 != newArgs.end() && this->IsKeyword("MATCHES", *arg)) if (argP1 != newArgs.end() && this->IsKeyword(keyMATCHES, *arg))
{ {
*arg = cmExpandedCommandArgument("0", true); *arg = cmExpandedCommandArgument("0", true);
newArgs.erase(argP1); newArgs.erase(argP1);
@ -641,9 +668,9 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList &newArgs,
} }
if (argP1 != newArgs.end() && argP2 != newArgs.end() && if (argP1 != newArgs.end() && argP2 != newArgs.end() &&
(this->IsKeyword("LESS", *argP1) || (this->IsKeyword(keyLESS, *argP1) ||
this->IsKeyword("GREATER", *argP1) || this->IsKeyword(keyGREATER, *argP1) ||
this->IsKeyword("EQUAL", *argP1))) this->IsKeyword(keyEQUAL, *argP1)))
{ {
def = this->GetVariableOrString(*arg); def = this->GetVariableOrString(*arg);
def2 = this->GetVariableOrString(*argP2); def2 = this->GetVariableOrString(*argP2);
@ -672,9 +699,9 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList &newArgs,
} }
if (argP1 != newArgs.end() && argP2 != newArgs.end() && if (argP1 != newArgs.end() && argP2 != newArgs.end() &&
(this->IsKeyword("STRLESS", *argP1) || (this->IsKeyword(keySTRLESS, *argP1) ||
this->IsKeyword("STREQUAL", *argP1) || this->IsKeyword(keySTREQUAL, *argP1) ||
this->IsKeyword("STRGREATER", *argP1))) this->IsKeyword(keySTRGREATER, *argP1)))
{ {
def = this->GetVariableOrString(*arg); def = this->GetVariableOrString(*arg);
def2 = this->GetVariableOrString(*argP2); def2 = this->GetVariableOrString(*argP2);
@ -697,18 +724,18 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList &newArgs,
} }
if (argP1 != newArgs.end() && argP2 != newArgs.end() && if (argP1 != newArgs.end() && argP2 != newArgs.end() &&
(this->IsKeyword("VERSION_LESS", *argP1) || (this->IsKeyword(keyVERSION_LESS, *argP1) ||
this->IsKeyword("VERSION_GREATER", *argP1) || this->IsKeyword(keyVERSION_GREATER, *argP1) ||
this->IsKeyword("VERSION_EQUAL", *argP1))) this->IsKeyword(keyVERSION_EQUAL, *argP1)))
{ {
def = this->GetVariableOrString(*arg); def = this->GetVariableOrString(*arg);
def2 = this->GetVariableOrString(*argP2); def2 = this->GetVariableOrString(*argP2);
cmSystemTools::CompareOp op = cmSystemTools::OP_EQUAL; cmSystemTools::CompareOp op = cmSystemTools::OP_EQUAL;
if(*argP1 == "VERSION_LESS") if(*argP1 == keyVERSION_LESS)
{ {
op = cmSystemTools::OP_LESS; op = cmSystemTools::OP_LESS;
} }
else if(*argP1 == "VERSION_GREATER") else if(*argP1 == keyVERSION_GREATER)
{ {
op = cmSystemTools::OP_GREATER; op = cmSystemTools::OP_GREATER;
} }
@ -719,7 +746,7 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList &newArgs,
// is file A newer than file B // is file A newer than file B
if (argP1 != newArgs.end() && argP2 != newArgs.end() && if (argP1 != newArgs.end() && argP2 != newArgs.end() &&
this->IsKeyword("IS_NEWER_THAN", *argP1)) this->IsKeyword(keyIS_NEWER_THAN, *argP1))
{ {
int fileIsNewer=0; int fileIsNewer=0;
bool success=cmSystemTools::FileTimeCompare(arg->GetValue(), bool success=cmSystemTools::FileTimeCompare(arg->GetValue(),
@ -731,7 +758,7 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList &newArgs,
} }
if (argP1 != newArgs.end() && argP2 != newArgs.end() && if (argP1 != newArgs.end() && argP2 != newArgs.end() &&
this->IsKeyword("IN_LIST", *argP1)) this->IsKeyword(keyIN_LIST, *argP1))
{ {
if(this->Policy57Status != cmPolicies::OLD && if(this->Policy57Status != cmPolicies::OLD &&
this->Policy57Status != cmPolicies::WARN) this->Policy57Status != cmPolicies::WARN)
@ -788,7 +815,7 @@ bool cmConditionEvaluator::HandleLevel3(cmArgumentList &newArgs,
{ {
argP1 = arg; argP1 = arg;
IncrementArguments(newArgs,argP1,argP2); IncrementArguments(newArgs,argP1,argP2);
if (argP1 != newArgs.end() && IsKeyword("NOT", *arg)) if (argP1 != newArgs.end() && IsKeyword(keyNOT, *arg))
{ {
bool rhs = this->GetBooleanValueWithAutoDereference(*argP1, bool rhs = this->GetBooleanValueWithAutoDereference(*argP1,
errorString, errorString,
@ -821,7 +848,7 @@ bool cmConditionEvaluator::HandleLevel4(cmArgumentList &newArgs,
{ {
argP1 = arg; argP1 = arg;
IncrementArguments(newArgs,argP1,argP2); IncrementArguments(newArgs,argP1,argP2);
if (argP1 != newArgs.end() && IsKeyword("AND", *argP1) && if (argP1 != newArgs.end() && IsKeyword(keyAND, *argP1) &&
argP2 != newArgs.end()) argP2 != newArgs.end())
{ {
lhs = this->GetBooleanValueWithAutoDereference(*arg, lhs = this->GetBooleanValueWithAutoDereference(*arg,
@ -834,7 +861,7 @@ bool cmConditionEvaluator::HandleLevel4(cmArgumentList &newArgs,
reducible, arg, newArgs, argP1, argP2); reducible, arg, newArgs, argP1, argP2);
} }
if (argP1 != newArgs.end() && this->IsKeyword("OR", *argP1) && if (argP1 != newArgs.end() && this->IsKeyword(keyOR, *argP1) &&
argP2 != newArgs.end()) argP2 != newArgs.end())
{ {
lhs = this->GetBooleanValueWithAutoDereference(*arg, lhs = this->GetBooleanValueWithAutoDereference(*arg,