]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MEDIUM: vars: Use the new _HA_ATOMIC_* macros.
authorOlivier Houchard <ohouchard@haproxy.com>
Fri, 8 Mar 2019 17:55:38 +0000 (18:55 +0100)
committerOlivier Houchard <cognet@ci0.org>
Mon, 11 Mar 2019 16:02:38 +0000 (17:02 +0100)
Use the new _HA_ATOMIC_* macros and add barriers where needed.

src/vars.c

index 0b642683cb031bb56677972d9d8beb6db409f177..477a146328701c37a76c2d63ba26b483bf7e0a4c 100644 (file)
@@ -44,17 +44,17 @@ static void var_accounting_diff(struct vars *vars, struct session *sess, struct
        switch (vars->scope) {
        case SCOPE_REQ:
        case SCOPE_RES:
-               HA_ATOMIC_ADD(&strm->vars_reqres.size, size);
+               _HA_ATOMIC_ADD(&strm->vars_reqres.size, size);
                /* fall through */
        case SCOPE_TXN:
-               HA_ATOMIC_ADD(&strm->vars_txn.size, size);
+               _HA_ATOMIC_ADD(&strm->vars_txn.size, size);
                /* fall through */
        case SCOPE_SESS:
-               HA_ATOMIC_ADD(&sess->vars.size, size);
+               _HA_ATOMIC_ADD(&sess->vars.size, size);
                /* fall through */
        case SCOPE_PROC:
-               HA_ATOMIC_ADD(&global.vars.size, size);
-               HA_ATOMIC_ADD(&var_global_size, size);
+               _HA_ATOMIC_ADD(&global.vars.size, size);
+               _HA_ATOMIC_ADD(&var_global_size, size);
        }
 }
 
@@ -140,9 +140,9 @@ void vars_prune_per_sess(struct vars *vars)
        }
        HA_RWLOCK_WRUNLOCK(VARS_LOCK, &vars->rwlock);
 
-       HA_ATOMIC_SUB(&vars->size, size);
-       HA_ATOMIC_SUB(&global.vars.size, size);
-       HA_ATOMIC_SUB(&var_global_size, size);
+       _HA_ATOMIC_SUB(&vars->size, size);
+       _HA_ATOMIC_SUB(&global.vars.size, size);
+       _HA_ATOMIC_SUB(&var_global_size, size);
 }
 
 /* This function init a list of variabes. */