From 64dbb2df23e5b6dca2cf5fd1af1bd17040d77f2c Mon Sep 17 00:00:00 2001 From: Olivier Houchard Date: Fri, 8 Mar 2019 18:55:10 +0100 Subject: [PATCH] MEDIUM: tcp_rules: Use the new _HA_ATOMIC_* macros. Use the new _HA_ATOMIC_* macros and add barriers where needed. --- src/tcp_rules.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/tcp_rules.c b/src/tcp_rules.c index 91f98b0bd..13057cebf 100644 --- a/src/tcp_rules.c +++ b/src/tcp_rules.c @@ -168,10 +168,10 @@ int tcp_inspect_request(struct stream *s, struct channel *req, int an_bit) channel_abort(&s->res); req->analysers = 0; - HA_ATOMIC_ADD(&s->be->be_counters.denied_req, 1); - HA_ATOMIC_ADD(&sess->fe->fe_counters.denied_req, 1); + _HA_ATOMIC_ADD(&s->be->be_counters.denied_req, 1); + _HA_ATOMIC_ADD(&sess->fe->fe_counters.denied_req, 1); if (sess->listener && sess->listener->counters) - HA_ATOMIC_ADD(&sess->listener->counters->denied_req, 1); + _HA_ATOMIC_ADD(&sess->listener->counters->denied_req, 1); if (!(s->flags & SF_ERR_MASK)) s->flags |= SF_ERR_PRXCOND; @@ -348,10 +348,10 @@ int tcp_inspect_response(struct stream *s, struct channel *rep, int an_bit) channel_abort(&s->req); rep->analysers = 0; - HA_ATOMIC_ADD(&s->be->be_counters.denied_resp, 1); - HA_ATOMIC_ADD(&sess->fe->fe_counters.denied_resp, 1); + _HA_ATOMIC_ADD(&s->be->be_counters.denied_resp, 1); + _HA_ATOMIC_ADD(&sess->fe->fe_counters.denied_resp, 1); if (sess->listener && sess->listener->counters) - HA_ATOMIC_ADD(&sess->listener->counters->denied_resp, 1); + _HA_ATOMIC_ADD(&sess->listener->counters->denied_resp, 1); if (!(s->flags & SF_ERR_MASK)) s->flags |= SF_ERR_PRXCOND; @@ -432,9 +432,9 @@ int tcp_exec_l4_rules(struct session *sess) break; } else if (rule->action == ACT_ACTION_DENY) { - HA_ATOMIC_ADD(&sess->fe->fe_counters.denied_conn, 1); + _HA_ATOMIC_ADD(&sess->fe->fe_counters.denied_conn, 1); if (sess->listener && sess->listener->counters) - HA_ATOMIC_ADD(&sess->listener->counters->denied_conn, 1); + _HA_ATOMIC_ADD(&sess->listener->counters->denied_conn, 1); result = 0; break; @@ -519,9 +519,9 @@ int tcp_exec_l5_rules(struct session *sess) break; } else if (rule->action == ACT_ACTION_DENY) { - HA_ATOMIC_ADD(&sess->fe->fe_counters.denied_sess, 1); + _HA_ATOMIC_ADD(&sess->fe->fe_counters.denied_sess, 1); if (sess->listener && sess->listener->counters) - HA_ATOMIC_ADD(&sess->listener->counters->denied_sess, 1); + _HA_ATOMIC_ADD(&sess->listener->counters->denied_sess, 1); result = 0; break;