3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-03-17 08:33:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

In CompositeHTTPBodyStream, coalesce small GetBytesBuffer()s to better fill the buffer.

Browse Source 
R=mark@chromium.org

Review URL: https://codereview.chromium.org/707223002
This commit is contained in:
Robert Sesek 2014-11-07 12:08:14 -05:00
parent 9386a054e2
commit e5048b3a80
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
util/net/http_body.cc
View File

@ -97,20 +97,25 @@ CompositeHTTPBodyStream::~CompositeHTTPBodyStream() {
} }
ssize_t CompositeHTTPBodyStream::GetBytesBuffer(uint8_t* buffer, ssize_t CompositeHTTPBodyStream::GetBytesBuffer(uint8_t* buffer,
size_t max_len) { size_t buffer_len) {
if (current_part_ == parts_.end()) ssize_t max_len = std::min(
return 0; buffer_len, implicit_cast<size_t>(std::numeric_limits<ssize_t>::max()));
ssize_t bytes_copied = 0;
while (bytes_copied < max_len && current_part_ != parts_.end()) {
ssize_t this_read = (*current_part_)->GetBytesBuffer(
buffer + bytes_copied, max_len - bytes_copied);
ssize_t rv = (*current_part_)->GetBytesBuffer(buffer, max_len); if (this_read == 0) {
// If the current part has returned 0 indicating EOF, advance the current
if (rv == 0) { // part and try again.
// If the current part has returned 0 indicating EOF, advance the current ++current_part_;
// part and call recursively to try again. } else if (this_read < 0) {
++current_part_; return this_read;
return GetBytesBuffer(buffer, max_len); }
bytes_copied += this_read;
} }
return rv; return bytes_copied;
} }
} // namespace crashpad } // namespace crashpad

2
util/net/http_body_test.cc
View File

@ -214,7 +214,7 @@ TEST_P(CompositeHTTPBodyStreamBufferSize, StringsAndFile) {
INSTANTIATE_TEST_CASE_P(VariableBufferSize, INSTANTIATE_TEST_CASE_P(VariableBufferSize,
CompositeHTTPBodyStreamBufferSize, CompositeHTTPBodyStreamBufferSize,
testing::Values(1, 2, 9, 16, 31, 128)); testing::Values(1, 2, 9, 16, 31, 128, 1024));
} // namespace } // namespace
} // namespace test } // namespace test