commit dc72fbb8e8cb895572c51389e1f8882be0fa89af
author Willy Tarreau <w@1wt.eu> Wed Sep 08 15:19:57 2021 +0200
committer Willy Tarreau <w@1wt.eu> Wed Sep 08 15:19:57 2021 +0200
tree 52c6b3f3f34e2b8fb8c6130cf07db56a8e5858f0
parent 3f120d2a583721dd7e6fc9b28d849d8594eebc90

MINOR: vars: centralize the lock/unlock into static inlines

The goal it to simplify the variables locking in order to later
simplify it.

include/haproxy/vars.h

diff --git a/include/haproxy/vars.h b/include/haproxy/vars.h
index bc27e37..30e6fe0 100644
--- a/include/haproxy/vars.h
+++ b/include/haproxy/vars.h
@@ -41,4 +41,28 @@
 int vars_get_by_desc(const struct var_desc *var_desc, struct sample *smp, const struct buffer *def);
 int vars_check_arg(struct arg *arg, char **err);
 
+/* locks the <vars> for writes */
+static inline void vars_wrlock(struct vars *vars)
+{
+	HA_RWLOCK_WRLOCK(VARS_LOCK, &vars->rwlock);
+}
+
+/* unlocks the <vars> for writes */
+static inline void vars_wrunlock(struct vars *vars)
+{
+	HA_RWLOCK_WRUNLOCK(VARS_LOCK, &vars->rwlock);
+}
+
+/* locks the <vars> for reads */
+static inline void vars_rdlock(struct vars *vars)
+{
+	HA_RWLOCK_RDLOCK(VARS_LOCK, &vars->rwlock);
+}
+
+/* unlocks the <vars> for reads */
+static inline void vars_rdunlock(struct vars *vars)
+{
+	HA_RWLOCK_RDUNLOCK(VARS_LOCK, &vars->rwlock);
+}
+
 #endif

src/vars.c

diff --git a/src/vars.c b/src/vars.c
index df76d98..0eaa4c9 100644
--- a/src/vars.c
+++ b/src/vars.c
@@ -168,11 +168,11 @@
 	struct var *var, *tmp;
 	unsigned int size = 0;
 
-	HA_RWLOCK_WRLOCK(VARS_LOCK, &vars->rwlock);
+	vars_wrlock(vars);
 	list_for_each_entry_safe(var, tmp, &vars->head, l) {
 		size += var_clear(var, 1);
 	}
-	HA_RWLOCK_WRUNLOCK(VARS_LOCK, &vars->rwlock);
+	vars_wrunlock(vars);
 	var_accounting_diff(vars, sess, strm, -size);
 }
 
@@ -184,11 +184,11 @@
 	struct var *var, *tmp;
 	unsigned int size = 0;
 
-	HA_RWLOCK_WRLOCK(VARS_LOCK, &vars->rwlock);
+	vars_wrlock(vars);
 	list_for_each_entry_safe(var, tmp, &vars->head, l) {
 		size += var_clear(var, 1);
 	}
-	HA_RWLOCK_WRUNLOCK(VARS_LOCK, &vars->rwlock);
+	vars_wrunlock(vars);
 
 	_HA_ATOMIC_SUB(&vars->size, size);
 	_HA_ATOMIC_SUB(&proc_vars.size, size);
@@ -321,7 +321,7 @@
 	if (!vars || vars->scope != scope)
 		return 0;
 
-	HA_RWLOCK_WRLOCK(VARS_LOCK, &vars->rwlock);
+	vars_wrlock(vars);
 
 	/* Look for existing variable name. */
 	var = var_get(vars, name_hash);
@@ -422,7 +422,7 @@
 	/* OK, now done */
 	ret = 1;
  unlock:
-	HA_RWLOCK_WRUNLOCK(VARS_LOCK, &vars->rwlock);
+	vars_wrunlock(vars);
 	return ret;
 }
 
@@ -441,13 +441,13 @@
 		return 0;
 
 	/* Look for existing variable name. */
-	HA_RWLOCK_WRLOCK(VARS_LOCK, &vars->rwlock);
+	vars_wrlock(vars);
 	var = var_get(vars, name_hash);
 	if (var) {
 		size = var_clear(var, 0);
 		var_accounting_diff(vars, smp->sess, smp->strm, -size);
 	}
-	HA_RWLOCK_WRUNLOCK(VARS_LOCK, &vars->rwlock);
+	vars_wrunlock(vars);
 	return 1;
 }
 
@@ -565,11 +565,11 @@
 	struct var *var;
 
 	/* Get the variable entry. */
-	HA_RWLOCK_RDLOCK(VARS_LOCK, &vars->rwlock);
+	vars_rdlock(vars);
 	var = var_get(vars, name_hash);
 	if (!var || !var->data.type) {
 		if (!def) {
-			HA_RWLOCK_RDUNLOCK(VARS_LOCK, &vars->rwlock);
+			vars_rdunlock(vars);
 			return 0;
 		}
 
@@ -583,7 +583,7 @@
 	/* Copy sample. */
 	smp_dup(smp);
 
-	HA_RWLOCK_RDUNLOCK(VARS_LOCK, &vars->rwlock);
+	vars_rdunlock(vars);
 	return 1;
 }