MINOR: queue: add queue_init() to initialize a queue

This is better and cleaner than open-coding this in the server and
proxy code, where it has all chances of becoming wrong once forgotten.

diff --git a/include/haproxy/queue.h b/include/haproxy/queue.h
index 101a4ca5f61b696fbd830b15a51077a1d13ae8e8..3e79507876f78b0f6ba9f58e344511fe29f0c3d4 100644 (file)
--- a/include/haproxy/queue.h
+++ b/include/haproxy/queue.h
@@ -109,6 +109,13 @@ static inline int queue_limit_offset(int offset)
        return offset;
 }
 
+static inline void queue_init(struct queue *queue)
+{
+       queue->head = EB_ROOT;
+       queue->length = 0;
+       queue->idx = 0;
+       HA_SPIN_INIT(&queue->lock);
+}
 
 #endif /* _HAPROXY_QUEUE_H */
 

diff --git a/src/proxy.c b/src/proxy.c
index 98a46fd5b38c72dc696e38b59c52f8d6fac866ac..3c679509c034c4c0b823b4023a15fd14f6368c3e 100644 (file)
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -1292,8 +1292,7 @@ void init_new_proxy(struct proxy *p)
 {
        memset(p, 0, sizeof(struct proxy));
        p->obj_type = OBJ_TYPE_PROXY;
-       p->queue.head = EB_ROOT;
-       HA_SPIN_INIT(&p->queue.lock);
+       queue_init(&p->queue);
        LIST_INIT(&p->acl);
        LIST_INIT(&p->http_req_rules);
        LIST_INIT(&p->http_res_rules);

diff --git a/src/server.c b/src/server.c
index 2b3cc82bed4d175b9d55df985d323862e348564a..95a479d339cab01b56279591dad04914fcb9eb1a 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -2160,8 +2160,7 @@ struct server *new_server(struct proxy *proxy)
 
        srv->obj_type = OBJ_TYPE_SERVER;
        srv->proxy = proxy;
-       srv->queue.head = EB_ROOT;
-       HA_SPIN_INIT(&srv->queue.lock);
+       queue_init(&srv->queue);
        LIST_APPEND(&servers_list, &srv->global_list);
        LIST_INIT(&srv->srv_rec_item);
        LIST_INIT(&srv->ip_rec_item);