summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgkistanova <gkistanova@gmail.com>2016-07-14 17:55:54 (GMT)
committergkistanova <gkistanova@gmail.com>2016-07-14 17:55:54 (GMT)
commit3473e08fae5ee76c86db0de079255f00251c1e2c (patch)
treec565375565edadc2064d05db6acfefff38c95886
parente074e59a3b1347ff54d1e4f5abb7808431d9b1a6 (diff)
downloadNinja-3473e08fae5ee76c86db0de079255f00251c1e2c.zip
Ninja-3473e08fae5ee76c86db0de079255f00251c1e2c.tar.gz
Ninja-3473e08fae5ee76c86db0de079255f00251c1e2c.tar.bz2
Fixed not initialized elapsed time.
-rw-r--r--src/build.cc13
-rw-r--r--src/build.h1
2 files changed, 9 insertions, 5 deletions
diff --git a/src/build.cc b/src/build.cc
index 7792016..b806fb5 100644
--- a/src/build.cc
+++ b/src/build.cc
@@ -110,11 +110,6 @@ void BuildStatus::BuildEdgeFinished(Edge* edge,
int* end_time) {
int64_t now = GetTimeMillis();
- if (finished_edges_ == 0) {
- overall_rate_.Restart();
- current_rate_.Restart();
- }
-
++finished_edges_;
RunningEdgeMap::iterator i = running_edges_.find(edge);
@@ -164,6 +159,11 @@ void BuildStatus::BuildEdgeFinished(Edge* edge,
}
}
+void BuildStatus::BuildStarted() {
+ overall_rate_.Restart();
+ current_rate_.Restart();
+}
+
void BuildStatus::BuildFinished() {
printer_.SetConsoleLocked(false);
printer_.PrintOnNewLine("");
@@ -650,6 +650,9 @@ bool Builder::Build(string* err) {
command_runner_.reset(new RealCommandRunner(config_));
}
+ // We are about to start the build process.
+ status_->BuildStarted();
+
// This main loop runs the entire build process.
// It is structured like this:
// First, we attempt to start as many commands as allowed by the
diff --git a/src/build.h b/src/build.h
index 819d832..e633c95 100644
--- a/src/build.h
+++ b/src/build.h
@@ -200,6 +200,7 @@ struct BuildStatus {
void BuildEdgeStarted(Edge* edge);
void BuildEdgeFinished(Edge* edge, bool success, const string& output,
int* start_time, int* end_time);
+ void BuildStarted();
void BuildFinished();
enum EdgeStatus {