X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Frcutorture.h;h=5ba3d2b0e85312318a3e849a1d98c6050faedbf4;hp=b42b8ab7c828a52fd06ed9ddc187e498b3589d30;hb=6d5c0ca90ae4e999cdf4366ff615a6c619e7257e;hpb=b57aee663af988b7f686c076ce6aef2a0d2487c8

diff --git a/tests/rcutorture.h b/tests/rcutorture.h
index b42b8ab..5ba3d2b 100644
--- a/tests/rcutorture.h
+++ b/tests/rcutorture.h
@@ -66,7 +66,6 @@
  */
 
 #include <stdlib.h>
-#include "../urcu-call-rcu.h"
 
 DEFINE_PER_THREAD(long long, n_reads_pt);
 DEFINE_PER_THREAD(long long, n_updates_pt);
@@ -80,7 +79,8 @@ char argsbuf[64];
 #define GOFLAG_RUN  1
 #define GOFLAG_STOP 2
 
-int goflag __attribute__((__aligned__(CAA_CACHE_LINE_SIZE))) = GOFLAG_INIT;
+volatile int goflag __attribute__((__aligned__(CAA_CACHE_LINE_SIZE)))
+        = GOFLAG_INIT;
 
 #define RCU_READ_RUN 1000
 
@@ -119,6 +119,7 @@ int goflag __attribute__((__aligned__(CAA_CACHE_LINE_SIZE))) = GOFLAG_INIT;
 
 void *rcu_read_perf_test(void *arg)
 {
+	struct call_rcu_data *crdp;
 	int i;
 	int me = (long)arg;
 	long long n_reads_local = 0;
@@ -141,6 +142,9 @@ void *rcu_read_perf_test(void *arg)
 	}
 	__get_thread_var(n_reads_pt) += n_reads_local;
 	put_thread_offline();
+	crdp = get_thread_call_rcu_data();
+	set_thread_call_rcu_data(NULL);
+	call_rcu_data_free(crdp);
 	rcu_unregister_thread();
 
 	return (NULL);
@@ -153,7 +157,7 @@ void *rcu_update_perf_test(void *arg)
 	if ((random() & 0xf00) == 0) {
 		struct call_rcu_data *crdp;
 
-		crdp = create_call_rcu_data(0);
+		crdp = create_call_rcu_data(0, -1);
 		if (crdp != NULL) {
 			fprintf(stderr,
 				"Using per-thread call_rcu() worker.\n");
@@ -204,6 +208,10 @@ void perftestrun(int nthreads, int nreaders, int nupdaters)
 	        (double)n_reads),
 	       ((duration * 1000*1000*1000.*(double)nupdaters) /
 	        (double)n_updates));
+	if (get_cpu_call_rcu_data(0)) {
+		fprintf(stderr, "Deallocating per-CPU call_rcu threads.\n");
+		free_all_cpu_call_rcu_data();
+	}
 	exit(0);
 }
 
@@ -378,7 +386,7 @@ void *rcu_fake_update_stress_test(void *arg)
 	if ((random() & 0xf00) == 0) {
 		struct call_rcu_data *crdp;
 
-		crdp = create_call_rcu_data(0);
+		crdp = create_call_rcu_data(0, -1);
 		if (crdp != NULL) {
 			fprintf(stderr,
 				"Using per-thread call_rcu() worker.\n");
@@ -436,6 +444,10 @@ void stresstest(int nreaders)
 		printf(" %lld", sum);
 	}
 	printf("\n");
+	if (get_cpu_call_rcu_data(0)) {
+		fprintf(stderr, "Deallocating per-CPU call_rcu threads.\n");
+		free_all_cpu_call_rcu_data();
+	}
 	exit(0);
 }