Replace Libarchive with MiniZip.

ui/file_manager/zip_archiver/cpp/compressor_io_javascript_stream.cc

 // Copyright 2017 The Chromium OS 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 "compressor_io_javascript_stream.h"
 
 #include <limits>
 #include <thread>
 
-#include "archive.h"
 #include "ppapi/cpp/logging.h"
 
 CompressorIOJavaScriptStream::CompressorIOJavaScriptStream(
     JavaScriptCompressorRequestorInterface* requestor)
-    : requestor_(requestor) {
+    : requestor_(requestor), buffer_offset_(-1), buffer_data_length_(0) {
   pthread_mutex_init(&shared_state_lock_, NULL);
   pthread_cond_init(&available_data_cond_, NULL);
   pthread_cond_init(&data_written_cond_, NULL);
 
   pthread_mutex_lock(&shared_state_lock_);
   available_data_ = false;
   pthread_mutex_unlock(&shared_state_lock_);
 }
 
 CompressorIOJavaScriptStream::~CompressorIOJavaScriptStream() {
   pthread_cond_destroy(&data_written_cond_);
   pthread_cond_destroy(&available_data_cond_);
   pthread_mutex_destroy(&shared_state_lock_);
 };
 
-int64_t CompressorIOJavaScriptStream::Write(int64_t byte_to_write,
-    const pp::VarArrayBuffer& buffer) {
+int64_t CompressorIOJavaScriptStream::Flush() {
   pthread_mutex_lock(&shared_state_lock_);
-  requestor_->WriteChunkRequest(byte_to_write, buffer);
+
+  if (buffer_data_length_ == 0) {
+    pthread_mutex_unlock(&shared_state_lock_);
+    return 0;
+  }
+
+  // Copy the data in buffer_ to array_buffer.
+  pp::VarArrayBuffer array_buffer(buffer_data_length_);
+  char* array_buffer_data = static_cast<char*>(array_buffer.Map());
+  memcpy(array_buffer_data, buffer_, buffer_data_length_);
+  array_buffer.Unmap();
+
+  requestor_->WriteChunkRequest(buffer_offset_,
+                                buffer_data_length_,
+                                array_buffer);
 
   pthread_cond_wait(&data_written_cond_, &shared_state_lock_);
 
   int64_t written_bytes = written_bytes_;
+  if (written_bytes < buffer_data_length_) {
+    pthread_mutex_unlock(&shared_state_lock_);
+    return -1 /* Error */;
+  }
+
+  // Reset the offset and length to the default values.
+  buffer_offset_ = -1;
+  buffer_data_length_ = 0;
+
   pthread_mutex_unlock(&shared_state_lock_);
-
-  return written_bytes;
+  return buffer_data_length_;
 }
 
-void CompressorIOJavaScriptStream::WriteChunkDone(int64_t written_bytes) {
+int64_t CompressorIOJavaScriptStream::Write(int64_t zip_offset,
+                                            int64_t zip_length,
+                                            const void* zip_buffer) {

[mtomasz, 2017/04/10 07:15:09]

nit: Do we need const void* here? Can we have const char* and avoid cast?

[takise, 2017/04/11 06:00:51]

Done.

+  pthread_mutex_lock(&shared_state_lock_);
+
+  int64_t current_offset = zip_offset;
+  int64_t left_length = zip_length;
+  const char* buffer_pointer = static_cast<const char*>(zip_buffer);
+
+  do {
+    // Flush the buffer if the data in the buffer cannot be reused.
+    // The following is the brief explanation about the conditions of the
+    // following if statement.
+    // 1: The buffer is not in the initial state (empty).
+    //    The buffer should have some data to flush.
+    // 2: This write operation is not to append the data to the buffer.
+    // 3: The buffer overflows if we append the data to the buffer.
+    //    If we can append the new data to the current data in the buffer,
+    //    we should not flush the buffer.
+    // 4: The index to write is outside the buffer.
+    //    If we want to write data outside the range, we first need to flush
+    //    the buffer, and then cache the data in the buffer.
+    if (buffer_offset_ >= 0 && /* 1 */
+        (current_offset != buffer_offset_ + buffer_data_length_ || /* 2 */
+         buffer_data_length_ + left_length >
+             compressor_stream_constants::kMaximumDataChunkSize) && /* 3 */
+        (current_offset < buffer_offset_ ||
+         buffer_offset_ + buffer_data_length_ <
+         current_offset + left_length) /* 4 */
+       ) {

[mtomasz, 2017/04/10 07:15:09]

nit: Please check the indent.

[takise, 2017/04/11 06:00:51]

Done.

+      pthread_mutex_unlock(&shared_state_lock_);
+      Flush();
+      pthread_mutex_lock(&shared_state_lock_);
+    }
+
+    int64_t copy_length = std::min(

[mtomasz, 2017/04/10 07:15:08]

nit: Please add some comments, as the code below is not obvious.

[takise, 2017/04/11 06:00:51]

Done.

+        left_length, compressor_stream_constants::kMaximumDataChunkSize);
+    if (buffer_offset_ == -1)
+      buffer_offset_ = current_offset;
+    int64_t offset_in_buffer = current_offset - buffer_offset_;
+    memcpy(buffer_ + offset_in_buffer, buffer_pointer, copy_length);
+
+    buffer_pointer += copy_length;
+    if (buffer_offset_ == -1 /* initial state */)
+      buffer_offset_ = current_offset;
+    buffer_data_length_ = std::max(
+        buffer_data_length_, current_offset + copy_length - buffer_offset_);
+    current_offset += copy_length;
+    left_length -= copy_length;
+  } while (left_length > 0);
+
+  pthread_mutex_unlock(&shared_state_lock_);
+  return zip_length;
+}
+
+int64_t CompressorIOJavaScriptStream::WriteChunkDone(int64_t written_bytes) {
   pthread_mutex_lock(&shared_state_lock_);
   written_bytes_ = written_bytes;
   pthread_cond_signal(&data_written_cond_);
   pthread_mutex_unlock(&shared_state_lock_);
+  return written_bytes;
 }
 
 int64_t CompressorIOJavaScriptStream::Read(int64_t bytes_to_read,
                                            char* destination_buffer) {
   pthread_mutex_lock(&shared_state_lock_);
 
   destination_buffer_ = destination_buffer;
   requestor_->ReadFileChunkRequest(bytes_to_read);
 
   while (!available_data_) {
     pthread_cond_wait(&available_data_cond_, &shared_state_lock_);
   }
 
   int64_t read_bytes = read_bytes_;
   available_data_ = false;
   pthread_mutex_unlock(&shared_state_lock_);
   return read_bytes;
 }
 
-void CompressorIOJavaScriptStream::ReadFileChunkDone(int64_t read_bytes,
+int64_t CompressorIOJavaScriptStream::ReadFileChunkDone(int64_t read_bytes,
       pp::VarArrayBuffer* array_buffer) {
   pthread_mutex_lock(&shared_state_lock_);
 
   // JavaScript sets a negative value in read_bytes if an error occurred while
   // reading a chunk.
   if (read_bytes >= 0) {
     char* array_buffer_data = static_cast<char*>(array_buffer->Map());
     memcpy(destination_buffer_, array_buffer_data, read_bytes);
     array_buffer->Unmap();
   }
 
   read_bytes_ = read_bytes;
   available_data_ = true;
   pthread_cond_signal(&available_data_cond_);
   pthread_mutex_unlock(&shared_state_lock_);
+  return read_bytes;
 }