RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 16:27:35 +00:00
Code Issues Activity Actions

CHttpJob: Collect the payload as a list of buffers during download

Browse source 
Instead of growing the payload buffer as-we-go. This avoids wasting a
ton of time on buffer reallocation for non-trivial payloads.
This commit is contained in:
Andreas Kling 2019-08-04 14:54:25 +02:00
parent d0c1724d5b
commit a8740f82eb
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Libraries/LibCore/CHttpJob.cpp
View file

@ -24,7 +24,9 @@ void CHttpJob::on_socket_connected()
if (!success) if (!success)
return deferred_invoke([this](auto&) { did_fail(CNetworkJob::Error::TransmissionFailed); }); return deferred_invoke([this](auto&) { did_fail(CNetworkJob::Error::TransmissionFailed); });
Vector<u8> buffer; Vector<ByteBuffer> received_buffers;
size_t received_size = 0;
while (m_socket->is_connected()) { while (m_socket->is_connected()) {
if (m_state == State::InStatus) { if (m_state == State::InStatus) {
while (!m_socket->can_read_line()) while (!m_socket->can_read_line())
@ -89,19 +91,28 @@ void CHttpJob::on_socket_connected()
} }
return deferred_invoke([this](auto&) { did_fail(CNetworkJob::Error::ProtocolFailed); }); return deferred_invoke([this](auto&) { did_fail(CNetworkJob::Error::ProtocolFailed); });
} }
buffer.append(payload.pointer(), payload.size()); received_buffers.append(payload);
received_size += payload.size();
auto content_length_header = m_headers.get("Content-Length"); auto content_length_header = m_headers.get("Content-Length");
if (content_length_header.has_value()) { if (content_length_header.has_value()) {
bool ok; bool ok;
if (buffer.size() >= content_length_header.value().to_int(ok) && ok) { if (received_size >= content_length_header.value().to_uint(ok) && ok) {
m_state = State::Finished; m_state = State::Finished;
break; break;
} }
} }
} }
auto response = CHttpResponse::create(m_code, move(m_headers), ByteBuffer::copy(buffer.data(), buffer.size())); auto flattened_buffer = ByteBuffer::create_uninitialized(received_size);
u8* flat_ptr = flattened_buffer.data();
for (auto& received_buffer : received_buffers) {
memcpy(flat_ptr, received_buffer.data(), received_buffer.size());
flat_ptr += received_buffer.size();
}
received_buffers.clear();
auto response = CHttpResponse::create(m_code, move(m_headers), move(flattened_buffer));
deferred_invoke([this, response](auto&) { deferred_invoke([this, response](auto&) {
did_finish(move(response)); did_finish(move(response));
}); });