Annotation of pkgsrc/net/haproxy/patches/patch-src_queue.c, revision 1.3
1.3 ! adam 1: $NetBSD: patch-src_queue.c,v 1.2 2024/09/14 08:00:13 adam Exp $
1.1 jperkin 2:
3: Avoid 'struct queue' conflict.
4:
1.3 ! adam 5: --- src/queue.c.orig 2025-05-28 14:35:14.000000000 +0000
1.1 jperkin 6: +++ src/queue.c
1.2 adam 7: @@ -177,7 +177,7 @@ static inline void pendconn_queue_unlock
1.1 jperkin 8: */
9: void pendconn_unlink(struct pendconn *p)
10: {
11: - struct queue *q = p->queue;
12: + struct haqueue *q = p->queue;
13: struct proxy *px = q->px;
14: struct server *sv = q->sv;
15: uint oldidx;
1.3 ! adam 16: @@ -555,7 +555,7 @@ struct pendconn *pendconn_add(struct str
1.1 jperkin 17: struct pendconn *p;
18: struct proxy *px;
19: struct server *srv;
20: - struct queue *q;
21: + struct haqueue *q;
22: unsigned int *max_ptr;
1.3 ! adam 23: unsigned int *queueslength;
1.1 jperkin 24: unsigned int old_max, new_max;
1.3 ! adam 25: @@ -628,7 +628,7 @@ int pendconn_redistribute(struct server
! 26: goto skip_srv_queue;
1.1 jperkin 27:
1.3 ! adam 28: for (i = 0; i < global.nbtgroups; i++) {
! 29: - struct queue *queue = &s->per_tgrp[i].queue;
! 30: + struct haqueue *queue = &s->per_tgrp[i].queue;
! 31: int local_xferred = 0;
! 32:
! 33: HA_SPIN_LOCK(QUEUE_LOCK, &queue->lock);
! 34: @@ -663,7 +663,7 @@ int pendconn_redistribute(struct server
! 35: goto done;
! 36:
! 37: for (i = 0; i < global.nbtgroups; i++) {
! 38: - struct queue *queue = &px->per_tgrp[i].queue;
! 39: + struct haqueue *queue = &px->per_tgrp[i].queue;
! 40: int local_xferred = 0;
! 41:
! 42: HA_SPIN_LOCK(QUEUE_LOCK, &queue->lock);
CVSweb <webmaster@jp.NetBSD.org>