From: Willy Tarreau <w@1wt.eu>
Date: Sat, 27 May 2023 18:07:41 +0000 (+0000)
Subject: MINOR: stick-table: better organize the struct stktable
X-Git-Tag: v2.9-dev3~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc10fce9c2d74aace9bc0123e24100634de45e69;p=thirdparty%2Fhaproxy.git

MINOR: stick-table: better organize the struct stktable

The structure currently mixes R/O and R/W fields, let's organize them
by access type, focusing mainly on splitting the updates from the rest
so that peers activity does not affect the rest. For now it doesn't
bring any benefit but it paves the way for splitting the lock.
---

diff --git a/include/haproxy/stick_table-t.h b/include/haproxy/stick_table-t.h
index 55267eecbc..c915edce6c 100644
--- a/include/haproxy/stick_table-t.h
+++ b/include/haproxy/stick_table-t.h
@@ -162,18 +162,10 @@ struct stktable {
 	                           * the same configuration section.
 	                           */
 	struct ebpt_node name;    /* Stick-table are lookup by name here. */
-	struct eb_root keys;      /* head of sticky session tree */
-	struct eb_root exps;      /* head of sticky session expiration tree */
-	struct eb_root updates;   /* head of sticky updates sequence tree */
 	struct pool_head *pool;   /* pool used to allocate sticky sessions */
 	struct task *exp_task;    /* expiration task */
 	struct task *sync_task;   /* sync task */
-	unsigned int update;
-	unsigned int localupdate;
-	unsigned int commitupdate;/* used to identify the latest local updates
-				     pending for sync */
-	unsigned int refcnt;     /* number of local peer over all peers sections
-				    attached to this table */
+
 	uint64_t hash_seed;      /* hash seed used by shards */
 	union {
 		struct peers *p; /* sync peers */
@@ -184,7 +176,6 @@ struct stktable {
 	size_t key_size;          /* size of a key, maximum size in case of string */
 	unsigned int server_key_type; /* What type of key is used to identify servers */
 	unsigned int size;        /* maximum number of sticky sessions in table */
-	unsigned int current;     /* number of sticky sessions currently in table */
 	int nopurge;              /* if non-zero, don't purge sticky sessions when full */
 	int expire;               /* time to live for sticky sessions (milliseconds) */
 	int data_size;            /* the size of the data that is prepended *before* stksess */
@@ -201,7 +192,22 @@ struct stktable {
 		const char *file;     /* The file where the stick-table is declared. */
 		int line;             /* The line in this <file> the stick-table is declared. */
 	} conf;
+
+	THREAD_ALIGN(64);
+
+	struct eb_root keys;      /* head of sticky session tree */
+	struct eb_root exps;      /* head of sticky session expiration tree */
+	unsigned int refcnt;     /* number of local peer over all peers sections
+				    attached to this table */
+	unsigned int current;     /* number of sticky sessions currently in table */
 	__decl_thread(HA_RWLOCK_T lock); /* lock related to the table */
+
+	THREAD_ALIGN(64);
+
+	struct eb_root updates;   /* head of sticky updates sequence tree, uses updt_lock */
+	unsigned int update;      /* uses updt_lock */
+	unsigned int localupdate; /* uses updt_lock */
+	unsigned int commitupdate;/* used to identify the latest local updates pending for sync, uses updt_lock */
 };
 
 extern struct stktable_data_type stktable_data_types[STKTABLE_DATA_TYPES];