commit 85e77c7f0d7cce6cef2158dfdb3cf57871a25444
author Emeric Brun <ebrun@exceliance.fr> Thu Sep 23 18:16:52 2010 +0200
committer Willy Tarreau <w@1wt.eu> Thu Nov 11 09:29:08 2010 +0100
tree 600b2d8b78f7679e5282695ccffb968a1474348d
parent 1e029aa9656cc6a171bead62b68b0c7bdab8a009

[MEDIUM] Create updates tree on stick table to manage sync.

src/stick_table.c

diff --git a/src/stick_table.c b/src/stick_table.c
index bf8df0f..fb75d3f 100644
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -51,6 +51,7 @@
 		return;
 
 	eb32_delete(&ts->exp);
+	eb32_delete(&ts->upd);
 	ebmb_delete(&ts->key);
 	stksess_free(t, ts);
 }
@@ -80,6 +81,7 @@
 	ts->ref_cnt = 0;
 	ts->key.node.leaf_p = NULL;
 	ts->exp.node.leaf_p = NULL;
+	ts->upd.node.leaf_p = NULL;
 	return ts;
 }
 
@@ -137,6 +139,7 @@
 
 		/* session expired, trash it */
 		ebmb_delete(&ts->key);
+		eb32_delete(&ts->upd);
 		stksess_free(t, ts);
 		batched++;
 	}
@@ -204,12 +207,12 @@
 
 	ts = stktable_lookup_key(table, key);
 	if (likely(ts))
-		return stktable_touch(table, ts);
+		return stktable_touch(table, ts, 1);
 
 	/* entry does not exist, initialize a new one */
 	ts = stksess_new(table, key);
 	if (likely(ts))
-		stktable_store(table, ts);
+		stktable_store(table, ts, 1);
 	return ts;
 }
 
@@ -235,13 +238,26 @@
 /* Update the expiration timer for <ts> but do not touch its expiration node.
  * The table's expiration timer is updated if set.
  */
-struct stksess *stktable_touch(struct stktable *t, struct stksess *ts)
+struct stksess *stktable_touch(struct stktable *t, struct stksess *ts, int local)
 {
+	struct eb32_node * eb;
 	ts->expire = tick_add(now_ms, MS_TO_TICKS(t->expire));
 	if (t->expire) {
 		t->exp_task->expire = t->exp_next = tick_first(ts->expire, t->exp_next);
 		task_queue(t->exp_task);
 	}
+
+	if (t->sync_task && local) {
+		ts->upd.key = ++t->update;
+		t->localupdate = t->update;
+		eb32_delete(&ts->upd);
+		eb = eb32_insert(&t->updates, &ts->upd);
+		if (eb != &ts->upd)  {
+			eb32_delete(eb);
+			eb32_insert(&t->updates, &ts->upd);
+		}
+		task_wakeup(t->sync_task, TASK_WOKEN_MSG);
+	}
 	return ts;
 }
 
@@ -249,10 +265,10 @@
  * yet exist (the caller must check this). The table's timeout is updated if it
  * is set. <ts> is returned.
  */
-struct stksess *stktable_store(struct stktable *t, struct stksess *ts)
+struct stksess *stktable_store(struct stktable *t, struct stksess *ts, int local)
 {
 	ebmb_insert(&t->keys, &ts->key, t->key_size);
-	stktable_touch(t, ts);
+	stktable_touch(t, ts, local);
 	ts->exp.key = ts->expire;
 	eb32_insert(&t->exps, &ts->exp);
 	return ts;
@@ -275,10 +291,10 @@
 		ts = stksess_new(table, key);
 		if (!ts)
 			return NULL;
-		stktable_store(table, ts);
+		stktable_store(table, ts, 1);
 	}
 	else
-		stktable_touch(table, ts);
+		stktable_touch(table, ts, 1);
 	return ts;
 }
 
@@ -339,6 +355,7 @@
 
 		/* session expired, trash it */
 		ebmb_delete(&ts->key);
+		eb32_delete(&ts->upd);
 		stksess_free(t, ts);
 	}