mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 06:11:32 +02:00
Code Issues Projects Releases Wiki Activity

MEDIUM: server: Use the new _HA_ATOMIC_* macros.

Browse Source 
Use the new _HA_ATOMIC_* macros and add barriers where needed.
This commit is contained in:
Olivier Houchard 2019-03-08 18:48:31 +01:00 committed by Olivier Houchard
parent 11ecfd1c01
commit aa4d71a7fe
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/proto/server.h
View File

@ -71,7 +71,7 @@ struct task *srv_cleanup_toremove_connections(struct task *task, void *context,
/* increase the number of cumulated connections on the designated server */ /* increase the number of cumulated connections on the designated server */
static void inline srv_inc_sess_ctr(struct server *s) static void inline srv_inc_sess_ctr(struct server *s)
{ {
HA_ATOMIC_ADD(&s->counters.cum_sess, 1); _HA_ATOMIC_ADD(&s->counters.cum_sess, 1);
HA_ATOMIC_UPDATE_MAX(&s->counters.sps_max, HA_ATOMIC_UPDATE_MAX(&s->counters.sps_max,
update_freq_ctr(&s->sess_per_sec, 1)); update_freq_ctr(&s->sess_per_sec, 1));
} }
@ -254,9 +254,9 @@ static inline int srv_add_to_idle_list(struct server *srv, struct connection *co
!conn->mux->used_streams(conn) && conn->mux->avail_streams(conn)) { !conn->mux->used_streams(conn) && conn->mux->avail_streams(conn)) {
int retadd; int retadd;
retadd = HA_ATOMIC_ADD(&srv->curr_idle_conns, 1); retadd = _HA_ATOMIC_ADD(&srv->curr_idle_conns, 1);
if (retadd >= srv->max_idle_conns) { if (retadd >= srv->max_idle_conns) {
HA_ATOMIC_SUB(&srv->curr_idle_conns, 1); _HA_ATOMIC_SUB(&srv->curr_idle_conns, 1);
return 0; return 0;
} }
LIST_DEL(&conn->list); LIST_DEL(&conn->list);