summaryrefslogtreecommitdiffstats
path: root/src/graph.h
diff options
context:
space:
mode:
authorJohn Drouhard <john@jmdtech.org>2021-03-23 20:10:43 (GMT)
committerJohn Drouhard <john@jmdtech.org>2021-03-24 13:49:58 (GMT)
commitb51a3e83ff25ca95464b179344cfe4a98e242a21 (patch)
tree4115d9d0fbdfcdfb2c0c6ec233b0b919362da876 /src/graph.h
parentdb6c4ac47601c88984822e1e7b5f4b9044dd6d81 (diff)
downloadNinja-b51a3e83ff25ca95464b179344cfe4a98e242a21.zip
Ninja-b51a3e83ff25ca95464b179344cfe4a98e242a21.tar.gz
Ninja-b51a3e83ff25ca95464b179344cfe4a98e242a21.tar.bz2
Revert "Change build log to always log the most recent input mtime"
This reverts commit 67fbbeeec91ec171da7d4e297b8f9b319f3424c8. There were a few missing test cases exposed by CMake's test suite that need slight adjustments. Better to revert the original attempt, add the test cases, and then re-land the change with the fixes. Fixes #1932
Diffstat (limited to 'src/graph.h')
-rw-r--r--src/graph.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/graph.h b/src/graph.h
index b7187ad..6756378 100644
--- a/src/graph.h
+++ b/src/graph.h
@@ -146,7 +146,6 @@ struct Edge {
Edge()
: rule_(NULL), pool_(NULL), dyndep_(NULL), env_(NULL), mark_(VisitNone),
- most_recent_input_(NULL), most_recent_input_mtime_(0),
id_(0), outputs_ready_(false), deps_loaded_(false),
deps_missing_(false), implicit_deps_(0), order_only_deps_(0),
implicit_outs_(0) {}
@@ -179,8 +178,6 @@ struct Edge {
Node* dyndep_;
BindingEnv* env_;
VisitMark mark_;
- Node* most_recent_input_;
- TimeStamp most_recent_input_mtime_;
size_t id_;
bool outputs_ready_;
bool deps_loaded_;
@@ -301,7 +298,8 @@ struct DependencyScan {
/// Recompute whether any output of the edge is dirty, if so sets |*dirty|.
/// Returns false on failure.
- bool RecomputeOutputsDirty(Edge* edge, bool* dirty, std::string* err);
+ bool RecomputeOutputsDirty(Edge* edge, Node* most_recent_input,
+ bool* dirty, std::string* err);
BuildLog* build_log() const {
return build_log_;
@@ -327,8 +325,8 @@ struct DependencyScan {
/// Recompute whether a given single output should be marked dirty.
/// Returns true if so.
- bool RecomputeOutputDirty(const Edge* edge, const std::string& command,
- Node* output);
+ bool RecomputeOutputDirty(const Edge* edge, const Node* most_recent_input,
+ const std::string& command, Node* output);
BuildLog* build_log_;
DiskInterface* disk_interface_;