MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-05-19 19:33:45 +02:00
Code Issues Releases Wiki Activity

ircd::resource: Optimize response w/ iov for fused head and content.

Browse source
This commit is contained in:
Jason Volk 2023-03-20 14:42:20 -07:00
parent 04acaabf91
commit 1b8ad3e160
2 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/ircd/resource/response.h
View file

@ -39,7 +39,7 @@ struct ircd::resource::response
static const size_t HEAD_BUF_SZ; static const size_t HEAD_BUF_SZ;
static conf::item<std::string> access_control_allow_origin; static conf::item<std::string> access_control_allow_origin;
response(client &, const http::code &, const string_view &content_type, const size_t &content_length, const string_view &headers = {}); response(client &, const http::code &, const string_view &content_type, const size_t &content_length, const string_view &headers = {}, const string_view &content = {});
response(client &, const string_view &str, const string_view &content_type, const http::code &, const vector_view<const http::header> &); response(client &, const string_view &str, const string_view &content_type, const http::code &, const vector_view<const http::header> &);
response(client &, const string_view &str, const string_view &content_type, const http::code & = http::OK, const string_view &headers = {}); response(client &, const string_view &str, const string_view &content_type, const http::code & = http::OK, const string_view &headers = {});
response(client &, const json::object &str, const http::code & = http::OK); response(client &, const json::object &str, const http::code & = http::OK);

36
ircd/resource.cc
View file

@ -1367,17 +1367,8 @@ ircd::resource::response::response(client &client,
content_type, content_type,
size(content), size(content),
headers, headers,
content,
}; };
// All content gets sent
const size_t written
{
size(content)?
client.write_all(content):
0
};
assert(written == size(content));
} }
decltype(ircd::resource::response::access_control_allow_origin) decltype(ircd::resource::response::access_control_allow_origin)
@ -1392,8 +1383,12 @@ ircd::resource::response::response(client &client,
const http::code &code, const http::code &code,
const string_view &content_type, const string_view &content_type,
const size_t &content_length, const size_t &content_length,
const string_view &headers) const string_view &headers,
const string_view &content)
{ {
// content may be empty if the caller wants to send it themselves, but
// either way the type and length must still be passed by caller.
assert(!content || content_length);
assert(!content_length || !empty(content_type)); assert(!content_length || !empty(content_type));
const auto request_time const auto request_time
@ -1430,13 +1425,20 @@ ircd::resource::response::response(client &client,
if(unlikely(!head.remaining())) if(unlikely(!head.remaining()))
throw panic throw panic
{ {
"HTTP headers too large for buffer of %zu", sizeof(head_buf) "HTTP headers too large for buffer of %zu",
sizeof(head_buf),
}; };
size_t wrote_head {0}; const const_buffer iov[]
{
head.completed(),
content,
};
size_t wrote {0};
std::exception_ptr eptr; try std::exception_ptr eptr; try
{ {
wrote_head += client.write_all(head.completed()); wrote += client.write_all(iov);
} }
catch(...) catch(...)
{ {
@ -1453,17 +1455,17 @@ ircd::resource::response::response(client &client,
log::logf log::logf
{ {
log, level, log, level,
"%s HTTP %u `%s' %s in %s; %s content-length:%s head-length:%zu %s%s", "%s HTTP %u `%s' %s in %s; %s head:%zu content:%s %s%s",
loghead(client), loghead(client),
uint(code), uint(code),
client.request.head.path, client.request.head.path,
http::status(code), http::status(code),
rtime, rtime,
content_type, content_type,
size(iov[0]),
ssize_t(content_length) >= 0? ssize_t(content_length) >= 0?
lex_cast(content_length): lex_cast(content_length):
"chunked"_sv, "chunked"_sv,
wrote_head,
eptr? eptr?
"error:"_sv: "error:"_sv:
string_view{}, string_view{},
@ -1474,7 +1476,7 @@ ircd::resource::response::response(client &client,
if(unlikely(eptr)) if(unlikely(eptr))
std::rethrow_exception(eptr); std::rethrow_exception(eptr);
assert(wrote_head == size(head.completed())); assert(wrote == buffers::size(vector_view(iov)));
} }
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////