summaryrefslogtreecommitdiffstats
path: root/src/graph.h
diff options
context:
space:
mode:
authorMaxim Kalaev <maximus.ka@gmail.com>2013-09-02 22:24:26 (GMT)
committerNico Weber <nicolasweber@gmx.de>2013-09-02 22:24:26 (GMT)
commitd7a46654a7be1a46a777a8d8a51f065ac98ce05d (patch)
treedddae66dc8b0a8358808493d4286b97e3f488a0d /src/graph.h
parentddbf9a42b8a7a2d47e25f4af18f726d49f6f8a91 (diff)
downloadNinja-d7a46654a7be1a46a777a8d8a51f065ac98ce05d.zip
Ninja-d7a46654a7be1a46a777a8d8a51f065ac98ce05d.tar.gz
Ninja-d7a46654a7be1a46a777a8d8a51f065ac98ce05d.tar.bz2
Check depslog timestamp in LoadDepsFromLog(), not in RecomputeOutputDirty().
RecomputeOutputDirty() is called from two places: 1. RecomputeDirty(), which calls LoadDeps(). 2. CleanNode(), which always passes 0 for the deps mtime. So this is no behavior change in either case. deps_mtime was nonzero only in deps mode, and it got passed all over the place. This makes things simpler.
Diffstat (limited to 'src/graph.h')
-rw-r--r--src/graph.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/graph.h b/src/graph.h
index 428ba01..bd0cb34 100644
--- a/src/graph.h
+++ b/src/graph.h
@@ -192,10 +192,10 @@ struct ImplicitDepLoader {
DiskInterface* disk_interface)
: state_(state), disk_interface_(disk_interface), deps_log_(deps_log) {}
- /// Load implicit dependencies for \a edge. May fill in \a mtime with
- /// the timestamp of the loaded information.
- /// @return false on error (without filling \a err if info is just missing).
- bool LoadDeps(Edge* edge, TimeStamp* mtime, string* err);
+ /// Load implicit dependencies for \a edge.
+ /// @return false on error (without filling \a err if info is just missing
+ // or out of date).
+ bool LoadDeps(Edge* edge, string* err);
DepsLog* deps_log() const {
return deps_log_;
@@ -208,7 +208,7 @@ struct ImplicitDepLoader {
/// Load implicit dependencies for \a edge from the DepsLog.
/// @return false on error (without filling \a err if info is just missing).
- bool LoadDepsFromLog(Edge* edge, TimeStamp* mtime, string* err);
+ bool LoadDepsFromLog(Edge* edge, string* err);
/// Preallocate \a count spaces in the input array on \a edge, returning
/// an iterator pointing at the first new space.
@@ -243,7 +243,6 @@ struct DependencyScan {
/// Recompute whether a given single output should be marked dirty.
/// Returns true if so.
bool RecomputeOutputDirty(Edge* edge, Node* most_recent_input,
- TimeStamp deps_mtime,
const string& command, Node* output);
BuildLog* build_log() const {