mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 22:31:28 +02:00
Code Issues Projects Releases Wiki Activity

[MEDIUM] session: make it possible to call an I/O handler on both SI

Browse Source 
This will be used when an I/O handler running in a stream interface
needs to establish a connection somewhere. We want the session
processor to evaluate both I/O handlers, depending on which side has
one. Doing so also requires that stream_int_update_embedded() wakes
the session up only when the other side is established or has closed,
for instance in order to handle connection errors without looping
indefinitely during the connection setup time.

The session processor still relies on BF_READ_ATTACHED being set,
though we must do whatever is required to remove this dependency.
This commit is contained in:
Willy Tarreau 2010-07-13 16:30:45 +02:00
parent 258a14b7d7
commit 7a20aa6e6b
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/session.c
View File

@ -1821,11 +1821,14 @@ resync_stream_interface:
s->req->rex = TICK_ETERNITY; s->req->rex = TICK_ETERNITY;
} }
/* Call the second stream interface's I/O handler if it's embedded. /* Call the stream interfaces' I/O handlers when embedded.
* Note that this one may wake the task up again. * Note that this one may wake the task up again.
*/ */
if (s->req->cons->iohandler) { if (s->req->cons->iohandler || s->rep->cons->iohandler) {
if (s->req->cons->iohandler)
s->req->cons->iohandler(s->req->cons); s->req->cons->iohandler(s->req->cons);
if (s->rep->cons->iohandler)
s->rep->cons->iohandler(s->rep->cons);
if (task_in_rq(t)) { if (task_in_rq(t)) {
/* If we woke up, we don't want to requeue the /* If we woke up, we don't want to requeue the
* task to the wait queue, but rather requeue * task to the wait queue, but rather requeue

2
src/stream_interface.c
View File

@ -142,7 +142,7 @@ void stream_int_update_embedded(struct stream_interface *si)
* the to only rely the changes the chk_* might have performed. * the to only rely the changes the chk_* might have performed.
*/ */
if (/* check stream interface changes */ if (/* check stream interface changes */
(si->flags & SI_FL_ERR) || si->state != SI_ST_EST || si->ib->cons->state != SI_ST_EST || (si->flags & SI_FL_ERR) || si->state != SI_ST_EST || si->ib->cons->state > SI_ST_EST ||
/* check response buffer changes */ /* check response buffer changes */
(si->ib->flags & (BF_READ_NULL|BF_READ_ERROR|BF_READ_DONTWAIT)) || (si->ib->flags & (BF_READ_NULL|BF_READ_ERROR|BF_READ_DONTWAIT)) ||
((si->ib->flags & BF_READ_ACTIVITY) && !si->ib->to_forward) || ((si->ib->flags & BF_READ_ACTIVITY) && !si->ib->to_forward) ||