AU: Cut cycles even more aggressively, log progress of cutting

generate_delta_main.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <set>
@@ skipping 47 matching lines @@
   logging::InitLogging("delta_generator.log",
                        logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
                        logging::DONT_LOCK_LOG_FILE,
                        logging::APPEND_TO_OLD_LOG_FILE);
   if (!FLAGS_apply_delta.empty()) {
     if (FLAGS_old_image.empty()) {
       LOG(FATAL) << "Must pass --old_image with --apply_delta.";
     }
     DeltaPerformer performer;
     CHECK_EQ(performer.Open(FLAGS_old_image.c_str(), 0, 0), 0);
+    CHECK(performer.OpenKernel(FLAGS_old_kernel.c_str()));
     vector<char> buf(1024 * 1024);
     int fd = open(FLAGS_apply_delta.c_str(), O_RDONLY, 0);
     CHECK_GE(fd, 0);
     ScopedFdCloser fd_closer(&fd);
     for (off_t offset = 0;; offset += buf.size()) {
       ssize_t bytes_read;
       CHECK(utils::PReadAll(fd, &buf[0], buf.size(), offset, &bytes_read));
       if (bytes_read == 0)
         break;
       CHECK_EQ(performer.Write(&buf[0], bytes_read), bytes_read);
@@ skipping 24 matching lines @@
   return 0;
 }
 
 }  // namespace {}
 
 }  // namespace chromeos_update_engine
 
 int main(int argc, char** argv) {
   return chromeos_update_engine::Main(argc, argv);
 }