mirror of
http://git.haproxy.org/git/haproxy.git
synced 2026-02-13 01:09:08 +02:00
fcb8bf8650
Till now whenever a server or proxy's queue was touched, this server or proxy's lock was taken. Not only this requires distinct code paths, but it also causes unnecessary contention with other uses of these locks. This patch adds a lock inside the "queue" structure that will be used the same way by the server and the proxy queuing code. The server used to use a spinlock and the proxy an rwlock, though the queue only used it for locked writes. This new version uses a spinlock since we don't need the read lock part here. Tests have not shown any benefit nor cost in using this one versus the rwlock so we could change later if needed. The lower contention on the locks increases the performance from 491k to 507k req/s on 16 threads with 20 servers and leastconn. The gain with roundrobin even increases by 6%. The performance profile changes from this: 13.03% haproxy [.] fwlc_srv_reposition 8.08% haproxy [.] fwlc_get_next_server 3.62% haproxy [.] process_srv_queue 1.78% haproxy [.] pendconn_dequeue 1.74% haproxy [.] pendconn_add to this: 11.95% haproxy [.] fwlc_srv_reposition 7.57% haproxy [.] fwlc_get_next_server 3.51% haproxy [.] process_srv_queue 1.74% haproxy [.] pendconn_dequeue 1.70% haproxy [.] pendconn_add At this point the differences are mostly measurement noise. This is tagged medium because the lock is changed, but no other part of the code touches the queues, with nor without locking, so this should remain invisible.
57 lines
1.8 KiB
C
57 lines
1.8 KiB
C
/*
|
|
* include/haproxy/queue-t.h
|
|
* This file defines variables and structures needed for queues.
|
|
*
|
|
* Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation, version 2.1
|
|
* exclusively.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#ifndef _HAPROXY_QUEUE_T_H
|
|
#define _HAPROXY_QUEUE_T_H
|
|
|
|
#include <import/eb32tree.h>
|
|
#include <haproxy/api-t.h>
|
|
|
|
struct proxy;
|
|
struct server;
|
|
struct stream;
|
|
|
|
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 proxy *px;
|
|
struct server *srv; /* the server we are waiting for, may be NULL if don't care */
|
|
struct server *target; /* the server that was assigned, = srv except if srv==NULL */
|
|
struct eb32_node node;
|
|
};
|
|
|
|
struct queue {
|
|
struct eb_root head; /* queued pendconnds */
|
|
__decl_thread(HA_SPINLOCK_T lock); /* for manipulations in the tree */
|
|
unsigned int idx; /* current queuing index */
|
|
unsigned int length; /* number of entries */
|
|
};
|
|
|
|
#endif /* _HAPROXY_QUEUE_T_H */
|
|
|
|
/*
|
|
* Local variables:
|
|
* c-indent-level: 8
|
|
* c-basic-offset: 8
|
|
* End:
|
|
*/
|