mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-12-16 23:21:01 +01:00
Code Issues Projects Releases Wiki Activity

MINOR: stream-int: move the applet_pause call out of the stream updates

Browse Source 
It's just to split the part dealing with the stream update and the part
dealing with the applet update in si_applet_done().
This commit is contained in:
Willy Tarreau 2015-09-23 19:55:42 +02:00
parent cbc32601a6
commit 388a2385a5
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/stream_interface.c
View File

@ -1443,11 +1443,6 @@ void si_applet_done(struct stream_interface *si)
ic->rex = tick_add_ifset(now_ms, ic->rto); ic->rex = tick_add_ifset(now_ms, ic->rto);
} }
/* get away from the active list if we can't work anymore. */
if (((si->flags & (SI_FL_WANT_PUT|SI_FL_WAIT_ROOM)) != SI_FL_WANT_PUT) &&
((si->flags & (SI_FL_WANT_GET|SI_FL_WAIT_DATA)) != SI_FL_WANT_GET))
appctx_pause(si_appctx(si));
/* wake the task up only when needed */ /* wake the task up only when needed */
if (/* changes on the production side */ if (/* changes on the production side */
(ic->flags & (CF_READ_NULL|CF_READ_ERROR)) || (ic->flags & (CF_READ_NULL|CF_READ_ERROR)) ||
@ -1464,12 +1459,22 @@ void si_applet_done(struct stream_interface *si)
(si_opposite(si)->state != SI_ST_EST || (si_opposite(si)->state != SI_ST_EST ||
(channel_is_empty(oc) && !oc->to_forward)))))) { (channel_is_empty(oc) && !oc->to_forward)))))) {
task_wakeup(si_task(si), TASK_WOKEN_IO); task_wakeup(si_task(si), TASK_WOKEN_IO);
appctx_pause(si_appctx(si));
} }
if (ic->flags & CF_READ_ACTIVITY) if (ic->flags & CF_READ_ACTIVITY)
ic->flags &= ~CF_READ_DONTWAIT; ic->flags &= ~CF_READ_DONTWAIT;
stream_release_buffers(si_strm(si)); stream_release_buffers(si_strm(si));
/* Get away from the active list if we can't work anymore.
* We also do that if the main task has already scheduled, because it
* saves a useless wakeup/pause/wakeup cycle causing one useless call
* per session on average.
*/
if (task_in_rq(si_task(si)) ||
(((si->flags & (SI_FL_WANT_PUT|SI_FL_WAIT_ROOM)) != SI_FL_WANT_PUT) &&
((si->flags & (SI_FL_WANT_GET|SI_FL_WAIT_DATA)) != SI_FL_WANT_GET)))
appctx_pause(si_appctx(si));
} }