X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2Ftest_urcu_qsbr_gc.c;h=2a9677cda8c65526f7d5497341ec746b482d4432;hb=6278a922c993b7e2a2ed4e0e3e75fb642271f3ba;hp=0b01f229e3e911782e0d63fa04e1134bea63659f;hpb=2d72fae24ceebe2efa486b5bad421f39917ec0a6;p=userspace-rcu.git

diff --git a/tests/test_urcu_qsbr_gc.c b/tests/test_urcu_qsbr_gc.c
index 0b01f22..2a9677c 100644
--- a/tests/test_urcu_qsbr_gc.c
+++ b/tests/test_urcu_qsbr_gc.c
@@ -31,11 +31,11 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <assert.h>
-#include <sched.h>
 #include <errno.h>
 
 #include <urcu/arch.h>
 #include <urcu/tls-compat.h>
+#include "cpuset.h"
 
 #ifdef __linux__
 #include <syscall.h>
@@ -109,12 +109,6 @@ static int use_affinity = 0;
 
 pthread_mutex_t affinity_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-#ifndef HAVE_CPU_SET_T
-typedef unsigned long cpu_set_t;
-# define CPU_ZERO(cpuset) do { *(cpuset) = 0; } while(0)
-# define CPU_SET(cpu, cpuset) do { *(cpuset) |= (1UL << (cpu)); } while(0)
-#endif
-
 static void set_affinity(void)
 {
 	cpu_set_t mask;
@@ -422,11 +416,11 @@ int main(int argc, char **argv)
 			"main", (unsigned long) pthread_self(),
 			(unsigned long) gettid());
 
-	tid_reader = malloc(sizeof(*tid_reader) * nr_readers);
-	tid_writer = malloc(sizeof(*tid_writer) * nr_writers);
-	count_reader = malloc(sizeof(*count_reader) * nr_readers);
-	tot_nr_writes = malloc(sizeof(*tot_nr_writes) * nr_writers);
-	pending_reclaims = malloc(sizeof(*pending_reclaims) * nr_writers);
+	tid_reader = calloc(nr_readers, sizeof(*tid_reader));
+	tid_writer = calloc(nr_writers, sizeof(*tid_writer));
+	count_reader = calloc(nr_readers, sizeof(*count_reader));
+	tot_nr_writes = calloc(nr_writers, sizeof(*tot_nr_writes));
+	pending_reclaims = calloc(nr_writers, sizeof(*pending_reclaims));
 	if (reclaim_batch * sizeof(*pending_reclaims[i].queue)
 			< CAA_CACHE_LINE_SIZE)
 		for (i = 0; i < nr_writers; i++)