RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEBUG: stream-int: Fix BUG_ON used to test appctx in si_applet_ops callbacks 

693b23bb1 ("MEDIUM: tree-wide: Use unsafe conn-stream API when it is
relevant") introduced a regression in DEBUG_STRICT mode because some BUG_ON
conditions were inverted. It should ok now.

In addition, ALREADY_CHECKED macro was removed from appctx_wakeup() function
because it is useless now.
This commit is contained in:
Christopher Faulet 2022-02-28 17:27:09 +01:00
parent e07f8b5552
commit 8bc1759f60
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/applet.h
View File

@ -113,8 +113,6 @@ static inline void appctx_free(struct appctx *appctx)
/* wakes up an applet when conditions have changed */
static inline void appctx_wakeup(struct appctx *appctx)
{
ALREADY_CHECKED(appctx);
task_wakeup(appctx->t, TASK_WOKEN_OTHER);
}

10
src/stream_interface.c
View File

@ -1656,7 +1656,7 @@ void si_applet_wake_cb(struct stream_interface *si)
{
struct channel *ic = si_ic(si);
BUG_ON(cs_appctx(si->cs));
BUG_ON(!cs_appctx(si->cs));
/* If the applet wants to write and the channel is closed, it's a
* broken pipe and it must be reported.
@ -1696,7 +1696,7 @@ static void stream_int_shutr_applet(struct stream_interface *si)
{
struct channel *ic = si_ic(si);
BUG_ON(cs_appctx(si->cs));
BUG_ON(!cs_appctx(si->cs));
si_rx_shut_blk(si);
if (ic->flags & CF_SHUTR)
@ -1732,7 +1732,7 @@ static void stream_int_shutw_applet(struct stream_interface *si)
struct channel *ic = si_ic(si);
struct channel *oc = si_oc(si);
BUG_ON(cs_appctx(si->cs));
BUG_ON(!cs_appctx(si->cs));
oc->flags &= ~CF_SHUTW_NOW;
if (oc->flags & CF_SHUTW)
@ -1785,7 +1785,7 @@ static void stream_int_chk_rcv_applet(struct stream_interface *si)
{
struct channel *ic = si_ic(si);
BUG_ON(cs_appctx(si->cs));
BUG_ON(!cs_appctx(si->cs));
DPRINTF(stderr, "%s: si=%p, si->state=%d ic->flags=%08x oc->flags=%08x\n",
__FUNCTION__,
@ -1802,7 +1802,7 @@ static void stream_int_chk_snd_applet(struct stream_interface *si)
{
struct channel *oc = si_oc(si);
BUG_ON(cs_appctx(si->cs));
BUG_ON(!cs_appctx(si->cs));
DPRINTF(stderr, "%s: si=%p, si->state=%d ic->flags=%08x oc->flags=%08x\n",
__FUNCTION__,