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

MINOR: channel: Remove CF_READ_ACTIVITY

Browse Source 
Thanks to previous changes, CF_READ_ACTIVITY flags can be removed.
Everywhere it was used, its value is now directly used
(CF_READ_EVENT|CF_READ_ERROR).
This commit is contained in:
Christopher Faulet 2022-12-20 18:14:56 +01:00
parent d898841530
commit 33e03cec5f
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/haproxy/channel-t.h
View File

@ -57,7 +57,6 @@
/* unused: 0x00000002 */ /* unused: 0x00000002 */
#define CF_READ_TIMEOUT 0x00000004 /* timeout while waiting for producer */ #define CF_READ_TIMEOUT 0x00000004 /* timeout while waiting for producer */
#define CF_READ_ERROR 0x00000008 /* unrecoverable error on producer side */ #define CF_READ_ERROR 0x00000008 /* unrecoverable error on producer side */
#define CF_READ_ACTIVITY (CF_READ_EVENT|CF_READ_ERROR)
/* unused: 0x00000010 */ /* unused: 0x00000010 */
#define CF_SHUTR 0x00000020 /* producer has already shut down */ #define CF_SHUTR 0x00000020 /* producer has already shut down */
@ -123,7 +122,7 @@
#define CF_ISRESP 0x80000000 /* 0 = request channel, 1 = response channel */ #define CF_ISRESP 0x80000000 /* 0 = request channel, 1 = response channel */
/* Masks which define input events for stream analysers */ /* Masks which define input events for stream analysers */
#define CF_MASK_ANALYSER (CF_READ_ATTACHED|CF_READ_ACTIVITY|CF_READ_TIMEOUT|CF_ANA_TIMEOUT|CF_WRITE_ACTIVITY|CF_WAKE_ONCE) #define CF_MASK_ANALYSER (CF_READ_ATTACHED|CF_READ_EVENT|CF_READ_ERROR|CF_READ_TIMEOUT|CF_ANA_TIMEOUT|CF_WRITE_ACTIVITY|CF_WAKE_ONCE)
/* Mask for static flags which cause analysers to be woken up when they change */ /* Mask for static flags which cause analysers to be woken up when they change */
#define CF_MASK_STATIC (CF_SHUTR|CF_SHUTW|CF_SHUTR_NOW|CF_SHUTW_NOW) #define CF_MASK_STATIC (CF_SHUTR|CF_SHUTW|CF_SHUTR_NOW|CF_SHUTW_NOW)

2
include/haproxy/channel.h
View File

@ -530,7 +530,7 @@ static inline int channel_output_closed(struct channel *chn)
*/ */
static inline void channel_check_timeouts(struct channel *chn) static inline void channel_check_timeouts(struct channel *chn)
{ {
if (likely(!(chn->flags & (CF_SHUTR|CF_READ_TIMEOUT|CF_READ_ACTIVITY|CF_READ_NOEXP))) && if (likely(!(chn->flags & (CF_SHUTR|CF_READ_TIMEOUT|CF_READ_EVENT|CF_READ_ERROR|CF_READ_NOEXP))) &&
unlikely(tick_is_expired(chn->rex, now_ms))) unlikely(tick_is_expired(chn->rex, now_ms)))
chn->flags |= CF_READ_TIMEOUT; chn->flags |= CF_READ_TIMEOUT;

2
src/stconn.c
View File

@ -1226,7 +1226,7 @@ static void sc_notify(struct stconn *sc)
task_queue(task); task_queue(task);
} }
if (ic->flags & CF_READ_ACTIVITY) if (ic->flags & (CF_READ_EVENT|CF_READ_ERROR))
ic->flags &= ~CF_READ_DONTWAIT; ic->flags &= ~CF_READ_DONTWAIT;
} }

2
src/stream.c
View File

@ -1782,7 +1782,7 @@ struct task *process_stream(struct task *t, void *context, unsigned int state)
* timeout needs to be refreshed. * timeout needs to be refreshed.
*/ */
if (!((req->flags | res->flags) & if (!((req->flags | res->flags) &
(CF_SHUTR|CF_READ_ACTIVITY|CF_READ_TIMEOUT|CF_SHUTW| (CF_SHUTR|CF_READ_EVENT|CF_READ_ERROR|CF_READ_TIMEOUT|CF_SHUTW|
CF_WRITE_ACTIVITY|CF_WRITE_TIMEOUT|CF_ANA_TIMEOUT)) && CF_WRITE_ACTIVITY|CF_WRITE_TIMEOUT|CF_ANA_TIMEOUT)) &&
!(s->flags & SF_CONN_EXP) && !(s->flags & SF_CONN_EXP) &&
!((sc_ep_get(scf) | scb->flags) & SE_FL_ERROR) && !((sc_ep_get(scf) | scb->flags) & SE_FL_ERROR) &&