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

MEDIUM: stream-int: fix the si_cant_put() calls used for end point readiness

Browse Source 
A number of si_cant_put() calls were still present to in fact indicate
that the end point is ready (thus should be turned to si_rx_endp_more()).

One other call in the Lua handler indicates that the endpoint wanted to
be blocked until some room is made in the Rx buffer in order to detect
that the connection happened, which is in fact an indication that it
wants to be called once the endpoint is ready, this is the default case
for an applet so this call was removed.

A useless call to si_cant_put() before appctx_wakeup() in the Lua
applet wakeup call was removed as well since the first thing that will
be done there will be to set end ENDP blocking flag.
This commit is contained in:
Willy Tarreau 2018-11-15 10:57:41 +01:00
parent 186dcdd128
commit 3367d4156d
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/hlua.c
View File

@ -1615,7 +1615,7 @@ static void hlua_socket_handler(struct appctx *appctx)
*/
if (!(c->flags & CO_FL_CONNECTED)) {
si_cant_get(si);
si_cant_put(si);
si_rx_endp_more(si);
return;
}
@ -1637,10 +1637,10 @@ static void hlua_socket_handler(struct appctx *appctx)
stream_int_update(si);
/* If write notifications are registered, we considers we want
* to write, so we set the flag cant put
* to write, so we clear the blocking flag.
*/
if (notification_registered(&appctx->ctx.hlua_cosocket.wake_on_write))
si_cant_put(si);
si_rx_endp_more(si);
}
/* This function is called when the "struct stream" is destroyed.
@ -2480,7 +2480,7 @@ __LJMP static int hlua_socket_connect(struct lua_State *L)
* connection completes.
*/
si_cant_get(&s->si[0]);
si_cant_put(&s->si[0]);
si_rx_endp_more(&s->si[0]);
appctx_wakeup(appctx);
hlua->flags |= HLUA_MUST_GC;
@ -6329,15 +6329,7 @@ static enum act_return hlua_action(struct act_rule *rule, struct proxy *px,
struct task *hlua_applet_wakeup(struct task *t, void *context, unsigned short state)
{
struct appctx *ctx = context;
struct stream_interface *si = ctx->owner;
/* If the applet is wake up without any expected work, the sheduler
* remove it from the run queue. This flag indicate that the applet
* is waiting for write. If the buffer is full, the main processing
* will send some data and after call the applet, otherwise it call
* the applet ASAP.
*/
si_cant_put(si);
appctx_wakeup(ctx);
t->expire = TICK_ETERNITY;
return t;
@ -6434,7 +6426,7 @@ static int hlua_applet_tcp_init(struct appctx *ctx, struct proxy *px, struct str
/* Wakeup the applet ASAP. */
si_cant_get(si);
si_cant_put(si);
si_rx_endp_more(si);
return 1;
}