X-Git-Url: http://git.liburcu.org/?p=userspace-rcu.git;a=blobdiff_plain;f=tests%2Ftest_perthreadlock_timing.c;h=e61fe94519c54b423e392465009f6c7252ad1b38;hp=26b642af1cbca9a17b012ea57ac852c360243aa3;hb=f90535ef41a3ddef0c8bcd76a6ecb89f3fd09fc3;hpb=06f22bdbb0c4c4d5db42a2e2dc35818aa61415be

diff --git a/tests/test_perthreadlock_timing.c b/tests/test_perthreadlock_timing.c
index 26b642a..e61fe94 100644
--- a/tests/test_perthreadlock_timing.c
+++ b/tests/test_perthreadlock_timing.c
@@ -29,12 +29,15 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <assert.h>
-#include <sys/syscall.h>
 #include <pthread.h>
 #include <errno.h>
 
 #include <urcu/arch.h>
 
+#ifdef __linux__
+#include <syscall.h>
+#endif
+
 #if defined(_syscall0)
 _syscall0(pid_t, gettid)
 #elif defined(__NR_gettid)
@@ -88,7 +91,8 @@ void *thr_reader(void *arg)
 	long tidx = (long)arg;
 
 	printf("thread_begin %s, thread id : %lx, tid %lu\n",
-			"reader", pthread_self(), (unsigned long)gettid());
+			"reader", (unsigned long) pthread_self(),
+			(unsigned long) gettid());
 	sleep(2);
 
 	time1 = caa_get_cycles();
@@ -105,7 +109,8 @@ void *thr_reader(void *arg)
 
 	sleep(2);
 	printf("thread_end %s, thread id : %lx, tid %lu\n",
-			"reader", pthread_self(), (unsigned long)gettid());
+			"reader", (unsigned long) pthread_self(),
+			(unsigned long) gettid());
 	return ((void*)1);
 
 }
@@ -117,7 +122,8 @@ void *thr_writer(void *arg)
 	cycles_t time1, time2;
 
 	printf("thread_begin %s, thread id : %lx, tid %lu\n",
-			"writer", pthread_self(), (unsigned long)gettid());
+			"writer", (unsigned long) pthread_self(),
+			(unsigned long) gettid());
 	sleep(2);
 
 	for (i = 0; i < OUTER_WRITE_LOOP; i++) {
@@ -137,7 +143,8 @@ void *thr_writer(void *arg)
 	}
 
 	printf("thread_end %s, thread id : %lx, tid %lu\n",
-			"writer", pthread_self(), (unsigned long)gettid());
+			"writer", (unsigned long) pthread_self(),
+			(unsigned long) gettid());
 	return ((void*)2);
 }
 
@@ -157,13 +164,14 @@ int main(int argc, char **argv)
 	num_read = atoi(argv[1]);
 	num_write = atoi(argv[2]);
 
-	reader_time = malloc(sizeof(*reader_time) * num_read);
-	writer_time = malloc(sizeof(*writer_time) * num_write);
-	tid_reader = malloc(sizeof(*tid_reader) * num_read);
-	tid_writer = malloc(sizeof(*tid_writer) * num_write);
+	reader_time = calloc(num_read, sizeof(*reader_time));
+	writer_time = calloc(num_write, sizeof(*writer_time));
+	tid_reader = calloc(num_read, sizeof(*tid_reader));
+	tid_writer = calloc(num_write, sizeof(*tid_writer));
 
 	printf("thread %-6s, thread id : %lx, tid %lu\n",
-			"main", pthread_self(), (unsigned long)gettid());
+			"main", (unsigned long) pthread_self(),
+			(unsigned long) gettid());
 
 	per_thread_lock = malloc(sizeof(struct per_thread_lock) * NR_READ);