X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Ftest_rwlock_timing.c;h=69a8850fafa48b1d7ed80c525f4ae11b86bf0cfc;hb=2819ef641bb6e2f7aa60c28f3a8f5ad252aa7d00;hp=628bed459af61e38afada3626e2b05e8dd659ab6;hpb=bc2433a9853a945a825c244e9ccfe341b73b2ceb;p=userspace-rcu.git

diff --git a/tests/test_rwlock_timing.c b/tests/test_rwlock_timing.c
index 628bed4..69a8850 100644
--- a/tests/test_rwlock_timing.c
+++ b/tests/test_rwlock_timing.c
@@ -87,7 +87,8 @@ void *thr_reader(void *arg)
 	cycles_t time1, time2;
 
 	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();
@@ -104,7 +105,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);
 
 }
@@ -115,7 +117,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++) {
@@ -131,7 +134,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);
 }
 
@@ -151,13 +155,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());
 
 	for (i = 0; i < NR_READ; i++) {
 		err = pthread_create(&tid_reader[i], NULL, thr_reader,