Skip to content

Minor removal of evaluating + on strings in logging functions. #1115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LADSoft merged 1 commit into from
Jan 30, 2026
+36 −33
Merged

Minor removal of evaluating + on strings in logging functions. #1115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/omake/Depends.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@

#include "Depends.h"
#include "BasicLogging.h"
Depends::~Depends() { OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3, "Depends with goal: " + this->GetGoal() + " is being destructed"); }
Depends::~Depends() { OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3, "Depends with goal: ", this->GetGoal(), " is being destructed"); }
2 changes: 1 addition & 1 deletion src/omake/Depends.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class Depends
ignoreResults(false)
{
OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3,
"Depends with goal: " + this->GetGoal() + " is being destructed");
"Depends with goal: ", this->GetGoal(), " is being destructed");
}
~Depends();

Expand Down
16 changes: 8 additions & 8 deletions src/omake/Eval.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@ void Eval::Clear()

std::string Eval::Evaluate()
{
OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3, "Eval::Evaluate called with str: " + str);
OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3, "Eval::Evaluate called with str: ", str);
std::string rv = ParseMacroLine(str);
if (expandWildcards)
rv = wildcardinternal(rv);
OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3, "Eval::Evaluate called with str: " + str);
OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3, "Eval::Evaluate called with str: ", str);
return rv;
}

Expand Down Expand Up @@ -1190,7 +1190,7 @@ std::string Eval::notdir(const std::string& names)
rv += " ";
rv += intermed;
}
OrangeC::Utils::BasicLogger::debug("Eval::notdir with Original name: " + names + " evaluated names " + working + " returns: " + rv);
OrangeC::Utils::BasicLogger::debug("Eval::notdir with Original name: ", names, " evaluated names ", working, " returns: ", rv);
return rv;
}

Expand Down Expand Up @@ -1290,7 +1290,7 @@ std::string Eval::addprefix(const std::string& arglist)

std::string Eval::wildcard(const std::string& arglist)
{
OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3, "Called Eval::wildcard with argslist: " + arglist);
OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3, "Called Eval::wildcard with argslist: ", arglist);

std::string names = strip(arglist);
std::string rv;
Expand All @@ -1305,13 +1305,13 @@ std::string Eval::wildcard(const std::string& arglist)
rv += current;
}
}
OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3,"Returning from Eval::wildcard: " + rv);
OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3,"Returning from Eval::wildcard: ", rv);

return rv;
}
std::string Eval::wildcardinternal(std::string& names)
{
OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3,"Called Eval::wildcardinternal with argslist: " + names);
OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3,"Called Eval::wildcardinternal with argslist: ", names);
CmdFiles files;
while (!names.empty())
{
Expand All @@ -1325,7 +1325,7 @@ std::string Eval::wildcardinternal(std::string& names)
rv += " ";
rv += name;
}
OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3,"Returning from Eval::wildcardinternal: " + rv);
OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3,"Returning from Eval::wildcardinternal: ", rv);
return rv;
}

Expand Down Expand Up @@ -1492,7 +1492,7 @@ std::string Eval::foreach (const std::string& arglist)

std::string Eval::call(const std::string& arglist)
{
OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3, "Called Eval::call with argslist: " + arglist);
OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3, "Called Eval::call with argslist: ", arglist);
std::string sub = arglist;
std::string args;
std::string rv;
Expand Down
10 changes: 4 additions & 6 deletions src/omake/JobServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,13 @@ std::shared_ptr<JobServer> JobServer::GetJobServer(int max_jobs)
int pid = getpid();
std::string omake_string = "OMAKE";
std::string combined = omake_string + std::to_string(pid);
OrangeC::Utils::BasicLogger::log(5,
"GetJobServer making new job server: " + combined + " job count: " + std::to_string(max_jobs));
OrangeC::Utils::BasicLogger::log(5, "GetJobServer making new job server: ", combined, " job count: ", std::to_string(max_jobs));
return std::make_shared<WINDOWSJobServer>(combined, max_jobs);
#else
int pid = getpid();
std::string omake_string = "OMAKE";
std::string combined = omake_string + std::to_string(pid);
OrangeC::Utils::BasicLogger::log(5,
"GetJobServer making new job server: " + combined + " job count: " + std::to_string(max_jobs));
OrangeC::Utils::BasicLogger::log(5, "GetJobServer making new job server: ", combined, " job count: ", std::to_string(max_jobs));

