From: Mathieu Desnoyers Date: Wed, 26 Jun 2013 21:44:08 +0000 (-0400) Subject: rcuja: Use urcu_get_thread_id() X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=5bcf8326b6e13ca93429925bc38fb81c73155c54;p=userspace-rcu.git rcuja: Use urcu_get_thread_id() Signed-off-by: Mathieu Desnoyers --- diff --git a/tests/test_urcu_ja.c b/tests/test_urcu_ja.c index 22c336b..0572527 100644 --- a/tests/test_urcu_ja.c +++ b/tests/test_urcu_ja.c @@ -850,8 +850,8 @@ void *test_ja_rw_thr_reader(void *_count) struct cds_ja_node *ja_node; uint64_t key; - printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n", - "reader", pthread_self(), (unsigned long) gettid()); + printf_verbose("thread_begin %s, tid %lu\n", + "reader", urcu_get_thread_id()); URCU_TLS(rand_lookup) = urcu_get_thread_id() ^ time(NULL); @@ -894,8 +894,8 @@ void *test_ja_rw_thr_reader(void *_count) rcu_unregister_thread(); *count = URCU_TLS(nr_reads); - printf_verbose("thread_end %s, thread id : %lx, tid %lu\n", - "reader", pthread_self(), (unsigned long) gettid()); + printf_verbose("thread_end %s, tid %lu\n", + "reader", urcu_get_thread_id()); printf_verbose("readid : %lx, lookupfail %lu, lookupok %lu\n", pthread_self(), URCU_TLS(lookup_fail), URCU_TLS(lookup_ok)); @@ -915,8 +915,8 @@ void *test_ja_rw_thr_writer(void *_count) uint64_t key; int ret; - printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n", - "writer", pthread_self(), (unsigned long) gettid()); + printf_verbose("thread_begin %s, tid %lu\n", + "writer", urcu_get_thread_id()); URCU_TLS(rand_lookup) = urcu_get_thread_id() ^ time(NULL); @@ -1000,8 +1000,8 @@ void *test_ja_rw_thr_writer(void *_count) rcu_unregister_thread(); - printf_verbose("thread_end %s, thread id : %lx, tid %lu\n", - "writer", pthread_self(), (unsigned long) gettid()); + printf_verbose("thread_end %s, tid %lu\n", + "writer", urcu_get_thread_id()); printf_verbose("info id %lx: nr_add %lu, nr_addexist %lu, nr_del %lu, " "nr_delnoent %lu\n", pthread_self(), URCU_TLS(nr_add), URCU_TLS(nr_addexist), URCU_TLS(nr_del), @@ -1294,8 +1294,8 @@ int main(int argc, char **argv) printf_verbose("Validating lookups.\n"); if (leak_detection) printf_verbose("Memory leak dection activated.\n"); - printf_verbose("thread %-6s, thread id : %lx, tid %lu\n", - "main", pthread_self(), (unsigned long)gettid()); + printf_verbose("thread %-6s, tid %lu\n", + "main", urcu_get_thread_id()); memset(&act, 0, sizeof(act)); ret = sigemptyset(&act.sa_mask); diff --git a/tests/test_urcu_ja_range.c b/tests/test_urcu_ja_range.c index c10becd..93ac706 100644 --- a/tests/test_urcu_ja_range.c +++ b/tests/test_urcu_ja_range.c @@ -197,10 +197,10 @@ void *test_ja_rw_thr_reader(void *_count) struct cds_ja_range *range; uint64_t key; - printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n", - "reader", pthread_self(), (unsigned long) gettid()); + printf_verbose("thread_begin %s, tid %lu\n", + "reader", urcu_get_thread_id()); - URCU_TLS(rand_lookup) = (unsigned int) gettid() ^ time(NULL); + URCU_TLS(rand_lookup) = (unsigned int) urcu_get_thread_id() ^ time(NULL); set_affinity(); @@ -252,10 +252,10 @@ void *test_ja_rw_thr_reader(void *_count) rcu_unregister_thread(); *count = URCU_TLS(nr_reads); - printf_verbose("thread_end %s, thread id : %lx, tid %lu\n", - "reader", pthread_self(), (unsigned long) gettid()); - printf_verbose("readid : %lx, lookupfail %lu, lookupok %lu\n", - pthread_self(), URCU_TLS(lookup_fail), + printf_verbose("thread_end %s, tid %lu\n", + "reader", urcu_get_thread_id()); + printf_verbose("read tid : %lu, lookupfail %lu, lookupok %lu\n", + urcu_get_thread_id(), URCU_TLS(lookup_fail), URCU_TLS(lookup_ok)); return ((void*)1); } @@ -272,10 +272,10 @@ void *test_ja_rw_thr_writer(void *_count) struct wr_count *count = _count; int ret; - printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n", - "writer", pthread_self(), (unsigned long) gettid()); + printf_verbose("thread_begin %s, tid %lu\n", + "writer", urcu_get_thread_id()); - URCU_TLS(rand_lookup) = (unsigned int) gettid() ^ time(NULL); + URCU_TLS(rand_lookup) = (unsigned int) urcu_get_thread_id() ^ time(NULL); set_affinity(); @@ -359,10 +359,11 @@ void *test_ja_rw_thr_writer(void *_count) rcu_unregister_thread(); - printf_verbose("thread_end %s, thread id : %lx, tid %lu\n", - "writer", pthread_self(), (unsigned long) gettid()); - printf_verbose("info id %lx: nr_add %lu, nr_addexist %lu, nr_del %lu, " - "nr_delnoent %lu\n", pthread_self(), URCU_TLS(nr_add), + printf_verbose("thread_end %s, tid %lu\n", + "writer", urcu_get_thread_id()); + printf_verbose("info tid %lu: nr_add %lu, nr_addexist %lu, nr_del %lu, " + "nr_delnoent %lu\n", urcu_get_thread_id(), + URCU_TLS(nr_add), URCU_TLS(nr_addexist), URCU_TLS(nr_del), URCU_TLS(nr_delnoent)); count->update_ops = URCU_TLS(nr_writes); @@ -640,8 +641,8 @@ int main(int argc, char **argv) printf_verbose("Validating lookups.\n"); if (leak_detection) printf_verbose("Memory leak dection activated.\n"); - printf_verbose("thread %-6s, thread id : %lx, tid %lu\n", - "main", pthread_self(), (unsigned long)gettid()); + printf_verbose("thread %-6s, tid %lu\n", + "main", urcu_get_thread_id()); memset(&act, 0, sizeof(act)); ret = sigemptyset(&act.sa_mask);