From: Willy Tarreau Date: Fri, 4 Jun 2010 10:25:31 +0000 (+0200) Subject: [MINOR] buffer: refine the flags that may wake an analyser up. X-Git-Tag: v1.5-dev8~576 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d315eaa248abd05959beb43b3f9321d81610f4f;p=thirdparty%2Fhaproxy.git [MINOR] buffer: refine the flags that may wake an analyser up. Analysers don't care (and must not care) about a few flags such as BF_AUTO_CLOSE or BF_AUTO_CONNECT, so those flags should not be listed in the BF_MASK_STATIC bitmask. We should also recheck if some buffer flags should be ignored or not in process_session() when deciding if we must loop again or not. --- diff --git a/include/types/buffers.h b/include/types/buffers.h index 6ed8ca6a95..e08669deac 100644 --- a/include/types/buffers.h +++ b/include/types/buffers.h @@ -123,8 +123,8 @@ /* Masks which define input events for stream analysers */ #define BF_MASK_ANALYSER (BF_READ_ATTACHED|BF_READ_ACTIVITY|BF_READ_TIMEOUT|BF_ANA_TIMEOUT|BF_WRITE_ACTIVITY) -/* Mask for static flags which are not events, but might change during processing */ -#define BF_MASK_STATIC (BF_OUT_EMPTY|BF_FULL|BF_HIJACK|BF_AUTO_CLOSE|BF_AUTO_CONNECT|BF_SHUTR|BF_SHUTW|BF_SHUTR_NOW|BF_SHUTW_NOW) +/* Mask for static flags which cause analysers to be woken up when they change */ +#define BF_MASK_STATIC (BF_OUT_EMPTY|BF_FULL|BF_SHUTR|BF_SHUTW|BF_SHUTR_NOW|BF_SHUTW_NOW) /* Analysers (buffer->analysers).