thebestvibedev/tromcho.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Coalesce entries in send_out_buf

Browse Source
This commit is contained in:
Vitaliy Filippov
2026-04-22 01:41:29 +03:00
parent 5d42881736
commit 767a61e47c
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client/msgr_send.cpp
+23 -12
View File
@@ -455,20 +455,34 @@ class get_op_writer_t: public msgr_op_writer_t
} }
} }
void send_out_buf(size_t n)
{
if (cl->send_list.size() > 0)
{
iovec& last = cl->send_list.back();
if (last.iov_base+last.iov_len == cl->ssl_out_buf+cl->ssl_out_buf_size)
{
last.iov_len += n;
cl->ssl_out_buf_size += n;
return;
}
}
cl->send_list.push_back((iovec){ .iov_base = cl->ssl_out_buf+cl->ssl_out_buf_size, .iov_len = n });
cl->ssl_out_buf_size += n;
}
void copy_ssl() void copy_ssl()
{ {
size_t prev_size = cl->ssl_out_buf_size; size_t n = 0;
do do
{ {
ssl_extend_buf(); ssl_extend_buf();
int r = BIO_read(cl->read_from_ssl, cl->ssl_out_buf+cl->ssl_out_buf_size, cl->ssl_out_buf_cap-cl->ssl_out_buf_size); int r = BIO_read(cl->read_from_ssl, cl->ssl_out_buf+cl->ssl_out_buf_size, cl->ssl_out_buf_cap-cl->ssl_out_buf_size);
if (r > 0) if (r > 0)
cl->ssl_out_buf_size += r; n += r;
} while (cl->ssl_out_buf_size >= cl->ssl_out_buf_cap); } while (cl->ssl_out_buf_size+n >= cl->ssl_out_buf_cap);
if (cl->ssl_out_buf_size > prev_size) if (n > 0)
{ send_out_buf(n);
cl->send_list.push_back((iovec){ .iov_base = cl->ssl_out_buf+prev_size, .iov_len = cl->ssl_out_buf_size-prev_size });
}
} }
public: public:
@@ -555,8 +569,7 @@ public:
#endif #endif
if (cl->write_csum_state && !(flags & WR_NO_CSUM)) if (cl->write_csum_state && !(flags & WR_NO_CSUM))
XXH3_64bits_update(cl->write_csum_state, src+from, n); XXH3_64bits_update(cl->write_csum_state, src+from, n);
cl->send_list.push_back((iovec){ .iov_base = cl->ssl_out_buf+cl->ssl_out_buf_size, .iov_len = n }); send_out_buf(n);
cl->ssl_out_buf_size += n;
cl->write_op_pos += n; cl->write_op_pos += n;
from += n; from += n;
if (from < src_len) if (from < src_len)
@@ -611,9 +624,7 @@ public:
// Tag is 16 bytes // Tag is 16 bytes
ssl_extend_buf(16); ssl_extend_buf(16);
gcm_op_writer_t::write_tag_to(msgr, cl, cl->ssl_out_buf+cl->ssl_out_buf_size); gcm_op_writer_t::write_tag_to(msgr, cl, cl->ssl_out_buf+cl->ssl_out_buf_size);
// FIXME coalesce entries in ssl_out_buf send_out_buf(16);
cl->send_list.push_back((iovec){ .iov_base = cl->ssl_out_buf+cl->ssl_out_buf_size, .iov_len = 16 });
cl->ssl_out_buf_size += 16;
gcm_op_writer_t::free_ctx(msgr, cl); gcm_op_writer_t::free_ctx(msgr, cl);
} }
return true; return true;