mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-10-27 12:48:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

localsocket: do not hold socket mutex while sleeping

Browse Source
This commit is contained in:
Matheus
2026-07-07 01:17:48 -03:00
parent bf03d99211
commit 5414393872
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/io/net/localsocket.c
+13 -5
View File
@@ -428,12 +428,12 @@ static int localsock_send(socket_t *socket, sockdesc_t *sockdesc) {
goto leave; goto leave;
} }
localsocket_t *peer = pair->client == localsocket ? pair->server : pair->client;
MUTEX_ACQUIRE(&pair->mutex); MUTEX_ACQUIRE(&pair->mutex);
localsocket_t *peer;
// check/wait for space // check/wait for space
for (;;) { for (;;) {
peer = pair->client == localsocket ? pair->server : pair->client;
polldesc_t desc = {0}; polldesc_t desc = {0};
error = poll_initdesc(&desc, 1); error = poll_initdesc(&desc, 1);
if (error) if (error)
@@ -460,14 +460,18 @@ static int localsock_send(socket_t *socket, sockdesc_t *sockdesc) {
poll_destroydesc(&desc); poll_destroydesc(&desc);
goto leave; goto leave;
} }
MUTEX_RELEASE(&pair->mutex); MUTEX_RELEASE(&pair->mutex);
MUTEX_RELEASE(&socket->mutex);
error = poll_dowait(&desc, 0); error = poll_dowait(&desc, 0);
poll_leave(&desc); poll_leave(&desc);
poll_destroydesc(&desc); poll_destroydesc(&desc);
MUTEX_ACQUIRE(&socket->mutex);
MUTEX_ACQUIRE(&pair->mutex); MUTEX_ACQUIRE(&pair->mutex);
if (error) if (error)
goto leave; goto leave;
} }
@@ -554,13 +558,16 @@ static int localsock_recv(socket_t *socket, sockdesc_t *sockdesc) {
poll_destroydesc(&desc); poll_destroydesc(&desc);
goto leave; goto leave;
} }
MUTEX_RELEASE(&pair->mutex); MUTEX_RELEASE(&pair->mutex);
MUTEX_RELEASE(&socket->mutex);
error = poll_dowait(&desc, 0); error = poll_dowait(&desc, 0);
poll_leave(&desc); poll_leave(&desc);
poll_destroydesc(&desc); poll_destroydesc(&desc);
MUTEX_ACQUIRE(&socket->mutex);
MUTEX_ACQUIRE(&pair->mutex); MUTEX_ACQUIRE(&pair->mutex);
if (error) if (error)
goto leave; goto leave;
@@ -636,7 +643,7 @@ static int localsock_accept(socket_t *_server, socket_t *_clientconnection, sock
return EINVAL; return EINVAL;
} }
MUTEX_ACQUIRE(&server->binding->mutex); MUTEX_ACQUIRE(&binding->mutex);
if (server->listening == false) { if (server->listening == false) {
error = EINVAL; error = EINVAL;
@@ -678,6 +685,7 @@ static int localsock_accept(socket_t *_server, socket_t *_clientconnection, sock
} }
MUTEX_RELEASE(&binding->mutex); MUTEX_RELEASE(&binding->mutex);
MUTEX_RELEASE(&server->socket.mutex);
error = poll_dowait(&desc, 0); error = poll_dowait(&desc, 0);
@@ -685,8 +693,9 @@ static int localsock_accept(socket_t *_server, socket_t *_clientconnection, sock
poll_destroydesc(&desc); poll_destroydesc(&desc);
if (error) if (error)
goto leave_nobinding; return error;
MUTEX_ACQUIRE(&server->socket.mutex);
MUTEX_ACQUIRE(&binding->mutex); MUTEX_ACQUIRE(&binding->mutex);
} }
@@ -715,7 +724,6 @@ static int localsock_accept(socket_t *_server, socket_t *_clientconnection, sock
leave: leave:
MUTEX_RELEASE(&binding->mutex); MUTEX_RELEASE(&binding->mutex);
leave_nobinding:
MUTEX_RELEASE(&server->socket.mutex); MUTEX_RELEASE(&server->socket.mutex);
return error; return error;
} }