Fix issues and feature polishing for parallel download.

content/browser/download/parallel_download_job.cc

 // Copyright 2017 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 "content/browser/download/parallel_download_job.h"
 
 #include "base/memory/ptr_util.h"
 #include "content/browser/download/download_create_info.h"
 #include "content/browser/download/parallel_download_utils.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/storage_partition.h"
 
 namespace content {
 namespace {
 
 const int kVerboseLevel = 1;
 
 }  // namespace
 
 ParallelDownloadJob::ParallelDownloadJob(
     DownloadItemImpl* download_item,
     std::unique_ptr<DownloadRequestHandleInterface> request_handle,
     const DownloadCreateInfo& create_info)
     : DownloadJobImpl(download_item, std::move(request_handle)),
       initial_request_offset_(create_info.offset),
+      initial_request_length_(create_info.length),
       content_length_(create_info.total_bytes),
       requests_sent_(false),
       is_canceled_(false) {}
 
 ParallelDownloadJob::~ParallelDownloadJob() = default;
 
 void ParallelDownloadJob::Start() {
   DownloadJobImpl::Start();
 
   BuildParallelRequestAfterDelay();
@@ skipping 36 matching lines @@
     return;
   }
 
   for (auto& worker : workers_)
     worker.second->Resume();
 }
 
 int ParallelDownloadJob::GetParallelRequestCount() const {
   return GetParallelRequestCountConfig();
 }
+int64_t ParallelDownloadJob::GetMinSliceSize() const {
+  return GetMinSliceSizeConfig();
+}
 
 bool ParallelDownloadJob::UsesParallelRequests() const {
   return true;
 }
 
 void ParallelDownloadJob::BuildParallelRequestAfterDelay() {
   DCHECK(workers_.empty());
   DCHECK(!requests_sent_);
   DCHECK(!timer_.IsRunning());
 
@@ skipping 30 matching lines @@
   if (is_canceled_)
     return;
 
   // TODO(qinmin): The size of |slices_to_download| should be no larger than
   // |kParallelRequestCount| unless |kParallelRequestCount| is changed after
   // a download is interrupted. This could happen if we use finch to config
   // the number of parallel requests.
   // Get the next |kParallelRequestCount - 1| slices and fork
   // new requests. For the remaining slices, they will be handled once some
   // of the workers finish their job.
-  DownloadItem::ReceivedSlices slices_to_download;
-  if (download_item_->GetReceivedSlices().empty()) {
-    slices_to_download = FindSlicesForRemainingContent(
-        initial_request_offset_, content_length_, GetParallelRequestCount());
-  } else {
+  DownloadItem::ReceivedSlices slices_to_download =
+      FindSlicesToDownload(download_item_->GetReceivedSlices());
+
+  DCHECK(!slices_to_download.empty());
+  int64_t first_slice_offset = slices_to_download[0].offset;
+
+  if (initial_request_offset_ > first_slice_offset) {
+    DVLOG(kVerboseLevel) << "Initial request is after the first slice to"
+                            " download.";
+  }
+
+  // Create more slices for a new download. The initial request may generate
+  // a received slice. If there are holes before |initial_request_offset_|,
+  // don't create more slices.
+  if (slices_to_download.size() <= 1 &&
+      initial_request_length_ == DownloadSaveInfo::kLengthFullContent &&
+      initial_request_offset_ <= first_slice_offset) {
     // TODO(qinmin): Check the size of the last slice. If it is huge, we can
     // split it into N pieces and pass the last N-1 pieces to different workers.
     // Otherwise, just fork |slices_to_download.size()| number of workers.
-    slices_to_download =
-        FindSlicesToDownload(download_item_->GetReceivedSlices());
+    slices_to_download = FindSlicesForRemainingContent(
+        first_slice_offset,
+        content_length_ - first_slice_offset + initial_request_offset_,
+        GetParallelRequestCount(), GetMinSliceSize());
   }
 
-  if (slices_to_download.empty())
-    return;
-
-  DCHECK_EQ(slices_to_download[0].offset, initial_request_offset_);
+  DCHECK(!slices_to_download.empty());
   DCHECK_EQ(slices_to_download.back().received_bytes,
             DownloadSaveInfo::kLengthFullContent);
 
-  // Send requests, does not including the original request.
   ForkSubRequests(slices_to_download);
-
   requests_sent_ = true;
 }
 
 void ParallelDownloadJob::ForkSubRequests(
     const DownloadItem::ReceivedSlices& slices_to_download) {
-  if (slices_to_download.size() < 2)
-    return;
+  bool initial_request_skipped = false;
+  for (auto it = slices_to_download.begin(); it != slices_to_download.end();
+       ++it) {
+    // Create requests for holes before the |initial_request_offset_|.
+    if (it->offset < initial_request_offset_) {
+      CreateRequest(it->offset, it->received_bytes);
+      continue;
+    }
 
-  for (auto it = slices_to_download.begin() + 1; it != slices_to_download.end();
-       ++it) {
-    // received_bytes here is the bytes need to download.
-    CreateRequest(it->offset, it->received_bytes);
+    // Assume the first slice to download after |initial_request_offset_| will
+    // be handled by the initial request.
+    if (initial_request_skipped)
+      CreateRequest(it->offset, it->received_bytes);
+    else
+      initial_request_skipped = true;
   }
 }
 
 void ParallelDownloadJob::CreateRequest(int64_t offset, int64_t length) {
   DCHECK(download_item_);
 
   std::unique_ptr<DownloadWorker> worker =
       base::MakeUnique<DownloadWorker>(this, offset, length);
 
   StoragePartition* storage_partition =
@@ skipping 16 matching lines @@
   // download request.
   download_params->set_referrer(Referrer(download_item_->GetReferrerUrl(),
                                          blink::WebReferrerPolicyAlways));
   // Send the request.
   worker->SendRequest(std::move(download_params));
   DCHECK(workers_.find(offset) == workers_.end());
   workers_[offset] = std::move(worker);
 }
 
 }  // namespace content