return std::make_shared<POSIXJobServer>(combined, max_jobs);
#endif
Expand All @@ -45,8 +43,8 @@ std::shared_ptr<JobServer> JobServer::GetJobServer(const std::string& auth_strin
{
std::string new_string = std::string(auth_string.begin() + found + strlen("auth:"), auth_string.end());
OrangeC::Utils::BasicLogger::log(OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG,
"GetJobServer(std::string) auth based, string: " + auth_string +
" new string: " + new_string);
"GetJobServer(std::string) auth based, string: ", auth_string,
" new string: ", new_string);
return std::make_shared<POSIXJobServer>(new_string);
}
else
Expand Down
4 changes: 2 additions & 2 deletions src/omake/Runner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ void Runner::CallRunner(Runner* runner, std::list<std::shared_ptr<RuleList>>* li
{
auto retval = runner->RunOne(list, depend, env, keepGoing);
promise.set_value(retval);
OrangeC::Utils::BasicLogger::debug("CallRunner returning from a runner: " + depend->GetGoal());
OrangeC::Utils::BasicLogger::debug("CallRunner returning from a runner: ", depend->GetGoal());
}
struct future_holding_struct
{
Expand Down Expand Up @@ -124,7 +124,7 @@ int Runner::RunOne(std::list<std::shared_ptr<RuleList>>* ruleStack_in, Depends*
{
std::promise<int> promise;
workingList.push_back(future_holding_struct(depend->GetGoal(), promise.get_future()));
OrangeC::Utils::BasicLogger::debug("RunOne CallRunner Creating a runner: " + i->GetGoal());
OrangeC::Utils::BasicLogger::debug("RunOne CallRunner Creating a runner: ", i->GetGoal());

auto thrd = std::thread(CallRunner, this, &ruleStack, i.get(), env, keepGoing, std::move(promise));
workingThreads.emplace_back(i->GetGoal(), std::move(thrd));
Expand Down
21 changes: 12 additions & 9 deletions src/omake/Spawner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,15 @@ static bool HasMake(const std::string& cmd, const std::string& make)
{
m = cmd.find_first_of(" \n\t\r\v", m + 1);
}
if ( m != std::string::npos && m > n)
if (m != std::string::npos && m > n)
return true;
// hack for autoconfig texts which use '&& $(MAKE) ...'
// a more complete solution would look for any bash operator I guess...
while (n > 0 && !isspace(cmd[n]) && cmd[n] != '&') n--;
while (n > 0 && isspace(cmd[n])) n--;
if (n > 1 && cmd[n] == '&' && cmd[n-1] == '&')
while (n > 0 && !isspace(cmd[n]) && cmd[n] != '&')
n--;
while (n > 0 && isspace(cmd[n]))
n--;
if (n > 1 && cmd[n] == '&' && cmd[n - 1] == '&')
return true;
}
}
Expand Down Expand Up @@ -236,11 +238,12 @@ int Spawner::Run(const std::string& cmdin, bool ignoreErrors, bool silent, bool
std::string varname = OS::LookupShellNames();
if (!OS::IsUnixLikeShell(varname))
{
OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3, "Command before NormalizeFileName: ", cmdin);
OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3,
"Command before NormalizeFileName: ", cmdin);

cmd = OS::NormalizeFileName(cmdin);
OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3, "Command after NormalizeFileName: ", cmd);

OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3,
"Command after NormalizeFileName: ", cmd);
}
std::string make;
Variable* v1 = VariableContainer::Instance()->Lookup("MAKE");
Expand Down Expand Up @@ -354,8 +357,8 @@ bool Spawner::split(const std::string& cmd)
}
std::string Spawner::shell(const std::string& cmd)
{
OrangeC::Utils::BasicLogger::log(OrangeC::Utils::VerbosityLevels::VERB_WARNING,
OS::JobName() + " is running $(shell " + cmd + " )");
OrangeC::Utils::BasicLogger::log(OrangeC::Utils::VerbosityLevels::VERB_WARNING, OS::JobName(), " is running $(shell ", cmd,
" )");
std::string rv = OS::SpawnWithRedirect(cmd);
int n = rv.size();
while (n && (rv[n - 1] == '\r' || rv[n - 1] == '\n'))
Expand Down
14 changes: 8 additions & 6 deletions src/omake/os.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,22 +933,24 @@ std::string OS::SpawnWithRedirect(const std::string command)
exit_condition = (WIFEXITED(status) || WIFSTOPPED(status));
if (WIFEXITED(status))
{
OrangeC::Utils::BasicLogger::debug("Process with command: " + command + " exited. ret_wait: " +
std::to_string(ret_wait) + " status: " + std::to_string(status));
OrangeC::Utils::BasicLogger::debug("Process with command: ", command,
" exited. ret_wait: ", std::to_string(ret_wait),
" status: ", std::to_string(status));
}
if (WIFSTOPPED(status))
{
OrangeC::Utils::BasicLogger::debug("Process with command: " + command + " stopped. ret_wait: " +
std::to_string(ret_wait) + " status: " + std::to_string(status));
OrangeC::Utils::BasicLogger::debug("Process with command: ", command,
" stopped. ret_wait: ", std::to_string(ret_wait),
" status: ", std::to_string(status));
}
status = WEXITSTATUS(status);
}

} while (!exit_condition);
close(pipe_cout[0]);
close(pipe_cout[1]);
OrangeC::Utils::BasicLogger::debug("OS::SpawnWithRedirect returning from command: " + command +
" with status: " + std::to_string(status));
OrangeC::Utils::BasicLogger::debug("OS::SpawnWithRedirect returning from command: ", command,
" with status: ", std::to_string(status));
return output_str;
#endif
}
Expand Down