commit 6163e0357ed0004ba76f7e121b579eeb68b17e18
author Miroslav Zagorac <mzagorac@haproxy.com> Wed Feb 23 18:15:56 2022 +0100
committer Willy Tarreau <w@1wt.eu> Fri Apr 08 16:31:33 2022 +0200
tree e79fac23a37980dd6ef47f04690c24d1dff1bc8f
parent 220a1ad33b37e6cc473047b5439a13439eecc145

MINOR: opentracing: only takes the variables lock on shared entries

Regarding commit #61ecf2838:
  There's no point taking the variables locks for sess/txn/req/res
  contexts since these ones always run inside the same thread anyway.

This patch must be backported in 2.5.

addons/ot/src/vars.c

diff --git a/addons/ot/src/vars.c b/addons/ot/src/vars.c
index 8769d54..52fc1df 100644
--- a/addons/ot/src/vars.c
+++ b/addons/ot/src/vars.c
@@ -44,10 +44,10 @@
 	if (vars == NULL)
 		return;
 
-	HA_RWLOCK_RDLOCK(VARS_LOCK, &(vars->rwlock));
+	vars_rdlock(vars);
 	list_for_each_entry(var, &(vars->head), l)
 		FLT_OT_DBG(2, "'%s.%s' -> '%.*s'", scope, var->name, (int)var->data.u.str.data, var->data.u.str.area);
-	HA_RWLOCK_RDUNLOCK(VARS_LOCK, &(vars->rwlock));
+	vars_rdunlock(vars);
 }
 
 
@@ -361,7 +361,7 @@
 
 	retval = 0;
 
-	HA_RWLOCK_WRLOCK(VARS_LOCK, &(vars->rwlock));
+	vars_wrlock(vars);
 	list_for_each_entry_safe(var, var_back, &(vars->head), l) {
 		FLT_OT_DBG(3, "variable cmp '%s' '%s' %d", var_prefix, var->name, var_prefix_len);
 
@@ -384,7 +384,7 @@
 			retval++;
 		}
 	}
-	HA_RWLOCK_WRUNLOCK(VARS_LOCK, &(vars->rwlock));
+	vars_wrunlock(vars);
 
 	FLT_OT_RETURN(retval);
 }
@@ -425,7 +425,7 @@
 	if (rc == -1)
 		FLT_OT_RETURN(retptr);
 
-	HA_RWLOCK_RDLOCK(VARS_LOCK, &(vars->rwlock));
+	vars_rdlock(vars);
 	list_for_each_entry(var, &(vars->head), l) {
 		FLT_OT_DBG(3, "variable cmp '%s' '%s' %d", var_name, var->name, rc);
 
@@ -479,7 +479,7 @@
 			}
 		}
 	}
-	HA_RWLOCK_RDUNLOCK(VARS_LOCK, &(vars->rwlock));
+	vars_rdunlock(vars);
 
 	ot_text_map_show(retptr);