diff options
author | Evan Martin <martine@danga.com> | 2012-10-17 05:28:06 (GMT) |
---|---|---|
committer | Evan Martin <martine@danga.com> | 2012-10-17 05:28:06 (GMT) |
commit | fbe98f95a2ba75b2c849613e5868da3b37dccf56 (patch) | |
tree | 1a31fa83e9b7f043a291cbfc7e1268943e2f6515 | |
parent | 2577a9202860f2b0f7c0910f909200152b1ebd75 (diff) | |
parent | 62b136315c6635a64f314dde78dbd8f1235eb306 (diff) | |
download | Ninja-fbe98f95a2ba75b2c849613e5868da3b37dccf56.zip Ninja-fbe98f95a2ba75b2c849613e5868da3b37dccf56.tar.gz Ninja-fbe98f95a2ba75b2c849613e5868da3b37dccf56.tar.bz2 |
Merge pull request #448 from maximuska/proposed/buildlog-mini-refactor2
Proposed/buildlog mini refactor2
-rw-r--r-- | src/build_log.cc | 18 | ||||
-rw-r--r-- | src/build_log.h | 3 | ||||
-rw-r--r-- | src/build_log_test.cc | 20 |
3 files changed, 36 insertions, 5 deletions
diff --git a/src/build_log.cc b/src/build_log.cc index 33cbfc4..235951f 100644 --- a/src/build_log.cc +++ b/src/build_log.cc @@ -91,6 +91,15 @@ uint64_t BuildLog::LogEntry::HashCommand(StringPiece command) { return MurmurHash64A(command.str_, command.len_); } +BuildLog::LogEntry::LogEntry(const string& output) + : output(output) {} + +BuildLog::LogEntry::LogEntry(const string& output, uint64_t command_hash, + int start_time, int end_time, TimeStamp restat_mtime) + : output(output), command_hash(command_hash), + start_time(start_time), end_time(end_time), restat_mtime(restat_mtime) +{} + BuildLog::BuildLog() : log_file_(NULL), needs_recompaction_(false) {} @@ -130,6 +139,7 @@ bool BuildLog::OpenForWrite(const string& path, string* err) { void BuildLog::RecordCommand(Edge* edge, int start_time, int end_time, TimeStamp restat_mtime) { string command = edge->EvaluateCommand(true); + uint64_t command_hash = LogEntry::HashCommand(command); for (vector<Node*>::iterator out = edge->outputs_.begin(); out != edge->outputs_.end(); ++out) { const string& path = (*out)->path(); @@ -138,11 +148,10 @@ void BuildLog::RecordCommand(Edge* edge, int start_time, int end_time, if (i != entries_.end()) { log_entry = i->second; } else { - log_entry = new LogEntry; - log_entry->output = path; + log_entry = new LogEntry(path); entries_.insert(Entries::value_type(log_entry->output, log_entry)); } - log_entry->command_hash = LogEntry::HashCommand(command); + log_entry->command_hash = command_hash; log_entry->start_time = start_time; log_entry->end_time = end_time; log_entry->restat_mtime = restat_mtime; @@ -287,8 +296,7 @@ bool BuildLog::Load(const string& path, string* err) { if (i != entries_.end()) { entry = i->second; } else { - entry = new LogEntry; - entry->output = output; + entry = new LogEntry(output); entries_.insert(Entries::value_type(entry->output, entry)); ++unique_entry_count; } diff --git a/src/build_log.h b/src/build_log.h index 4141ff3..5a3b516 100644 --- a/src/build_log.h +++ b/src/build_log.h @@ -60,6 +60,9 @@ struct BuildLog { start_time == o.start_time && end_time == o.end_time && restat_mtime == o.restat_mtime; } + + explicit LogEntry(const string& output); + LogEntry(const string& output, uint64_t command_hash, int start_time, int end_time, TimeStamp restat_mtime); }; /// Lookup a previously-run command by its output path. diff --git a/src/build_log_test.cc b/src/build_log_test.cc index a6c2a86..5275f25 100644 --- a/src/build_log_test.cc +++ b/src/build_log_test.cc @@ -245,3 +245,23 @@ TEST_F(BuildLogTest, VeryLongInputLine) { ASSERT_EQ(789, e->restat_mtime); ASSERT_NO_FATAL_FAILURE(AssertHash("command2", e->command_hash)); } + +TEST_F(BuildLogTest, MultiTargetEdge) { + AssertParse(&state_, +"build out out.d: cat\n"); + + BuildLog log; + log.RecordCommand(state_.edges_[0], 21, 22); + + ASSERT_EQ(2u, log.entries().size()); + BuildLog::LogEntry* e1 = log.LookupByOutput("out"); + ASSERT_TRUE(e1); + BuildLog::LogEntry* e2 = log.LookupByOutput("out.d"); + ASSERT_TRUE(e2); + ASSERT_EQ("out", e1->output); + ASSERT_EQ("out.d", e2->output); + ASSERT_EQ(21, e1->start_time); + ASSERT_EQ(21, e2->start_time); + ASSERT_EQ(22, e2->end_time); + ASSERT_EQ(22, e2->end_time); +} |