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

Fix iothreads sometimes hanging after adding zerocopy support

Browse Source
This commit is contained in:
Vitaliy Filippov
2025-05-23 20:54:03 +03:00
parent 0dd49c1d67
commit 2b0a802ea1
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client/msgr_receive.cpp
+2
View File
@@ -35,6 +35,8 @@ void osd_messenger_t::read_requests()
ring_data_t data_local; ring_data_t data_local;
sqe_local.user_data = (uint64_t)&data_local; sqe_local.user_data = (uint64_t)&data_local;
io_uring_sqe* sqe = (iothread ? &sqe_local : ringloop->get_sqe()); io_uring_sqe* sqe = (iothread ? &sqe_local : ringloop->get_sqe());
if (iothread)
data_local = {};
if (!sqe) if (!sqe)
{ {
cl->read_msg.msg_iovlen = 0; cl->read_msg.msg_iovlen = 0;
src/client/msgr_send.cpp
+2 -2
View File
@@ -196,10 +196,10 @@ bool osd_messenger_t::try_send(osd_client_t *cl)
ring_data_t data_local; ring_data_t data_local;
sqe_local.user_data = (uint64_t)&data_local; sqe_local.user_data = (uint64_t)&data_local;
io_uring_sqe* sqe = (iothread ? &sqe_local : ringloop->get_sqe()); io_uring_sqe* sqe = (iothread ? &sqe_local : ringloop->get_sqe());
if (iothread)
data_local = {};
if (!sqe) if (!sqe)
{
return false; return false;
}
cl->write_msg.msg_iov = cl->send_list.data(); cl->write_msg.msg_iov = cl->send_list.data();
cl->write_msg.msg_iovlen = cl->send_list.size() < IOV_MAX ? cl->send_list.size() : IOV_MAX; cl->write_msg.msg_iovlen = cl->send_list.size() < IOV_MAX ? cl->send_list.size() : IOV_MAX;
cl->refs++; cl->refs++;