commit d41606fb3c25f6cb8191e154c87391ab285a8a2f
author Alex Deymo <deymo@google.com> Wed Mar 23 00:40:44 2016 -0700
committer Alex Deymo <deymo@google.com> Fri Mar 25 18:58:45 2016 -0700
tree 00474dfb3d6efe89231012c506b0ca4b9432ca40
parent a4073ef63482fd08c3678982f7d153360b088094

Enable REPLACE_XZ operations in full payloads.

This patch enables REPLACE_XZ operations in full payloads when the
operation is allowed.

Bug: 24578399
TEST=Deployed a payload to an edison-eng using XZ operations.

Change-Id: I3ac92df8e90d825da67d495266a5bb4d940ad93e

payload_generator/full_update_generator.cc

diff --git a/payload_generator/full_update_generator.cc b/payload_generator/full_update_generator.cc
index 56a3ca8..af01e63 100644
--- a/payload_generator/full_update_generator.cc
+++ b/payload_generator/full_update_generator.cc
@@ -32,6 +32,7 @@
 
 #include "update_engine/common/utils.h"
 #include "update_engine/payload_generator/bzip.h"
+#include "update_engine/payload_generator/xz.h"
 
 using std::vector;
 
@@ -47,13 +48,18 @@
 class ChunkProcessor : public base::DelegateSimpleThread::Delegate {
  public:
   // Read a chunk of |size| bytes from |fd| starting at offset |offset|.
-  ChunkProcessor(int fd, off_t offset, size_t size,
-                 BlobFileWriter* blob_file, AnnotatedOperation* aop)
-    : fd_(fd),
-      offset_(offset),
-      size_(size),
-      blob_file_(blob_file),
-      aop_(aop) {}
+  ChunkProcessor(const PayloadVersion& version,
+                 int fd,
+                 off_t offset,
+                 size_t size,
+                 BlobFileWriter* blob_file,
+                 AnnotatedOperation* aop)
+      : version_(version),
+        fd_(fd),
+        offset_(offset),
+        size_(size),
+        blob_file_(blob_file),
+        aop_(aop) {}
   // We use a default move constructor since all the data members are POD types.
   ChunkProcessor(ChunkProcessor&&) = default;
   ~ChunkProcessor() override = default;
@@ -69,6 +75,7 @@
   bool ProcessChunk();
 
   // Work parameters.
+  const PayloadVersion& version_;
   int fd_;
   off_t offset_;
   size_t size_;
@@ -95,10 +102,18 @@
                                         offset_,
                                         &bytes_read));
   TEST_AND_RETURN_FALSE(bytes_read == static_cast<ssize_t>(size_));
-  TEST_AND_RETURN_FALSE(BzipCompress(buffer_in_, &op_blob));
 
+  TEST_AND_RETURN_FALSE(BzipCompress(buffer_in_, &op_blob));
   InstallOperation_Type op_type = InstallOperation::REPLACE_BZ;
 
+  if (version_.OperationAllowed(InstallOperation::REPLACE_XZ)) {
+    brillo::Blob xz_blob;
+    if (XzCompress(buffer_in_, &xz_blob) && xz_blob.size() < op_blob.size()) {
+      op_blob = std::move(xz_blob);
+      op_type = InstallOperation::REPLACE_XZ;
+    }
+  }
+
   if (op_blob.size() >= buffer_in_.size()) {
     // A REPLACE is cheaper than a REPLACE_BZ in this case.
     op_blob = std::move(buffer_in_);
@@ -173,6 +188,7 @@
     dst_extent->set_num_blocks(num_blocks);
 
     chunk_processors.emplace_back(
+        config.version,
         in_fd,
         static_cast<off_t>(start_block) * config.block_size,
         num_blocks * config.block_size,