kozorizki/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CLEANUP: sock: always perform last connection updates before wakeup

Browse Source 
Normally the task_wakeup() in sock_conn_io_cb() is expected to
happen on the same thread the FD is attached to. But due to the
way the code was arranged in the past (with synchronous callbacks)
we continue to update connections after the wakeup, which always
makes the reader have to think deeply whether it's possible or not
to call another thread there. Let's just move the tasklet_wakeup()
at the end to make sure there's no problem with that.
This commit is contained in:
Willy Tarreau 2023-03-02 15:07:51 +01:00
parent 677c006c5c
commit 9b773ec118
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/sock.c
View File

@ -818,6 +818,7 @@ void sock_conn_iocb(int fd)
struct connection *conn = fdtab[fd].owner;
unsigned int flags;
int need_wake = 0;
struct tasklet *t;
if (unlikely(!conn)) {
activity[tid].conn_dead++;
@ -845,11 +846,12 @@ void sock_conn_iocb(int fd)
*/
flags = 0;
if (conn->subs && conn->subs->events & SUB_RETRY_SEND) {
t = conn->subs->tasklet;
need_wake = 0; // wake will be called after this I/O
tasklet_wakeup(conn->subs->tasklet);
conn->subs->events &= ~SUB_RETRY_SEND;
if (!conn->subs->events)
conn->subs = NULL;
tasklet_wakeup(t);
}
fd_stop_send(fd);
}
@ -865,11 +867,12 @@ void sock_conn_iocb(int fd)
*/
flags = 0;
if (conn->subs && conn->subs->events & SUB_RETRY_RECV) {
t = conn->subs->tasklet;
need_wake = 0; // wake will be called after this I/O
tasklet_wakeup(conn->subs->tasklet);
conn->subs->events &= ~SUB_RETRY_RECV;
if (!conn->subs->events)
conn->subs = NULL;
tasklet_wakeup(t);
}
fd_stop_recv(fd);
}