update_engine: Sort full operations by destination.
The inplace generator moves all the full operations to the end of the
list. This patch sorts those operations by the destination.
This patch also cleans up the Vertex class by using the new
AnnotatedOperation class instead of the operation and file_name
separated.
BUG=None
TEST=Unittest still pass. minor_version=1 full operations appear in
order according to "cros payload".
Change-Id: Ia0c15939086cec52dc855cbc3afa913f8cbebf6b
Reviewed-on: https://chromium-review.googlesource.com/286213
Tested-by: Alex Deymo <deymo@chromium.org>
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Commit-Queue: Alex Deymo <deymo@chromium.org>
diff --git a/payload_generator/graph_utils.cc b/payload_generator/graph_utils.cc
index 9166560..265177f 100644
--- a/payload_generator/graph_utils.cc
+++ b/payload_generator/graph_utils.cc
@@ -114,12 +114,12 @@
for (Graph::size_type i = 0, e = graph.size(); i != e; ++i) {
LOG(INFO) << i
<< (graph[i].valid ? "" : "-INV")
- << ": " << graph[i].file_name
- << ": " << InstallOperationTypeName(graph[i].op.type());
+ << ": " << graph[i].aop.name
+ << ": " << InstallOperationTypeName(graph[i].aop.op.type());
LOG(INFO) << " src_extents:";
- DumpExtents(graph[i].op.src_extents(), 4);
+ DumpExtents(graph[i].aop.op.src_extents(), 4);
LOG(INFO) << " dst_extents:";
- DumpExtents(graph[i].op.dst_extents(), 4);
+ DumpExtents(graph[i].aop.op.dst_extents(), 4);
LOG(INFO) << " out edges:";
DumpOutEdges(graph[i].out_edges);
}