MINOR: buffer: use MT_LIST_ADDQ() for buffer_wait lists additions

The TRY_ADDQ there was not needed since the wait list is exclusively
owned by the caller. There's a preliminary test on MT_LIST_ADDED()
that might have been eliminated by keeping MT_LIST_TRY_ADDQ() but
it would have required two more expensive writes before testing so
better keep the test the way it is.

diff --git a/include/haproxy/channel.h b/include/haproxy/channel.h
index 004fc0374b9bebf082a961cf3b08fa277686b6cd..3cd3bb3b1f277ab3b0da65b485c21bacdd340178 100644 (file)
--- a/include/haproxy/channel.h
+++ b/include/haproxy/channel.h
@@ -850,7 +850,7 @@ static inline int channel_alloc_buffer(struct channel *chn, struct buffer_wait *
                return 1;
 
        if (!MT_LIST_ADDED(&wait->list))
-               MT_LIST_TRY_ADDQ(&buffer_wq, &wait->list);
+               MT_LIST_ADDQ(&buffer_wq, &wait->list);
 
        return 0;
 }

diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index b6359c63d2ed574e2364ca8e291c90f70eb79fa7..62e535ef118834a545e0795841b8b1b29b26abcf 100644 (file)
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -2807,7 +2807,7 @@ spoe_acquire_buffer(struct buffer *buf, struct buffer_wait *buffer_wait)
        if (b_alloc_margin(buf, global.tune.reserved_bufs))
                return 1;
 
-       MT_LIST_TRY_ADDQ(&buffer_wq, &buffer_wait->list);
+       MT_LIST_ADDQ(&buffer_wq, &buffer_wait->list);
        return 0;
 }
 

diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index 05723e8ce3d88cd1bac4805f455b62468975d7c9..7165e391557e2711f373f26f8574a322c9b00f25 100644 (file)
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -605,7 +605,7 @@ static inline struct buffer *fcgi_get_buf(struct fcgi_conn *fconn, struct buffer
            unlikely((buf = b_alloc_margin(bptr, 0)) == NULL)) {
                fconn->buf_wait.target = fconn;
                fconn->buf_wait.wakeup_cb = fcgi_buf_available;
-               MT_LIST_TRY_ADDQ(&buffer_wq, &fconn->buf_wait.list);
+               MT_LIST_ADDQ(&buffer_wq, &fconn->buf_wait.list);
        }
        return buf;
 }

diff --git a/src/mux_h1.c b/src/mux_h1.c
index 0626a7dc2d57a7d80e1c275707e6e876ad9c92d6..ae3bca38c839c64ec6bf764dbb7a40d1ba833ff4 100644 (file)
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -416,7 +416,7 @@ static inline struct buffer *h1_get_buf(struct h1c *h1c, struct buffer *bptr)
            unlikely((buf = b_alloc_margin(bptr, 0)) == NULL)) {
                h1c->buf_wait.target = h1c;
                h1c->buf_wait.wakeup_cb = h1_buf_available;
-               MT_LIST_TRY_ADDQ(&buffer_wq, &h1c->buf_wait.list);
+               MT_LIST_ADDQ(&buffer_wq, &h1c->buf_wait.list);
        }
        return buf;
 }

diff --git a/src/mux_h2.c b/src/mux_h2.c
index ce26c927e87d8a37a54d7b1a4b99b7ea52db03ae..d02a04d8ecd1450f0504ec2ed77c622bbe8a7203 100644 (file)
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -683,7 +683,7 @@ static inline struct buffer *h2_get_buf(struct h2c *h2c, struct buffer *bptr)
            unlikely((buf = b_alloc_margin(bptr, 0)) == NULL)) {
                h2c->buf_wait.target = h2c;
                h2c->buf_wait.wakeup_cb = h2_buf_available;
-               MT_LIST_TRY_ADDQ(&buffer_wq, &h2c->buf_wait.list);
+               MT_LIST_ADDQ(&buffer_wq, &h2c->buf_wait.list);
        }
        return buf;
 }

diff --git a/src/stream.c b/src/stream.c
index f3253c6852195d630009dc107c94cba0f948d121..287f40647c1faa256ab96e46d6bdb966fec7b4c4 100644 (file)
--- a/src/stream.c
+++ b/src/stream.c
@@ -728,7 +728,7 @@ static int stream_alloc_work_buffer(struct stream *s)
        if (b_alloc_margin(&s->res.buf, 0))
                return 1;
 
-       MT_LIST_TRY_ADDQ(&buffer_wq, &s->buffer_wait.list);
+       MT_LIST_ADDQ(&buffer_wq, &s->buffer_wait.list);
        return 0;
 }