X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Ftest_mutex.c;h=2f25454bd395df3a0f9aebade45fbe8aba58c193;hp=451ab1c31172ef1922570db4df97e038ba20351c;hb=9aa14175d93952464fa8ec15df54e2656c349c0b;hpb=6ff854acfa013195bdb71dddc654ec76a4c296c9

diff --git a/tests/test_mutex.c b/tests/test_mutex.c
index 451ab1c..2f25454 100644
--- a/tests/test_mutex.c
+++ b/tests/test_mutex.c
@@ -31,34 +31,16 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <assert.h>
-#include <sched.h>
 #include <errno.h>
 
 #include <urcu/arch.h>
 #include <urcu/tls-compat.h>
-
-#ifdef __linux__
-#include <syscall.h>
-#endif
+#include "cpuset.h"
+#include "thread-id.h"
 
 /* hardcoded number of CPUs */
 #define NR_CPUS 16384
 
-#if defined(_syscall0)
-_syscall0(pid_t, gettid)
-#elif defined(__NR_gettid)
-static inline pid_t gettid(void)
-{
-	return syscall(__NR_gettid);
-}
-#else
-#warning "use pid as tid"
-static inline pid_t gettid(void)
-{
-	return getpid();
-}
-#endif
-
 #ifndef DYNAMIC_LINK_TEST
 #define _LGPL_SOURCE
 #else
@@ -106,12 +88,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)
 {
 #if HAVE_SCHED_SETAFFINITY
@@ -195,9 +171,8 @@ void *thr_reader(void *data)
 {
 	unsigned long tidx = (unsigned long)data;
 
-	printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
-			"reader", (unsigned long) pthread_self(),
-			(unsigned long) gettid());
+	printf_verbose("thread_begin %s, tid %lu\n",
+			"reader", urcu_get_thread_id());
 
 	set_affinity();
 
@@ -217,9 +192,8 @@ void *thr_reader(void *data)
 	}
 
 	tot_nr_reads[tidx] = URCU_TLS(nr_reads);
-	printf_verbose("thread_end %s, thread id : %lx, tid %lu\n",
-			"reader", (unsigned long) pthread_self(),
-			(unsigned long) gettid());
+	printf_verbose("thread_end %s, tid %lu\n",
+			"reader", urcu_get_thread_id());
 	return ((void*)1);
 
 }
@@ -228,9 +202,8 @@ void *thr_writer(void *data)
 {
 	unsigned long wtidx = (unsigned long)data;
 
-	printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
-			"writer", (unsigned long) pthread_self(),
-			(unsigned long) gettid());
+	printf_verbose("thread_begin %s, tid %lu\n",
+			"writer", urcu_get_thread_id());
 
 	set_affinity();
 
@@ -253,24 +226,25 @@ void *thr_writer(void *data)
 			loop_sleep(wdelay);
 	}
 
-	printf_verbose("thread_end %s, thread id : %lx, tid %lu\n",
-			"writer", (unsigned long) pthread_self(),
-			(unsigned long) gettid());
+	printf_verbose("thread_end %s, tid %lu\n",
+			"writer", urcu_get_thread_id());
 	tot_nr_writes[wtidx] = URCU_TLS(nr_writes);
 	return ((void*)2);
 }
 
 void show_usage(int argc, char **argv)
 {
-	printf("Usage : %s nr_readers nr_writers duration (s)", argv[0]);
+	printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",
+		argv[0]);
+	printf("OPTIONS:\n");
 #ifdef DEBUG_YIELD
-	printf(" [-r] [-w] (yield reader and/or writer)");
+	printf("	[-r] [-w] (yield reader and/or writer)\n");
 #endif
-	printf(" [-d delay] (writer period (us))");
-	printf(" [-c duration] (reader C.S. duration (in loops))");
-	printf(" [-e duration] (writer C.S. duration (in loops))");
-	printf(" [-v] (verbose output)");
-	printf(" [-a cpu#] [-a cpu#]... (affinity)");
+	printf("	[-d delay] (writer period (us))\n");
+	printf("	[-c duration] (reader C.S. duration (in loops))\n");
+	printf("	[-e duration] (writer C.S. duration (in loops))\n");
+	printf("	[-v] (verbose output)\n");
+	printf("	[-a cpu#] [-a cpu#]... (affinity)\n");
 	printf("\n");
 }
 
@@ -360,16 +334,15 @@ int main(int argc, char **argv)
 		duration, nr_readers, nr_writers);
 	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", (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);
-	count_writer = malloc(sizeof(*count_writer) * nr_writers);
-	tot_nr_reads = malloc(sizeof(*tot_nr_reads) * nr_readers);
-	tot_nr_writes = malloc(sizeof(*tot_nr_writes) * nr_writers);
+	printf_verbose("thread %-6s, tid %lu\n",
+			"main", urcu_get_thread_id());
+
+	tid_reader = calloc(nr_readers, sizeof(*tid_reader));
+	tid_writer = calloc(nr_writers, sizeof(*tid_writer));
+	count_reader = calloc(nr_readers, sizeof(*count_reader));
+	count_writer = calloc(nr_writers, sizeof(*count_writer));
+	tot_nr_reads = calloc(nr_readers, sizeof(*tot_nr_reads));
+	tot_nr_writes = calloc(nr_writers, sizeof(*tot_nr_writes));
 
 	next_aff = 0;