X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=test_qsbr.c;h=6830fe1d2c1c77f144f1f28760bf2a2123cff2c4;hb=65f03794a386588df536051ca4df9fd6e777f372;hp=07ab6c73b291dd7125c754e01325ec05c53222bf;hpb=cda3c71d5a0aca557840ae7744fa1c23ba43944e;p=urcu.git

diff --git a/test_qsbr.c b/test_qsbr.c
index 07ab6c7..6830fe1 100644
--- a/test_qsbr.c
+++ b/test_qsbr.c
@@ -35,6 +35,9 @@
 
 #include "arch.h"
 
+/* Make this big enough to include the POWER5+ L3 cacheline size of 256B */
+#define CACHE_LINE_SIZE 4096
+
 #if defined(_syscall0)
 _syscall0(pid_t, gettid)
 #elif defined(__NR_gettid)
@@ -59,7 +62,7 @@ struct test_array {
 
 static volatile int test_go, test_stop;
 
-static int wdelay;
+static unsigned long wdelay;
 
 static struct test_array *test_rcu_pointer;
 
@@ -231,7 +234,7 @@ void *thr_writer(void *_count)
 		if (unlikely(!test_duration_write()))
 			break;
 		if (unlikely(wdelay))
-			usleep(wdelay);
+			loop_sleep(wdelay);
 	}
 
 	printf_verbose("thread_end %s, thread id : %lx, tid %lu\n",
@@ -317,14 +320,14 @@ int main(int argc, char **argv)
 				show_usage(argc, argv);
 				return -1;
 			}
-			rduration = atoi(argv[++i]);
+			rduration = atol(argv[++i]);
 			break;
 		case 'd':
 			if (argc < i + 2) {
 				show_usage(argc, argv);
 				return -1;
 			}
-			wdelay = atoi(argv[++i]);
+			wdelay = atol(argv[++i]);
 			break;
 		case 'v':
 			verbose_mode = 1;
@@ -334,15 +337,31 @@ int main(int argc, char **argv)
 
 	printf_verbose("running test for %lu seconds, %u readers, %u writers.\n",
 		duration, nr_readers, nr_writers);
-	printf_verbose("Writer delay : %u us.\n", wdelay);
+	printf_verbose("Writer delay : %lu loops.\n", wdelay);
 	printf_verbose("Reader duration : %lu loops.\n", rduration);
 	printf_verbose("thread %-6s, thread id : %lx, tid %lu\n",
 			"main", pthread_self(), (unsigned long)gettid());
 
-	if (use_affinity
-	    && sched_setaffinity(0, sizeof(affinity), &affinity) < 0) {
-		perror("sched_setaffinity");
-		exit(-1);
+	if (use_affinity) {
+		for (i = 0; i < CPU_SETSIZE; i++)
+			if (CPU_ISSET(i, &affinity))
+				printf_verbose("About to set affinity "
+					       "to CPU : %d\n", i);
+
+		if (sched_setaffinity(0, sizeof(affinity), &affinity) < 0) {
+			perror("sched_setaffinity");
+			exit(-1);
+		}
+
+		if (sched_getaffinity(0, sizeof(affinity), &affinity) < 0) {
+			perror("sched_getaffinity");
+			exit(-1);
+		}
+
+		for (i = 0; i < CPU_SETSIZE; i++)
+			if (CPU_ISSET(i, &affinity))
+				printf_verbose("Effectively set affinity "
+					       "to CPU : %d\n", i);
 	}
 
 	test_array = malloc(sizeof(*test_array) * ARRAY_SIZE);
@@ -387,9 +406,9 @@ int main(int argc, char **argv)
 	
 	printf_verbose("total number of reads : %llu, writes %llu\n", tot_reads,
 	       tot_writes);
-	printf("SUMMARY %-15s testdur %4lu nr_readers %3u rdur %6lu "
+	printf("SUMMARY %-25s testdur %4lu nr_readers %3u rdur %6lu "
 		"nr_writers %3u "
-		"wdelay %4u nr_reads %12llu nr_writes %12llu nr_ops %12llu\n",
+		"wdelay %6lu nr_reads %12llu nr_writes %12llu nr_ops %12llu\n",
 		argv[0], duration, nr_readers, rduration,
 		nr_writers, wdelay, tot_reads, tot_writes,
 		tot_reads + tot_writes);