pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net/haproxy
Module Name: pkgsrc
Committed By: jperkin
Date: Thu Dec 9 10:36:07 UTC 2021
Modified Files:
pkgsrc/net/haproxy: distinfo
Added Files:
pkgsrc/net/haproxy/patches: patch-include_haproxy_proxy-t.h
patch-include_haproxy_queue-t.h patch-include_haproxy_queue.h
patch-include_haproxy_server-t.h patch-src_ev__evports.c
patch-src_queue.c
Log Message:
haproxy: Various build fixes.
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 pkgsrc/net/haproxy/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/net/haproxy/patches/patch-include_haproxy_proxy-t.h \
pkgsrc/net/haproxy/patches/patch-include_haproxy_queue-t.h \
pkgsrc/net/haproxy/patches/patch-include_haproxy_queue.h \
pkgsrc/net/haproxy/patches/patch-include_haproxy_server-t.h \
pkgsrc/net/haproxy/patches/patch-src_ev__evports.c \
pkgsrc/net/haproxy/patches/patch-src_queue.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/net/haproxy/distinfo
diff -u pkgsrc/net/haproxy/distinfo:1.81 pkgsrc/net/haproxy/distinfo:1.82
--- pkgsrc/net/haproxy/distinfo:1.81 Mon Nov 29 20:31:01 2021
+++ pkgsrc/net/haproxy/distinfo Thu Dec 9 10:36:07 2021
@@ -1,10 +1,16 @@
-$NetBSD: distinfo,v 1.81 2021/11/29 20:31:01 adam Exp $
+$NetBSD: distinfo,v 1.82 2021/12/09 10:36:07 jperkin Exp $
BLAKE2s (haproxy-2.5.0.tar.gz) = f9e806f61f9954c5cb56d45c38236b2c0c90164a5943d30eeefd9312cd332d37
SHA512 (haproxy-2.5.0.tar.gz) = 70068962a434e9ba4b2d7595b929aec618ee62d51935c9836f2617e639416e50077495bbf08dabbe7dd49f2d4e3942e55a96a5de33a7846377972fbc3eedc1d0
Size (haproxy-2.5.0.tar.gz) = 3803196 bytes
SHA1 (patch-Makefile) = fcb2de85189526ae42ccf0b789789ee9b834f375
+SHA1 (patch-include_haproxy_proxy-t.h) = 5560f5f50e66cf122fe8464f74541f226e127e8d
+SHA1 (patch-include_haproxy_queue-t.h) = bf2ea918a6d8ec3d3fb2f88b7b9303a695381d96
+SHA1 (patch-include_haproxy_queue.h) = eed5ea43212462134fb60b50c2a32e619e104d51
+SHA1 (patch-include_haproxy_server-t.h) = 3bf9112c3264bd3cc20e8ddb01be8d6fe56eaf85
SHA1 (patch-src_cli.c) = 4bc5cf0116df121ac4c3c38b8f962c3a62d536e5
+SHA1 (patch-src_ev__evports.c) = ae71af9b53bb74fdead17e36851384e0a658006a
SHA1 (patch-src_haproxy.c) = a466acb853b5018b70571d0a03b9d28ed9245d06
SHA1 (patch-src_proto__sockpair.c) = 4d389c1f12d060517b8038ada9f0f4b5c87cf519
+SHA1 (patch-src_queue.c) = 6b58df1a4d9a17ee19514ddba478a8f01e9b2987
SHA1 (patch-src_sock.c) = fd573e97669cfc02ed446f99d84464f251253f06
Added files:
Index: pkgsrc/net/haproxy/patches/patch-include_haproxy_proxy-t.h
diff -u /dev/null pkgsrc/net/haproxy/patches/patch-include_haproxy_proxy-t.h:1.1
--- /dev/null Thu Dec 9 10:36:07 2021
+++ pkgsrc/net/haproxy/patches/patch-include_haproxy_proxy-t.h Thu Dec 9 10:36:07 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-include_haproxy_proxy-t.h,v 1.1 2021/12/09 10:36:07 jperkin Exp $
+
+Avoid 'struct queue' conflict.
+
+--- include/haproxy/proxy-t.h.orig 2021-11-23 14:40:21.000000000 +0000
++++ include/haproxy/proxy-t.h
+@@ -341,7 +341,7 @@ struct proxy {
+ __decl_thread(HA_RWLOCK_T lock); /* may be taken under the server's lock */
+
+ char *id, *desc; /* proxy id (name) and description */
+- struct queue queue; /* queued requests (pendconns) */
++ struct haqueue queue; /* queued requests (pendconns) */
+ int totpend; /* total number of pending connections on this instance (for stats) */
+ unsigned int feconn, beconn; /* # of active frontend and backends streams */
+ struct freq_ctr fe_req_per_sec; /* HTTP requests per second on the frontend */
Index: pkgsrc/net/haproxy/patches/patch-include_haproxy_queue-t.h
diff -u /dev/null pkgsrc/net/haproxy/patches/patch-include_haproxy_queue-t.h:1.1
--- /dev/null Thu Dec 9 10:36:07 2021
+++ pkgsrc/net/haproxy/patches/patch-include_haproxy_queue-t.h Thu Dec 9 10:36:07 2021
@@ -0,0 +1,29 @@
+$NetBSD: patch-include_haproxy_queue-t.h,v 1.1 2021/12/09 10:36:07 jperkin Exp $
+
+Avoid 'struct queue' conflict.
+
+--- include/haproxy/queue-t.h.orig 2021-11-23 14:40:21.000000000 +0000
++++ include/haproxy/queue-t.h
+@@ -28,19 +28,19 @@
+ struct proxy;
+ struct server;
+ struct stream;
+-struct queue;
++struct haqueue;
+
+ struct pendconn {
+ int strm_flags; /* stream flags */
+ unsigned int queue_idx; /* value of proxy/server queue_idx at time of enqueue */
+ struct stream *strm;
+- struct queue *queue; /* the queue the entry is queued into */
++ struct haqueue *queue; /* the queue the entry is queued into */
+ struct server *target; /* the server that was assigned, = srv except if srv==NULL */
+ struct eb32_node node;
+ __decl_thread(HA_SPINLOCK_T del_lock); /* use before removal, always under queue's lock */
+ };
+
+-struct queue {
++struct haqueue {
+ struct eb_root head; /* queued pendconnds */
+ struct proxy *px; /* the proxy we're waiting for, never NULL in queue */
+ struct server *sv; /* the server we are waiting for, may be NULL if don't care */
Index: pkgsrc/net/haproxy/patches/patch-include_haproxy_queue.h
diff -u /dev/null pkgsrc/net/haproxy/patches/patch-include_haproxy_queue.h:1.1
--- /dev/null Thu Dec 9 10:36:07 2021
+++ pkgsrc/net/haproxy/patches/patch-include_haproxy_queue.h Thu Dec 9 10:36:07 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-include_haproxy_queue.h,v 1.1 2021/12/09 10:36:07 jperkin Exp $
+
+Avoid 'struct queue' conflict.
+
+--- include/haproxy/queue.h.orig 2021-11-23 14:40:21.000000000 +0000
++++ include/haproxy/queue.h
+@@ -114,7 +114,7 @@ static inline int queue_limit_offset(int
+ * has a valid proxy and NULL for the server queue. This is how they're
+ * distinguished during operations.
+ */
+-static inline void queue_init(struct queue *queue, struct proxy *px, struct server *sv)
++static inline void queue_init(struct haqueue *queue, struct proxy *px, struct server *sv)
+ {
+ queue->head = EB_ROOT;
+ queue->length = 0;
Index: pkgsrc/net/haproxy/patches/patch-include_haproxy_server-t.h
diff -u /dev/null pkgsrc/net/haproxy/patches/patch-include_haproxy_server-t.h:1.1
--- /dev/null Thu Dec 9 10:36:07 2021
+++ pkgsrc/net/haproxy/patches/patch-include_haproxy_server-t.h Thu Dec 9 10:36:07 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-include_haproxy_server-t.h,v 1.1 2021/12/09 10:36:07 jperkin Exp $
+
+Avoid 'struct queue' conflict.
+
+--- include/haproxy/server-t.h.orig 2021-11-23 14:40:21.000000000 +0000
++++ include/haproxy/server-t.h
+@@ -282,7 +282,7 @@ struct server {
+ unsigned int est_need_conns; /* Estimate on the number of needed connections (max of curr and previous max_used) */
+ unsigned int next_takeover; /* thread ID to try to steal connections from next time */
+
+- struct queue queue; /* pending connections */
++ struct haqueue queue; /* pending connections */
+
+ /* Element below are usd by LB algorithms and must be doable in
+ * parallel to other threads reusing connections above.
Index: pkgsrc/net/haproxy/patches/patch-src_ev__evports.c
diff -u /dev/null pkgsrc/net/haproxy/patches/patch-src_ev__evports.c:1.1
--- /dev/null Thu Dec 9 10:36:07 2021
+++ pkgsrc/net/haproxy/patches/patch-src_ev__evports.c Thu Dec 9 10:36:07 2021
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_ev__evports.c,v 1.1 2021/12/09 10:36:07 jperkin Exp $
+
+Upstream patch to remove deleted FD_UPDT_DEAD.
+
+--- src/ev_evports.c.orig 2021-11-23 14:40:21.000000000 +0000
++++ src/ev_evports.c
+@@ -250,10 +250,6 @@ static void _do_poll(struct poller *p, i
+ */
+ ret = fd_update_events(fd, n);
+
+- /* If the FD was already dead , skip it */
+- if (ret == FD_UPDT_DEAD)
+- continue;
+-
+ /* disable polling on this instance if the FD was migrated */
+ if (ret == FD_UPDT_MIGRATED) {
+ if (!HA_ATOMIC_BTS(&fdtab[fd].update_mask, tid))
Index: pkgsrc/net/haproxy/patches/patch-src_queue.c
diff -u /dev/null pkgsrc/net/haproxy/patches/patch-src_queue.c:1.1
--- /dev/null Thu Dec 9 10:36:07 2021
+++ pkgsrc/net/haproxy/patches/patch-src_queue.c Thu Dec 9 10:36:07 2021
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_queue.c,v 1.1 2021/12/09 10:36:07 jperkin Exp $
+
+Avoid 'struct queue' conflict.
+
+--- src/queue.c.orig 2021-11-23 14:40:21.000000000 +0000
++++ src/queue.c
+@@ -178,7 +178,7 @@ static inline void pendconn_queue_unlock
+ */
+ void pendconn_unlink(struct pendconn *p)
+ {
+- struct queue *q = p->queue;
++ struct haqueue *q = p->queue;
+ struct proxy *px = q->px;
+ struct server *sv = q->sv;
+ uint oldidx;
+@@ -423,7 +423,7 @@ struct pendconn *pendconn_add(struct str
+ struct pendconn *p;
+ struct proxy *px;
+ struct server *srv;
+- struct queue *q;
++ struct haqueue *q;
+ unsigned int *max_ptr;
+ unsigned int old_max, new_max;
+
Home |
Main Index |
Thread Index |
Old Index