Merge remote-tracking branch 'aosp/upstream' into master
am: 341a2ceccb
Change-Id: I4aae5b2b678f9a9a35dc2e91bb53664fa3238c7b
diff --git a/AUTHORS b/AUTHORS
index 3ca8fe5..0acaa9e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,4 @@
-# This is the official list of glog authors for copyright purposes.
+# This is the official list of kati authors for copyright purposes.
# This file is distinct from the CONTRIBUTORS files.
# See the latter for an explanation.
#
@@ -9,5 +9,6 @@
# Please keep the list sorted.
Google Inc.
+Koichi Shiraishi <zchee.io@gmail.com>
Kouhei Sutou <kou@cozmixng.org>
Po Hu <hupo1985@gmail.com>
diff --git a/Android.bp b/Android.bp
index f95b366..8dbb9cb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -25,6 +25,11 @@
host_ldlibs: ["-lrt", "-lpthread"],
},
},
+ tidy_checks: [
+ "-google-global-names-in-headers",
+ "-google-build-using-namespace",
+ "-google-explicit-constructor",
+ ],
}
cc_library_host_static {
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index c153787..3c2e7d4 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -25,6 +25,7 @@
Colin Cross <ccross@google.com>
Dan Willemsen <dwillemsen@google.com>
Fumitoshi Ukai <ukai@google.com>
+Koichi Shiraishi <zchee.io@gmail.com>
Kouhei Sutou <kou@cozmixng.org>
Po Hu <hupo1985@gmail.com>
Ryo Hashimoto <hashimoto@google.com>
diff --git a/Makefile.kati b/Makefile.kati
index fa29d62..df91cbb 100644
--- a/Makefile.kati
+++ b/Makefile.kati
@@ -22,7 +22,7 @@
kati: go_src_stamp
-rm -f out/bin/kati
- GOPATH=${KATI_GOPATH} go install -ldflags "-X github.com/google/kati.gitVersion $(shell git rev-parse HEAD)" github.com/google/kati/cmd/kati
+ GOPATH=${KATI_GOPATH} go install -ldflags "-X github.com/google/kati.gitVersion=$(shell git rev-parse HEAD)" github.com/google/kati/cmd/kati
cp out/bin/kati $@
go_src_stamp: $(GO_SRCS) $(wildcard cmd/*/*.go)
diff --git a/affinity.cc b/affinity.cc
index 0743f94..5448b29 100644
--- a/affinity.cc
+++ b/affinity.cc
@@ -12,6 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+// +build ignore
+
#include "affinity.h"
#include "flags.h"
@@ -19,15 +21,29 @@
#ifdef __linux__
+#include <random>
+
#include <sched.h>
+#include <sys/types.h>
+#include <unistd.h>
void SetAffinityForSingleThread() {
cpu_set_t cs;
CPU_ZERO(&cs);
- int n = g_flags.num_cpus / 2;
- CPU_SET(n, &cs);
- if (n > 1)
- CPU_SET(n + 1, &cs);
+ std::default_random_engine generator(getpid());
+ std::uniform_int_distribution<int> distribution(0,g_flags.num_cpus-1);
+ int cpu = distribution(generator);
+
+ // Try to come up with a CPU and one close to it. This should work on most
+ // hyperthreaded system, but may be less optimal under stranger setups.
+ // Choosing two completely different CPUs would work here as well, it's just a
+ // couple percent faster if they're close (and still faster than letting the
+ // scheduler do whatever it wants).
+ cpu = cpu - (cpu % 2);
+ CPU_SET(cpu, &cs);
+ if (g_flags.num_cpus > 1)
+ CPU_SET(cpu+1, &cs);
+
if (sched_setaffinity(0, sizeof(cs), &cs) < 0)
WARN("sched_setaffinity: %s", strerror(errno));
}
diff --git a/dep.cc b/dep.cc
index 502ec47..75dff76 100644
--- a/dep.cc
+++ b/dep.cc
@@ -156,16 +156,18 @@
if (rules.empty()) {
is_double_colon = r->is_double_colon;
} else if (is_double_colon != r->is_double_colon) {
- ERROR("%s:%d: *** target file `%s' has both : and :: entries.",
- LOCF(r->loc), output.c_str());
+ ERROR_LOC(r->loc, "*** target file `%s' has both : and :: entries.",
+ output.c_str());
}
if (primary_rule && !r->cmds.empty() &&
!IsSuffixRule(output) && !r->is_double_colon) {
- WARN("%s:%d: warning: overriding commands for target `%s'",
- LOCF(r->cmd_loc()), output.c_str());
- WARN("%s:%d: warning: ignoring old commands for target `%s'",
- LOCF(primary_rule->cmd_loc()), output.c_str());
+ WARN_LOC(r->cmd_loc(),
+ "warning: overriding commands for target `%s'",
+ output.c_str());
+ WARN_LOC(primary_rule->cmd_loc(),
+ "warning: ignoring old commands for target `%s'",
+ output.c_str());
primary_rule = r;
}
if (!primary_rule && !r->cmds.empty()) {
@@ -231,6 +233,7 @@
is_restat(r),
rule_vars(NULL),
depfile_var(NULL),
+ ninja_pool_var(NULL),
output_pattern(Symbol::IsUninitialized()) {
g_dep_node_pool->push_back(this);
}
@@ -244,7 +247,8 @@
rule_vars_(rule_vars),
implicit_rules_(new RuleTrie()),
first_rule_(Symbol::IsUninitialized{}),
- depfile_var_name_(Intern(".KATI_DEPFILE")) {
+ depfile_var_name_(Intern(".KATI_DEPFILE")),
+ ninja_pool_var_name_(Intern(".KATI_NINJA_POOL")) {
ScopedTimeReporter tr("make dep (populate)");
PopulateRules(rules);
// TODO?
@@ -272,8 +276,7 @@
if (targets.empty()) {
suffix_rules_.clear();
} else {
- WARN("%s:%d: kati doesn't support .SUFFIXES with prerequisites",
- LOCF(loc));
+ WARN_LOC(loc, "kati doesn't support .SUFFIXES with prerequisites");
}
}
@@ -294,7 +297,7 @@
};
for (const char** p = kUnsupportedBuiltinTargets; *p; p++) {
if (GetRuleInputs(Intern(*p), &targets, &loc)) {
- WARN("%s:%d: kati doesn't support %s", LOCF(loc), *p);
+ WARN_LOC(loc, "kati doesn't support %s", *p);
}
}
}
@@ -534,7 +537,7 @@
if (found == suffix_rules_.end())
return rule_merger;
- for (shared_ptr<Rule> irule : found->second) {
+ for (const shared_ptr<Rule> &irule : found->second) {
CHECK(irule->inputs.size() == 1);
Symbol input = ReplaceSuffix(output, irule->inputs[0]);
if (!Exists(input))
@@ -607,6 +610,8 @@
if (name == depfile_var_name_) {
n->depfile_var = new_var;
+ } else if (name == ninja_pool_var_name_) {
+ n->ninja_pool_var = new_var;
} else {
sv.emplace_back(new ScopedVar(cur_rule_vars_.get(), name, new_var));
}
@@ -651,6 +656,7 @@
unordered_set<Symbol> phony_;
unordered_set<Symbol> restat_;
Symbol depfile_var_name_;
+ Symbol ninja_pool_var_name_;
};
void MakeDep(Evaluator* ev,
diff --git a/dep.h b/dep.h
index 4302997..5e879e3 100644
--- a/dep.h
+++ b/dep.h
@@ -45,6 +45,7 @@
vector<Symbol> actual_order_only_inputs;
Vars* rule_vars;
Var* depfile_var;
+ Var* ninja_pool_var;
Symbol output_pattern;
Loc loc;
};
diff --git a/eval.cc b/eval.cc
index 4b56f1f..7a08be7 100644
--- a/eval.cc
+++ b/eval.cc
@@ -383,7 +383,7 @@
}
void Evaluator::Error(const string& msg) {
- ERROR("%s:%d: %s", LOCF(loc_), msg.c_str());
+ ERROR_LOC(loc_, "%s", msg.c_str());
}
unordered_set<Symbol> Evaluator::used_undefined_vars_;
diff --git a/expr.cc b/expr.cc
index 5e7afe6..30a25b5 100644
--- a/expr.cc
+++ b/expr.cc
@@ -317,9 +317,9 @@
f->AddArg(v);
i += n;
if (i == s.size()) {
- ERROR("%s:%d: *** unterminated call to function '%s': "
- "missing '%c'.",
- LOCF(loc), f->name(), terms[0]);
+ ERROR_LOC(loc, "*** unterminated call to function '%s': "
+ "missing '%c'.",
+ f->name(), terms[0]);
}
nargs++;
if (s[i] == terms[0]) {
@@ -332,8 +332,8 @@
}
if (nargs <= f->min_arity()) {
- ERROR("%s:%d: *** insufficient number of arguments (%d) to function `%s'.",
- LOCF(loc), nargs - 1, f->name());
+ ERROR_LOC(loc, "*** insufficient number of arguments (%d) to function `%s'.",
+ nargs - 1, f->name());
}
*index_out = i;
@@ -365,8 +365,8 @@
if (g_flags.enable_kati_warnings) {
size_t found = sym.str().find_first_of(" ({");
if (found != string::npos) {
- KATI_WARN("%s:%d: *warning*: variable lookup with '%c': %.*s",
- loc, sym.str()[found], SPF(s));
+ KATI_WARN_LOC(loc, "*warning*: variable lookup with '%c': %.*s",
+ sym.str()[found], SPF(s));
}
}
Value* r = new SymRef(sym);
@@ -386,8 +386,8 @@
ParseFunc(loc, func, s, i+1, terms, index_out);
return func;
} else {
- KATI_WARN("%s:%d: *warning*: unknown make function '%.*s': %.*s",
- loc, SPF(lit->val()), SPF(s));
+ KATI_WARN_LOC(loc, "*warning*: unknown make function '%.*s': %.*s",
+ SPF(lit->val()), SPF(s));
}
}
@@ -428,12 +428,12 @@
// for detail.
size_t found = s.find(cp);
if (found != string::npos) {
- KATI_WARN("%s:%d: *warning*: unmatched parentheses: %.*s",
- loc, SPF(s));
+ KATI_WARN_LOC(loc, "*warning*: unmatched parentheses: %.*s",
+ SPF(s));
*index_out = s.size();
return new SymRef(Intern(s.substr(2, found-2)));
}
- ERROR("%s:%d: *** unterminated variable reference.", LOCF(loc));
+ ERROR_LOC(loc, "*** unterminated variable reference.");
}
}
diff --git a/fileutil_bench.cc b/fileutil_bench.cc
index 4b1f033..77a0d35 100644
--- a/fileutil_bench.cc
+++ b/fileutil_bench.cc
@@ -12,6 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+// +build ignore
+
#include "fileutil.h"
#include <benchmark/benchmark.h>
#include <cstdio>
diff --git a/find.cc b/find.cc
index 5d9cab6..c6a4155 100644
--- a/find.cc
+++ b/find.cc
@@ -150,7 +150,7 @@
virtual const DirentNode* FindDir(StringPiece) const {
return NULL;
}
- virtual bool RunFind(const FindCommand& fc, int d,
+ virtual bool RunFind(const FindCommand& fc, const Loc& loc, int d,
string* path,
unordered_map<const DirentNode*, string>* cur_read_dirs,
vector<string>& out) const = 0;
@@ -185,7 +185,7 @@
: DirentNode(name), type_(type) {
}
- virtual bool RunFind(const FindCommand& fc, int d,
+ virtual bool RunFind(const FindCommand& fc, const Loc&, int d,
string* path,
unordered_map<const DirentNode*, string>*,
vector<string>& out) const override {
@@ -255,15 +255,15 @@
return NULL;
}
- virtual bool RunFind(const FindCommand& fc, int d,
+ virtual bool RunFind(const FindCommand& fc, const Loc& loc, int d,
string* path,
unordered_map<const DirentNode*, string>* cur_read_dirs,
vector<string>& out) const override {
ScopedReadDirTracker srdt(this, *path, cur_read_dirs);
if (!srdt.ok()) {
- fprintf(stderr, "FindEmulator: find: File system loop detected; `%s' is "
- "part of the same file system loop as `%s'.\n",
- path->c_str(), srdt.conflicted().c_str());
+ WARN_LOC(loc, "FindEmulator: find: File system loop detected; `%s' "
+ "is part of the same file system loop as `%s'.",
+ path->c_str(), srdt.conflicted().c_str());
return true;
}
@@ -292,7 +292,7 @@
if ((*path)[path->size()-1] != '/')
*path += '/';
*path += c->base();
- if (!c->RunFind(fc, d + 1, path, cur_read_dirs, out))
+ if (!c->RunFind(fc, loc, d + 1, path, cur_read_dirs, out))
return false;
path->resize(orig_path_size);
}
@@ -320,7 +320,7 @@
if ((*path)[path->size()-1] != '/')
*path += '/';
*path += c->base();
- if (!c->RunFind(fc, d + 1, path, cur_read_dirs, out))
+ if (!c->RunFind(fc, loc, d + 1, path, cur_read_dirs, out))
return false;
path->resize(orig_path_size);
}
@@ -330,7 +330,7 @@
if ((*path)[path->size()-1] != '/')
*path += '/';
*path += c->base();
- if (!c->RunFind(fc, d + 1, path, cur_read_dirs, out))
+ if (!c->RunFind(fc, loc, d + 1, path, cur_read_dirs, out))
return false;
path->resize(orig_path_size);
}
@@ -360,7 +360,7 @@
return NULL;
}
- virtual bool RunFind(const FindCommand& fc, int d,
+ virtual bool RunFind(const FindCommand& fc, const Loc& loc, int d,
string* path,
unordered_map<const DirentNode*, string>* cur_read_dirs,
vector<string>& out) const override {
@@ -368,8 +368,8 @@
if (fc.follows_symlinks && errno_ != ENOENT) {
if (errno_) {
if (fc.type != FindCommandType::FINDLEAVES) {
- fprintf(stderr, "FindEmulator: find: `%s': %s\n",
- path->c_str(), strerror(errno_));
+ WARN_LOC(loc, "FindEmulator: find: `%s': %s",
+ path->c_str(), strerror(errno_));
}
return true;
}
@@ -379,7 +379,7 @@
return false;
}
- return to_->RunFind(fc, d, path, cur_read_dirs, out);
+ return to_->RunFind(fc, loc, d, path, cur_read_dirs, out);
}
PrintIfNecessary(fc, *path, type, d, out);
return true;
@@ -783,7 +783,7 @@
}
virtual bool HandleFind(const string& cmd UNUSED, const FindCommand& fc,
- string* out) override {
+ const Loc& loc, string* out) override {
if (!CanHandle(fc.chdir)) {
LOG("FindEmulator: Cannot handle chdir (%.*s): %s",
SPF(fc.chdir), cmd.c_str());
@@ -793,6 +793,9 @@
if (!is_initialized_) {
ScopedTimeReporter tr("init find emulator time");
root_.reset(ConstructDirectoryTree(""));
+ if (!root_) {
+ ERROR("FindEmulator: Cannot open root directory");
+ }
ResolveSymlinks();
LOG_STAT("%d find nodes", node_cnt_);
is_initialized_ = true;
@@ -823,9 +826,8 @@
if (should_fallback)
return false;
if (!fc.redirect_to_devnull) {
- fprintf(stderr,
- "FindEmulator: cd: %.*s: No such file or directory\n",
- SPF(fc.chdir));
+ WARN_LOC(loc, "FindEmulator: cd: %.*s: No such file or directory",
+ SPF(fc.chdir));
}
return true;
}
@@ -848,16 +850,15 @@
return false;
}
if (!fc.redirect_to_devnull) {
- fprintf(stderr,
- "FindEmulator: find: `%s': No such file or directory\n",
- ConcatDir(fc.chdir, finddir).c_str());
+ WARN_LOC(loc, "FindEmulator: find: `%s': No such file or directory",
+ ConcatDir(fc.chdir, finddir).c_str());
}
continue;
}
string path = finddir;
unordered_map<const DirentNode*, string> cur_read_dirs;
- if (!base->RunFind(fc, 0, &path, &cur_read_dirs, results)) {
+ if (!base->RunFind(fc, loc, 0, &path, &cur_read_dirs, results)) {
LOG("FindEmulator: RunFind failed: %s", cmd.c_str());
return false;
}
@@ -916,8 +917,14 @@
DirentNode* ConstructDirectoryTree(const string& path) {
DIR* dir = opendir(path.empty() ? "." : path.c_str());
- if (!dir)
- PERROR("opendir failed: %s", path.c_str());
+ if (!dir) {
+ if (errno == ENOENT) {
+ LOG("opendir failed: %s", path.c_str());
+ return NULL;
+ } else {
+ PERROR("opendir failed: %s", path.c_str());
+ }
+ }
DirentDirNode* n = new DirentDirNode(path);
@@ -942,6 +949,9 @@
}
if (d_type == DT_DIR) {
c = ConstructDirectoryTree(npath);
+ if (c == NULL) {
+ continue;
+ }
} else if (d_type == DT_LNK) {
auto s = new DirentSymlinkNode(npath);
symlinks_.push_back(make_pair(npath, s));
@@ -994,7 +1004,12 @@
if (type == DT_DIR) {
if (path.find('/') == string::npos) {
- s->set_to(ConstructDirectoryTree(path));
+ DirentNode* dir = ConstructDirectoryTree(path);
+ if (dir != NULL) {
+ s->set_to(dir);
+ } else {
+ s->set_errno(errno);
+ }
}
} else if (type != DT_LNK && type != DT_UNKNOWN) {
s->set_to(new DirentFileNode(path, type));
diff --git a/find.h b/find.h
index 1eee1e6..9af261a 100644
--- a/find.h
+++ b/find.h
@@ -20,6 +20,7 @@
#include <unordered_set>
#include <vector>
+#include "loc.h"
#include "string_piece.h"
using namespace std;
@@ -62,7 +63,7 @@
virtual ~FindEmulator() = default;
virtual bool HandleFind(const string& cmd, const FindCommand& fc,
- string* out) = 0;
+ const Loc& loc, string* out) = 0;
static FindEmulator* Get();
diff --git a/find_test.cc b/find_test.cc
index 1ba451a..ebdfa98 100644
--- a/find_test.cc
+++ b/find_test.cc
@@ -39,7 +39,7 @@
return 1;
}
string out;
- if (!FindEmulator::Get()->HandleFind(cmd, fc, &out)) {
+ if (!FindEmulator::Get()->HandleFind(cmd, fc, Loc(), &out)) {
fprintf(stderr, "Find emulator does not support this command\n");
return 1;
}
diff --git a/flags.cc b/flags.cc
index 3ad8e3c..5c14af7 100644
--- a/flags.cc
+++ b/flags.cc
@@ -97,6 +97,8 @@
detect_android_echo = true;
} else if (!strcmp(arg, "--detect_depfiles")) {
detect_depfiles = true;
+ } else if (!strcmp(arg, "--color_warnings")) {
+ color_warnings = true;
} else if (ParseCommandLineOptionWithArg(
"-j", argv, &i, &num_jobs_str)) {
num_jobs = strtol(num_jobs_str, NULL, 10);
diff --git a/flags.h b/flags.h
index d22d0cd..cd4090a 100644
--- a/flags.h
+++ b/flags.h
@@ -39,6 +39,7 @@
bool regen_debug;
bool regen_ignoring_kati_binary;
bool use_find_emulator;
+ bool color_warnings;
const char* goma_dir;
const char* ignore_dirty_pattern;
const char* no_ignore_dirty_pattern;
diff --git a/func.cc b/func.cc
index 716cb2b..7d50219 100644
--- a/func.cc
+++ b/func.cc
@@ -466,8 +466,8 @@
string* text = new string;
args[0]->Eval(ev, text);
if (ev->avoid_io()) {
- KATI_WARN("%s:%d: *warning*: $(eval) in a recipe is not recommended: %s",
- LOCF(ev->loc()), text->c_str());
+ KATI_WARN_LOC(ev->loc(), "*warning*: $(eval) in a recipe is not recommended: %s",
+ text->c_str());
}
vector<Stmt*> stmts;
Parse(*text, ev->loc(), &stmts);
@@ -494,7 +494,8 @@
}
static void ShellFuncImpl(const string& shell, const string& shellflag,
- const string& cmd, string* s, FindCommand** fc) {
+ const string& cmd, const Loc& loc, string* s,
+ FindCommand** fc) {
LOG("ShellFunc: %s", cmd.c_str());
#ifdef TEST_FIND_EMULATOR
@@ -505,11 +506,11 @@
*fc = new FindCommand();
if ((*fc)->Parse(cmd)) {
#ifdef TEST_FIND_EMULATOR
- if (FindEmulator::Get()->HandleFind(cmd, **fc, &out2)) {
+ if (FindEmulator::Get()->HandleFind(cmd, **fc, loc, &out2)) {
need_check = true;
}
#else
- if (FindEmulator::Get()->HandleFind(cmd, **fc, s)) {
+ if (FindEmulator::Get()->HandleFind(cmd, **fc, loc, s)) {
return;
}
#endif
@@ -555,9 +556,9 @@
string cmd = args[0]->Eval(ev);
if (ev->avoid_io() && !HasNoIoInShellScript(cmd)) {
if (ev->eval_depth() > 1) {
- ERROR("%s:%d: kati doesn't support passing results of $(shell) "
- "to other make constructs: %s",
- LOCF(ev->loc()), cmd.c_str());
+ ERROR_LOC(ev->loc(), "kati doesn't support passing results of $(shell) "
+ "to other make constructs: %s",
+ cmd.c_str());
}
StripShellComment(&cmd);
*s += "$(";
@@ -571,7 +572,7 @@
string out;
FindCommand* fc = NULL;
- ShellFuncImpl(shell, shellflag, cmd, &out, &fc);
+ ShellFuncImpl(shell, shellflag, cmd, ev->loc(), &out, &fc);
if (ShouldStoreCommandResult(cmd)) {
CommandResult* cr = new CommandResult();
cr->op = (fc == NULL) ? CommandOp::SHELL : CommandOp::FIND,
@@ -595,8 +596,8 @@
const StringPiece func_name = TrimSpace(func_name_buf);
Var* func = ev->LookupVar(Intern(func_name));
if (!func->IsDefined()) {
- KATI_WARN("%s:%d: *warning*: undefined user function: %s",
- ev->loc(), func_name.as_string().c_str());
+ KATI_WARN_LOC(ev->loc(), "*warning*: undefined user function: %s",
+ func_name.as_string().c_str());
}
vector<unique_ptr<SimpleVar>> av;
for (size_t i = 1; i < args.size(); i++) {
@@ -676,8 +677,7 @@
StringPrintf("echo -e \"%s:%d: %s\" 2>&1", LOCF(ev->loc()), EchoEscape(a).c_str()));
return;
}
- printf("%s:%d: %s\n", LOCF(ev->loc()), a.c_str());
- fflush(stdout);
+ WARN_LOC(ev->loc(), "%s", a.c_str());
}
void ErrorFunc(const vector<Value*>& args, Evaluator* ev, string*) {
diff --git a/log.cc b/log.cc
index fb9fcd4..b7141f6 100644
--- a/log.cc
+++ b/log.cc
@@ -16,5 +16,46 @@
#include "log.h"
+#include "flags.h"
+#include "strutil.h"
+
+#define BOLD "\033[1m"
+#define RESET "\033[0m"
+#define MAGENTA "\033[35m"
+#define RED "\033[31m"
+
+void ColorErrorLog(const char* file, int line, const char* msg) {
+ if (file == nullptr) {
+ ERROR("%s", msg);
+ return;
+ }
+
+ if (g_flags.color_warnings) {
+ StringPiece filtered = TrimPrefix(msg, "*** ");
+
+ ERROR(BOLD "%s:%d: " RED "error: " RESET BOLD "%s" RESET,
+ file, line, filtered.as_string().c_str());
+ } else {
+ ERROR("%s:%d: %s", file, line, msg);
+ }
+}
+
+void ColorWarnLog(const char* file, int line, const char* msg) {
+ if (file == nullptr) {
+ fprintf(stderr, "%s\n", msg);
+ return;
+ }
+
+ if (g_flags.color_warnings) {
+ StringPiece filtered = TrimPrefix(msg, "*warning*: ");
+ filtered = TrimPrefix(filtered, "warning: ");
+
+ fprintf(stderr, BOLD "%s:%d: " MAGENTA "warning: " RESET BOLD "%s" RESET "\n",
+ file, line, filtered.as_string().c_str());
+ } else {
+ fprintf(stderr, "%s:%d: %s\n", file, line, msg);
+ }
+}
+
bool g_log_no_exit;
string* g_last_error;
diff --git a/log.h b/log.h
index 11cf0e5..58c733a 100644
--- a/log.h
+++ b/log.h
@@ -21,6 +21,7 @@
#include <string.h>
#include "flags.h"
+#include "log.h"
#include "stringprintf.h"
using namespace std;
@@ -73,4 +74,22 @@
#define CHECK(c) if (!(c)) ERROR("%s:%d: %s", __FILE__, __LINE__, #c)
+// Set of logging functions that will automatically colorize lines that have
+// location information when --color_warnings is set.
+void ColorWarnLog(const char* file, int line, const char *msg);
+void ColorErrorLog(const char* file, int line, const char *msg);
+
+#define WARN_LOC(loc, ...) do { \
+ ColorWarnLog(LOCF(loc), StringPrintf(__VA_ARGS__).c_str()); \
+ } while (0)
+
+#define KATI_WARN_LOC(loc, ...) do { \
+ if (g_flags.enable_kati_warnings) \
+ ColorWarnLog(LOCF(loc), StringPrintf(__VA_ARGS__).c_str()); \
+ } while(0)
+
+#define ERROR_LOC(loc, ...) do { \
+ ColorErrorLog(LOCF(loc), StringPrintf(__VA_ARGS__).c_str()); \
+ } while (0)
+
#endif // LOG_H_
diff --git a/main.cc b/main.cc
index 5afe2b1..a4df3c0 100644
--- a/main.cc
+++ b/main.cc
@@ -173,8 +173,8 @@
}
for (ParseErrorStmt* err : GetParseErrors()) {
- WARN("%s:%d: warning for parse error in an unevaluated line: %s",
- LOCF(err->loc()), err->msg.c_str());
+ WARN_LOC(err->loc(), "warning for parse error in an unevaluated line: %s",
+ err->msg.c_str());
}
vector<DepNode*> nodes;
diff --git a/ninja.cc b/ninja.cc
index 579cea3..fca3ace 100644
--- a/ninja.cc
+++ b/ninja.cc
@@ -561,8 +561,13 @@
}
}
*o << "\n";
- if (use_local_pool)
+ if (node->ninja_pool_var) {
+ string pool;
+ node->ninja_pool_var->Eval(ev_, &pool);
+ *o << " pool = " << pool << "\n";
+ } else if (use_local_pool) {
*o << " pool = local_pool\n";
+ }
if (node->is_default_target) {
unique_lock<mutex> lock(mu_);
default_target_ = node;
diff --git a/parser.cc b/parser.cc
index 61d1ac5..3822dd8 100644
--- a/parser.cc
+++ b/parser.cc
@@ -92,10 +92,10 @@
}
if (!if_stack_.empty())
- ERROR("%s:%d: *** missing `endif'.", loc_.filename, loc_.lineno + 1);
+ ERROR_LOC(Loc(loc_.filename, loc_.lineno + 1), "*** missing `endif'.");
if (!define_name_.empty())
- ERROR("%s:%d: *** missing `endef', unterminated `define'.",
- loc_.filename, define_start_line_);
+ ERROR_LOC(Loc(loc_.filename, define_start_line_),
+ "*** missing `endef', unterminated `define'.");
}
static void Init() {
@@ -304,7 +304,7 @@
StringPiece rest = TrimRightSpace(RemoveComment(TrimLeftSpace(
line.substr(sizeof("endef")))));
if (!rest.empty()) {
- WARN("%s:%d: extraneous text after `endef' directive", LOCF(loc_));
+ WARN_LOC(loc_, "extraneous text after `endef' directive");
}
AssignStmt* stmt = new AssignStmt();
@@ -374,7 +374,7 @@
}
}
if (!s.empty()) {
- WARN("%s:%d: extraneous text after `ifeq' directive", LOCF(loc_));
+ WARN_LOC(loc_, "extraneous text after `ifeq' directive");
return true;
}
return true;
@@ -411,7 +411,7 @@
num_if_nest_ = st->num_nest + 1;
if (!HandleDirective(next_if, else_if_directives_)) {
- WARN("%s:%d: extraneous text after `else' directive", LOCF(loc_));
+ WARN_LOC(loc_, "extraneous text after `else' directive");
}
num_if_nest_ = 0;
}
diff --git a/pathutil.go b/pathutil.go
index 0d3aa05..ad11c22 100644
--- a/pathutil.go
+++ b/pathutil.go
@@ -191,7 +191,7 @@
return invalidFileid, nil
}
if stat, ok := fi.Sys().(*syscall.Stat_t); ok {
- id = fileid{dev: stat.Dev, ino: stat.Ino}
+ id = fileid{dev: uint64(stat.Dev), ino: stat.Ino}
}
names, _ := d.Readdirnames(-1)
// need sort?
@@ -209,7 +209,7 @@
mode := lmode
var id fileid
if stat, ok := fi.Sys().(*syscall.Stat_t); ok {
- id = fileid{dev: stat.Dev, ino: stat.Ino}
+ id = fileid{dev: uint64(stat.Dev), ino: stat.Ino}
}
if lmode&os.ModeSymlink == os.ModeSymlink {
fi, err = os.Stat(path)
@@ -218,7 +218,7 @@
} else {
mode = fi.Mode()
if stat, ok := fi.Sys().(*syscall.Stat_t); ok {
- id = fileid{dev: stat.Dev, ino: stat.Ino}
+ id = fileid{dev: uint64(stat.Dev), ino: stat.Ino}
}
}
}
diff --git a/regen.cc b/regen.cc
index 137d205..5b42d8f 100644
--- a/regen.cc
+++ b/regen.cc
@@ -12,6 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+// +build ignore
+
#include "regen.h"
#include <sys/stat.h>
diff --git a/rule.cc b/rule.cc
index 68ec7f5..717d0f0 100644
--- a/rule.cc
+++ b/rule.cc
@@ -54,11 +54,11 @@
}
void ParseRule(Loc& loc, StringPiece line, char term,
- function<string()> after_term_fn,
+ const function<string()> &after_term_fn,
Rule** out_rule, RuleVarAssignment* rule_var) {
size_t index = line.find(':');
if (index == string::npos) {
- ERROR("%s:%d: *** missing separator.", LOCF(loc));
+ ERROR_LOC(loc, "*** missing separator.");
}
StringPiece first = line.substr(0, index);
@@ -71,8 +71,7 @@
!outputs.empty() && IsPatternRule(outputs[0].str()));
for (size_t i = 1; i < outputs.size(); i++) {
if (IsPatternRule(outputs[i].str()) != is_first_pattern) {
- ERROR("%s:%d: *** mixed implicit and normal rules: deprecated syntax",
- LOCF(loc));
+ ERROR_LOC(loc, "*** mixed implicit and normal rules: deprecated syntax");
}
}
@@ -94,8 +93,8 @@
// target specific variable).
// See https://github.com/google/kati/issues/83
if (term_index == 0) {
- KATI_WARN("%s:%d: defining a target which starts with `=', "
- "which is not probably what you meant", LOCF(loc));
+ KATI_WARN_LOC(loc, "defining a target which starts with `=', "
+ "which is not probably what you meant");
buf = line.as_string();
if (term)
buf += term;
@@ -136,8 +135,7 @@
}
if (is_first_pattern) {
- ERROR("%s:%d: *** mixed implicit and normal rules: deprecated syntax",
- LOCF(loc));
+ ERROR_LOC(loc, "*** mixed implicit and normal rules: deprecated syntax");
}
StringPiece second = rest.substr(0, index);
@@ -147,8 +145,8 @@
tok = TrimLeadingCurdir(tok);
for (Symbol output : rule->outputs) {
if (!Pattern(tok).Match(output.str())) {
- WARN("%s:%d: target `%s' doesn't match the target pattern",
- LOCF(loc), output.c_str());
+ WARN_LOC(loc, "target `%s' doesn't match the target pattern",
+ output.c_str());
}
}
@@ -156,13 +154,13 @@
}
if (rule->output_patterns.empty()) {
- ERROR("%s:%d: *** missing target pattern.", LOCF(loc));
+ ERROR_LOC(loc, "*** missing target pattern.");
}
if (rule->output_patterns.size() > 1) {
- ERROR("%s:%d: *** multiple target patterns.", LOCF(loc));
+ ERROR_LOC(loc, "*** multiple target patterns.");
}
if (!IsPatternRule(rule->output_patterns[0].str())) {
- ERROR("%s:%d: *** target pattern contains no '%%'.", LOCF(loc));
+ ERROR_LOC(loc, "*** target pattern contains no '%%'.");
}
ParseInputs(rule, third);
}
diff --git a/rule.h b/rule.h
index 4d72bb7..48394bb 100644
--- a/rule.h
+++ b/rule.h
@@ -49,7 +49,7 @@
private:
void Error(const string& msg) {
- ERROR("%s:%d: %s", loc.filename, loc.lineno, msg.c_str());
+ ERROR_LOC(loc, "%s", msg.c_str());
}
};
@@ -65,7 +65,7 @@
// |term| is '='), |after_term_fn| will be called to obtain the right
// hand side.
void ParseRule(Loc& loc, StringPiece line, char term,
- function<string()> after_term_fn,
+ const function<string()> &after_term_fn,
Rule** rule, RuleVarAssignment* rule_var);
#endif // RULE_H_
diff --git a/runtest.rb b/runtest.rb
index fc594d5..190c11f 100755
--- a/runtest.rb
+++ b/runtest.rb
@@ -170,7 +170,7 @@
output.gsub!(/\/bin\/sh: ([^:]*): command not found/,
"\\1: Command not found")
output.gsub!(/.*: warning for parse error in an unevaluated line: .*\n/, '')
- output.gsub!(/^FindEmulator: /, '')
+ output.gsub!(/^([^ ]+: )?FindEmulator: /, '')
output.gsub!(/^\/bin\/sh: line 0: /, '')
output.gsub!(/ (\.\/+)+kati\.\S+/, '') # kati log files in find_command.mk
output.gsub!(/ (\.\/+)+test\S+.json/, '') # json files in find_command.mk
diff --git a/strutil.cc b/strutil.cc
index 1b99dff..632d151 100644
--- a/strutil.cc
+++ b/strutil.cc
@@ -174,6 +174,13 @@
return true;
}
+StringPiece TrimPrefix(StringPiece str, StringPiece prefix) {
+ ssize_t size_diff = str.size() - prefix.size();
+ if (size_diff < 0 || str.substr(0, prefix.size()) != prefix)
+ return str;
+ return str.substr(prefix.size());
+}
+
StringPiece TrimSuffix(StringPiece str, StringPiece suffix) {
ssize_t size_diff = str.size() - suffix.size();
if (size_diff < 0 || str.substr(size_diff) != suffix)
@@ -500,7 +507,7 @@
return r;
}
-string EchoEscape(const string str) {
+string EchoEscape(const string &str) {
const char *in = str.c_str();
string buf;
for (; *in; in++) {
diff --git a/strutil.h b/strutil.h
index 12e46a5..ff3d6a1 100644
--- a/strutil.h
+++ b/strutil.h
@@ -89,6 +89,8 @@
bool HasWord(StringPiece str, StringPiece w);
+StringPiece TrimPrefix(StringPiece str, StringPiece suffix);
+
StringPiece TrimSuffix(StringPiece str, StringPiece suffix);
class Pattern {
@@ -140,7 +142,7 @@
string ConcatDir(StringPiece b, StringPiece n);
-string EchoEscape(const string str);
+string EchoEscape(const string &str);
void EscapeShell(string* s);
diff --git a/strutil_bench.cc b/strutil_bench.cc
index c52e43c..d3b2e6c 100644
--- a/strutil_bench.cc
+++ b/strutil_bench.cc
@@ -12,6 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+// +build ignore
+
#include <string>
#include <vector>
diff --git a/strutil_test.cc b/strutil_test.cc
index 7a5a47d..a26cf4d 100644
--- a/strutil_test.cc
+++ b/strutil_test.cc
@@ -56,6 +56,20 @@
assert(!HasSuffix("bar", "bbar"));
}
+void TestTrimPrefix() {
+ ASSERT_EQ(TrimPrefix("foo", "foo"), "");
+ ASSERT_EQ(TrimPrefix("foo", "fo"), "o");
+ ASSERT_EQ(TrimPrefix("foo", ""), "foo");
+ ASSERT_EQ(TrimPrefix("foo", "fooo"), "foo");
+}
+
+void TestTrimSuffix() {
+ ASSERT_EQ(TrimSuffix("bar", "bar"), "");
+ ASSERT_EQ(TrimSuffix("bar", "ar"), "b");
+ ASSERT_EQ(TrimSuffix("bar", ""), "bar");
+ ASSERT_EQ(TrimSuffix("bar", "bbar"), "bar");
+}
+
string SubstPattern(StringPiece str, StringPiece pat, StringPiece subst) {
string r;
Pattern(pat).AppendSubst(str, subst, &r);
@@ -190,6 +204,8 @@
TestWordScanner();
TestHasPrefix();
TestHasSuffix();
+ TestTrimPrefix();
+ TestTrimSuffix();
TestSubstPattern();
TestNoLineBreak();
TestHasWord();
diff --git a/testcase/ninja_pool.sh b/testcase/ninja_pool.sh
new file mode 100644
index 0000000..5fed8e4
--- /dev/null
+++ b/testcase/ninja_pool.sh
@@ -0,0 +1,43 @@
+#!/bin/sh
+#
+# Copyright 2016 Google Inc. All rights reserved
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http:#www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -e
+
+log=/tmp/log
+mk="$@"
+
+cat <<EOF > Makefile
+
+test: .KATI_NINJA_POOL := test_pool
+test:
+ echo "PASS"
+EOF
+
+${mk} 2>${log}
+if [ -e ninja.sh ]; then
+ mv build.ninja kati.ninja
+ cat <<EOF > build.ninja
+pool test_pool
+ depth = 1
+include kati.ninja
+EOF
+ ./ninja.sh
+fi
+if [ -e ninja.sh ]; then
+ if ! grep -q "pool = test_pool" kati.ninja; then
+ echo "Pool not present in build.ninja"
+ fi
+fi
diff --git a/thread_pool.cc b/thread_pool.cc
index 0a12bfa..b2429cb 100644
--- a/thread_pool.cc
+++ b/thread_pool.cc
@@ -12,6 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+// +build ignore
+
#include "thread_pool.h"
#include <condition_variable>
