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

util/net/http_body.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 80 matching lines @@
     const CompositeHTTPBodyStream::PartsList& parts)
     : HTTPBodyStream(), parts_(parts), current_part_(parts_.begin()) {
 }
 
 CompositeHTTPBodyStream::~CompositeHTTPBodyStream() {
   STLDeleteContainerPointers(parts_.begin(), parts_.end());
 }
 
 ssize_t CompositeHTTPBodyStream::GetBytesBuffer(uint8_t* buffer,
                                                 size_t max_len) {
-  if (current_part_ == parts_.end())
-    return 0;
+  max_len =
+      std::min(max_len,

[Mark Mentovai, 2014/11/07 17:00:11]

Maybe more readable if std::min( went on the first line and the two arguments
went on the next line? It’d look less like a staircase that way. Up to you.

[Robert Sesek, 2014/11/07 17:05:33]

Done.

+               implicit_cast<size_t>(std::numeric_limits<ssize_t>::max()));
+  size_t bytes_copied = 0;

[Mark Mentovai, 2014/11/07 17:00:11]

I think this should be ssize_t because that’s what you’re sticking in it and
that’s what you’re returning it as.

[Robert Sesek, 2014/11/07 17:05:33]

Done.

+  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 (rv == 0) {
-    // If the current part has returned 0 indicating EOF, advance the current
-    // part and call recursively to try again.
-    ++current_part_;
-    return GetBytesBuffer(buffer, max_len);
+    if (this_read == 0) {
+      // If the current part has returned 0 indicating EOF, advance the current
+      // part and try again.
+      ++current_part_;
+    } else if (this_read < 0) {
+      return this_read;
+    }
+    bytes_copied += this_read;
   }
 
-  return rv;
+  return bytes_copied;
 }
 
 }  // namespace crashpad