diff options
author | Evan Martin <martine@danga.com> | 2013-01-08 16:43:39 (GMT) |
---|---|---|
committer | Evan Martin <martine@danga.com> | 2013-04-08 22:01:47 (GMT) |
commit | ec92fe3da6e792f9e14a490675aebc132ec37ef6 (patch) | |
tree | 86f2f7f9a259aa803bae6b56b172ab41722e2ca7 /src/deps_log.cc | |
parent | e280115c03a296078b26da4b10a643cb1a6bda8a (diff) | |
download | Ninja-ec92fe3da6e792f9e14a490675aebc132ec37ef6.zip Ninja-ec92fe3da6e792f9e14a490675aebc132ec37ef6.tar.gz Ninja-ec92fe3da6e792f9e14a490675aebc132ec37ef6.tar.bz2 |
add recompaction to depslog
Not done automatically yet, just an implementation and a test.
Diffstat (limited to 'src/deps_log.cc')
-rw-r--r-- | src/deps_log.cc | 63 |
1 files changed, 53 insertions, 10 deletions
diff --git a/src/deps_log.cc b/src/deps_log.cc index 081fcf0..5031515 100644 --- a/src/deps_log.cc +++ b/src/deps_log.cc @@ -54,6 +54,11 @@ bool DepsLog::OpenForWrite(const string& path, string* err) { bool DepsLog::RecordDeps(Node* node, TimeStamp mtime, const vector<Node*>& nodes) { + return RecordDeps(node, mtime, nodes.size(), (Node**)&nodes.front()); +} + +bool DepsLog::RecordDeps(Node* node, TimeStamp mtime, + int node_count, Node** nodes) { // Track whether there's any new data to be recorded. bool made_change = false; @@ -62,10 +67,9 @@ bool DepsLog::RecordDeps(Node* node, TimeStamp mtime, RecordId(node); made_change = true; } - for (vector<Node*>::const_iterator i = nodes.begin(); - i != nodes.end(); ++i) { - if ((*i)->id() < 0) { - RecordId(*i); + for (int i = 0; i < node_count; ++i) { + if (nodes[i]->id() < 0) { + RecordId(nodes[i]); made_change = true; } } @@ -75,10 +79,10 @@ bool DepsLog::RecordDeps(Node* node, TimeStamp mtime, Deps* deps = GetDeps(node); if (!deps || deps->mtime != mtime || - deps->node_count != (int)nodes.size()) { + deps->node_count != node_count) { made_change = true; } else { - for (int i = 0; i < (int)nodes.size(); ++i) { + for (int i = 0; i < node_count; ++i) { if (deps->nodes[i] != nodes[i]) { made_change = true; break; @@ -91,16 +95,15 @@ bool DepsLog::RecordDeps(Node* node, TimeStamp mtime, if (!made_change) return true; - uint16_t size = 4 * (1 + 1 + (uint16_t)nodes.size()); + uint16_t size = 4 * (1 + 1 + (uint16_t)node_count); size |= 0x8000; // Deps record: set high bit. fwrite(&size, 2, 1, file_); int id = node->id(); fwrite(&id, 4, 1, file_); int timestamp = mtime; fwrite(×tamp, 4, 1, file_); - for (vector<Node*>::const_iterator i = nodes.begin(); - i != nodes.end(); ++i) { - id = (*i)->id(); + for (int i = 0; i < node_count; ++i) { + id = nodes[i]->id(); fwrite(&id, 4, 1, file_); } @@ -193,6 +196,46 @@ DepsLog::Deps* DepsLog::GetDeps(Node* node) { return deps_[node->id()]; } +bool DepsLog::Recompact(const string& path, string* err) { + METRIC_RECORD(".ninja_deps recompact"); + printf("Recompacting deps...\n"); + + string temp_path = path + ".recompact"; + DepsLog new_log; + if (!new_log.OpenForWrite(temp_path, err)) + return false; + + // Clear all known ids so that new ones can be reassigned. + for (vector<Node*>::iterator i = nodes_.begin(); + i != nodes_.end(); ++i) { + (*i)->set_id(-1); + } + + // Write out all deps again. + for (int old_id = 0; old_id < (int)deps_.size(); ++old_id) { + Deps* deps = deps_[old_id]; + if (!new_log.RecordDeps(nodes_[old_id], deps->mtime, + deps->node_count, deps->nodes)) { + new_log.Close(); + return false; + } + } + + new_log.Close(); + + if (unlink(path.c_str()) < 0) { + *err = strerror(errno); + return false; + } + + if (rename(temp_path.c_str(), path.c_str()) < 0) { + *err = strerror(errno); + return false; + } + + return true; +} + bool DepsLog::RecordId(Node* node) { uint16_t size = (uint16_t)node->path().size(); fwrite(&size, 2, 1, file_); |