[MEDIUM] don't report buffer timeout when there is I/O activity
We don't want to report a buffer timeout if there was I/O activity
for the same events. That way we'll not have to always re-arm timeouts
on I/O, without the fear of a timeout triggering too fast.
diff --git a/include/proto/buffers.h b/include/proto/buffers.h
index 37f724a..be1c949 100644
--- a/include/proto/buffers.h
+++ b/include/proto/buffers.h
@@ -67,14 +67,17 @@
/* Check buffer timeouts, and set the corresponding flags. The
* likely/unlikely have been optimized for fastest normal path.
+ * The read/write timeouts are not set if there was activity on the buffer.
+ * That way, we don't have to update the timeout on every I/O. Note that the
+ * analyser timeout is always checked.
*/
static inline void buffer_check_timeouts(struct buffer *b)
{
- if (likely(!(b->flags & (BF_SHUTR|BF_READ_TIMEOUT))) &&
+ if (likely(!(b->flags & (BF_SHUTR|BF_READ_TIMEOUT|BF_READ_ACTIVITY))) &&
unlikely(tick_is_expired(b->rex, now_ms)))
b->flags |= BF_READ_TIMEOUT;
- if (likely(!(b->flags & (BF_SHUTW|BF_WRITE_TIMEOUT))) &&
+ if (likely(!(b->flags & (BF_SHUTW|BF_WRITE_TIMEOUT|BF_WRITE_ACTIVITY))) &&
unlikely(tick_is_expired(b->wex, now_ms)))
b->flags |= BF_WRITE_TIMEOUT;