Merge pull request #4497 from opensourcerouting/rcu

RCU support

2 files changed, 22 insertions, 22 deletions

diff --git a/tests/lib/test_atomlist.c b/tests/lib/test_atomlist.c
index 249fff8ed..238ee9539 100644
--- a/tests/lib/test_atomlist.c
+++ b/tests/lib/test_atomlist.c
@@ -253,7 +253,7 @@ static void *thr1func(void *arg)
 	struct testrun *tr;
 
 	for (tr = runs; tr; tr = tr->next) {
-		sv = seqlock_bump(&p->sqlo);
+		sv = seqlock_bump(&p->sqlo) - SEQLOCK_INCR;
 		seqlock_wait(&sqlo, sv);
 
 		tr->func(offset);
@@ -288,14 +288,14 @@ static void run_tr(struct testrun *tr)
 	size_t c = 0, s = 0, n = 0;
 	struct item *item, *prev, dummy;
 
-	printf("[%02u] %35s %s\n", seqlock_cur(&sqlo) >> 1, "", desc);
+	printf("[%02u] %35s %s\n", seqlock_cur(&sqlo) >> 2, "", desc);
 	fflush(stdout);
 
 	if (tr->prefill != NOCLEAR)
 		clear_list(tr->prefill);
 
 	monotime(&tv);
-	sv = seqlock_bump(&sqlo);
+	sv = seqlock_bump(&sqlo) - SEQLOCK_INCR;
 	for (size_t i = 0; i < NTHREADS; i++) {
 		seqlock_wait(&thr[i].sqlo, seqlock_cur(&sqlo));
 		s += thr[i].counter;
@@ -325,7 +325,7 @@ static void run_tr(struct testrun *tr)
 		assert(c == alist_count(&ahead));
 	}
 	printf("\033[1A[%02u] %9"PRId64"us c=%5zu s=%5zu n=%5zu %s\n",
-		sv >> 1, delta, c, s, n, desc);
+		sv >> 2, delta, c, s, n, desc);
 }
 
 #ifdef BASIC_TESTS
@@ -381,7 +381,7 @@ int main(int argc, char **argv)
 	basic_tests();
 
 	seqlock_init(&sqlo);
-	seqlock_acquire_val(&sqlo, 1);
+	seqlock_acquire_val(&sqlo, SEQLOCK_STARTVAL);
 
 	for (i = 0; i < NTHREADS; i++) {
 		seqlock_init(&thr[i].sqlo);
diff --git a/tests/lib/test_seqlock.c b/tests/lib/test_seqlock.c
index 9cc6f8070..639c2bdc2 100644
--- a/tests/lib/test_seqlock.c
+++ b/tests/lib/test_seqlock.c
@@ -66,20 +66,20 @@ static void *thr1func(void *arg)
 	seqlock_wait(&sqlo, 1);
 	writestr("thr1 @1\n");
 
-	seqlock_wait(&sqlo, 3);
-	writestr("thr1 @3\n");
-
 	seqlock_wait(&sqlo, 5);
 	writestr("thr1 @5\n");
 
-	seqlock_wait(&sqlo, 7);
-	writestr("thr1 @7\n");
-
 	seqlock_wait(&sqlo, 9);
 	writestr("thr1 @9\n");
 
-	seqlock_wait(&sqlo, 11);
-	writestr("thr1 @11\n");
+	seqlock_wait(&sqlo, 13);
+	writestr("thr1 @13\n");
+
+	seqlock_wait(&sqlo, 17);
+	writestr("thr1 @17\n");
+
+	seqlock_wait(&sqlo, 21);
+	writestr("thr1 @21\n");
 	return NULL;
 }
 
@@ -95,11 +95,11 @@ int main(int argc, char **argv)
 
 	assert(seqlock_cur(&sqlo) == 1);
 	assert(seqlock_bump(&sqlo) == 1);
-	assert(seqlock_cur(&sqlo) == 3);
-	assert(seqlock_bump(&sqlo) == 3);
+	assert(seqlock_cur(&sqlo) == 5);
 	assert(seqlock_bump(&sqlo) == 5);
-	assert(seqlock_bump(&sqlo) == 7);
-	assert(seqlock_cur(&sqlo) == 9);
+	assert(seqlock_bump(&sqlo) == 9);
+	assert(seqlock_bump(&sqlo) == 13);
+	assert(seqlock_cur(&sqlo) == 17);
 
 	assert(seqlock_held(&sqlo));
 	seqlock_release(&sqlo);
@@ -108,16 +108,16 @@ int main(int argc, char **argv)
 	pthread_create(&thr1, NULL, thr1func, NULL);
 	sleep(1);
 
-	writestr("main @3\n");
-	seqlock_acquire_val(&sqlo, 3);
+	writestr("main @5\n");
+	seqlock_acquire_val(&sqlo, 5);
 	sleep(2);
 
-	writestr("main @5\n");
+	writestr("main @9\n");
 	seqlock_bump(&sqlo);
 	sleep(1);
 
-	writestr("main @9\n");
-	seqlock_acquire_val(&sqlo, 9);
+	writestr("main @17\n");
+	seqlock_acquire_val(&sqlo, 17);
 	sleep(1);
 
 	writestr("main @release\n");