upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-02-16 17:18:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

MEDIUM: queue: revert to regular inter-task wakeups

Browse source 
Now that the inter-task wakeups are cheap, there's no point in using
task_instant_wakeup() anymore when dequeueing tasks. The use of the
regular task_wakeup() is sufficient there and will preserve a better
fairness: the test that went from 40k to 570k RPS now gives 580k RPS
(down from 585k RPS with previous commit). This essentially reverts
commit 27fab1dcb ("MEDIUM: queue: use tasklet_instant_wakeup() to
wake tasks").
This commit is contained in:
Willy Tarreau 2022-06-16 16:10:05 +02:00
parent 319d136ff9
commit 3fdacdddaf
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/queue.c
View file

@ -322,7 +322,7 @@ static int pendconn_process_next_strm(struct server *srv, struct proxy *px, int
* under us since the task will need to take the lock anyway and to wait
* if it wakes up on a different thread.
*/
task_instant_wakeup(pp->strm->task, TASK_WOKEN_RES);
task_wakeup(pp->strm->task, TASK_WOKEN_RES);
HA_SPIN_UNLOCK(QUEUE_LOCK, &pp->del_lock);
_HA_ATOMIC_DEC(&px->queue.length);
@ -343,7 +343,7 @@ static int pendconn_process_next_strm(struct server *srv, struct proxy *px, int
* under us since the task will need to take the lock anyway and to wait
* if it wakes up on a different thread.
*/
task_instant_wakeup(p->strm->task, TASK_WOKEN_RES);
task_wakeup(p->strm->task, TASK_WOKEN_RES);
__pendconn_unlink_srv(p);
_HA_ATOMIC_DEC(&srv->queue.length);
@ -497,7 +497,7 @@ int pendconn_redistribute(struct server *s)
__pendconn_unlink_srv(p);
p->strm_flags &= ~(SF_DIRECT | SF_ASSIGNED);
task_instant_wakeup(p->strm->task, TASK_WOKEN_RES);
task_wakeup(p->strm->task, TASK_WOKEN_RES);
xferred++;
}
HA_SPIN_UNLOCK(QUEUE_LOCK, &s->queue.lock);
@ -541,7 +541,7 @@ int pendconn_grab_from_px(struct server *s)
__pendconn_unlink_prx(p);
p->target = s;
task_instant_wakeup(p->strm->task, TASK_WOKEN_RES);
task_wakeup(p->strm->task, TASK_WOKEN_RES);
xferred++;
}
HA_SPIN_UNLOCK(QUEUE_LOCK, &s->proxy->queue.lock);