Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(78)

Unified Diff: content/browser/download/parallel_download_utils.cc

Issue 2783473002: Fix issues and feature polishing for parallel download. (Closed)
Patch Set: Rebase. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/download/parallel_download_utils.cc
diff --git a/content/browser/download/parallel_download_utils.cc b/content/browser/download/parallel_download_utils.cc
index a54cfa67622d67d628ea9b58268fb9437c5f2dec..69498140e2860bb4e588a5b854c38de6ffedaba6 100644
--- a/content/browser/download/parallel_download_utils.cc
+++ b/content/browser/download/parallel_download_utils.cc
@@ -63,28 +63,27 @@ bool ShouldUseParallelDownload(const DownloadCreateInfo& create_info) {
}
std::vector<DownloadItem::ReceivedSlice> FindSlicesForRemainingContent(
- int64_t bytes_received,
- int64_t content_length,
- int request_count) {
- std::vector<DownloadItem::ReceivedSlice> slices_to_download;
- if (request_count <= 0)
- return slices_to_download;
-
- // TODO(xingliu): Consider to use minimum size of a slice.
- int64_t slice_size = content_length / request_count;
- slice_size = slice_size > 0 ? slice_size : 1;
- int64_t current_offset = bytes_received;
- for (int i = 0, num_requests = content_length / slice_size;
- i < num_requests - 1; ++i) {
- slices_to_download.emplace_back(current_offset, slice_size);
- current_offset += slice_size;
+ int64_t current_offset,
+ int64_t total_length,
+ int request_count,
+ int64_t min_slice_size) {
+ std::vector<DownloadItem::ReceivedSlice> new_slices;
+
+ if (request_count > 0) {
+ int64_t slice_size =
+ std::max<int64_t>(total_length / request_count, min_slice_size);
+ slice_size = slice_size > 0 ? slice_size : 1;
+ for (int i = 0, num_requests = total_length / slice_size;
+ i < num_requests - 1; ++i) {
+ new_slices.emplace_back(current_offset, slice_size);
+ current_offset += slice_size;
+ }
}
// Last slice is a half open slice, which results in sending range request
// like "Range:50-" to fetch from 50 bytes to the end of the file.
- slices_to_download.emplace_back(current_offset,
- DownloadSaveInfo::kLengthFullContent);
- return slices_to_download;
+ new_slices.emplace_back(current_offset, DownloadSaveInfo::kLengthFullContent);
+ return new_slices;
}
std::vector<DownloadItem::ReceivedSlice> FindSlicesToDownload(

Powered by Google App Engine
This is Rietveld 408576698