From: Olivier Houchard <ohouchard@haproxy.com>
Date: Fri, 8 Mar 2019 17:48:31 +0000 (+0100)
Subject: MEDIUM: server: Use the new _HA_ATOMIC_* macros.
X-Git-Tag: v2.0-dev2~93
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aa4d71a7fed30af1eea1371cbf9b2aff1f71bc9a;p=thirdparty%2Fhaproxy.git

MEDIUM: server: Use the new _HA_ATOMIC_* macros.

Use the new _HA_ATOMIC_* macros and add barriers where needed.
---

diff --git a/include/proto/server.h b/include/proto/server.h
index 45947cb9ce..cc6a699a86 100644
--- a/include/proto/server.h
+++ b/include/proto/server.h
@@ -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 */
 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,
 			     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)) {
 		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) {
-			HA_ATOMIC_SUB(&srv->curr_idle_conns, 1);
+			_HA_ATOMIC_SUB(&srv->curr_idle_conns, 1);
 			return 0;
 		}
 		LIST_DEL(&conn->list);