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

MEDIUM: stream-int: call stream_int_update() from si_update()

Browse Source 
Now the call to stream_int_update() is moved to si_update(), which
is exclusively called from the stream, so that the socket layer may
be updated without updating the stream layer. This will later permit
to call it individually from other places (other tasks or applets for
example).
This commit is contained in:
Willy Tarreau 2015-09-25 10:59:38 +02:00
parent 452c7d5d93
commit 5d5b2fecac
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/proto/stream_interface.h
View File

@ -319,9 +319,10 @@ static inline void si_shutw(struct stream_interface *si)
si->ops->shutw(si);
}
/* Calls the data state update on the stream interfaace */
/* Updates the stream interface and timers, then updates the data layer below */
static inline void si_update(struct stream_interface *si)
{
stream_int_update(si);
si->ops->update(si);
}

5
src/stream_interface.c
View File

@ -786,9 +786,6 @@ void stream_int_update_conn(struct stream_interface *si)
struct channel *oc = si_oc(si);
struct connection *conn = __objt_conn(si->end);
stream_int_update(si);
/* now update the connection itself */
if (!(ic->flags & CF_SHUTR)) {
/* Read not closed */
if ((ic->flags & CF_DONT_READ) || !channel_may_recv(ic))
@ -1486,8 +1483,6 @@ void si_applet_done(struct stream_interface *si)
*/
void stream_int_update_applet(struct stream_interface *si)
{
stream_int_update(si);
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_wakeup(si_appctx(si));