X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Ftest_urcu_defer.c;h=72c598b40a0552f4b60b03ac38c511b417796c9b;hp=233b38498ced552ed04ba753af5974892d89ec2f;hb=b4f313b7ffb3215d54790f303c2ff3e4a41e5919;hpb=804b437535f97b519db3e8715807950f5818cf27

diff --git a/tests/test_urcu_defer.c b/tests/test_urcu_defer.c
index 233b384..72c598b 100644
--- a/tests/test_urcu_defer.c
+++ b/tests/test_urcu_defer.c
@@ -32,11 +32,9 @@
 #include <assert.h>
 #include <sys/syscall.h>
 #include <sched.h>
+#include <errno.h>
 
-#include "../arch.h"
-
-/* Make this big enough to include the POWER5+ L3 cacheline size of 256B */
-#define CACHE_LINE_SIZE 4096
+#include <urcu/arch.h>
 
 /* hardcoded number of CPUs */
 #define NR_CPUS 16384
@@ -61,8 +59,8 @@ static inline pid_t gettid(void)
 #else
 #define debug_yield_read()
 #endif
-#include "../urcu.h"
-#include "../urcu-defer.h"
+#include <urcu.h>
+#include <urcu-defer.h>
 
 struct test_array {
 	int a;
@@ -238,16 +236,14 @@ void *thr_writer(void *data)
 		new = malloc(sizeof(*new));
 		new->a = 8;
 		old = rcu_xchg_pointer(&test_rcu_pointer, new);
-		call_rcu(free, old);
-#if 0
-		call_rcu(test_cb1, old);
-		call_rcu(test_cb1, (void *)-2L);
-		call_rcu(test_cb1, (void *)-2L);
-		call_rcu(test_cb1, old);
-		call_rcu(test_cb2, (void *)-2L);
-#endif //0
-		call_rcu(test_cb2, (void *)-4L);
-		//call_rcu(test_cb2, (void *)-2L);
+		defer_rcu(free, old);
+		defer_rcu(test_cb1, old);
+		defer_rcu(test_cb1, (void *)-2L);
+		defer_rcu(test_cb1, (void *)-2L);
+		defer_rcu(test_cb1, old);
+		defer_rcu(test_cb2, (void *)-2L);
+		defer_rcu(test_cb2, (void *)-4L);
+		defer_rcu(test_cb2, (void *)-2L);
 		nr_writes++;
 		if (unlikely(!test_duration_write()))
 			break;