X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Ftest_urcu_hash.c;h=f862adbf92c58d827dfaf0fc1601ebe5a1c4b212;hp=c4c11924549ba1ab5b3ed7332e65610f8e114106;hb=a5bae03d59c22e57263b8610b9fed99738303cf0;hpb=0663713865a25964c2932943c48e59ddf3caecd8 diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c index c4c1192..f862adb 100644 --- a/tests/test_urcu_hash.c +++ b/tests/test_urcu_hash.c @@ -201,9 +201,8 @@ unsigned long test_compare(const void *key1, size_t key1_len, void *thr_count(void *arg) { - printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n", - "counter", (unsigned long) pthread_self(), - (unsigned long) gettid()); + printf_verbose("thread_begin %s, tid %lu\n", + "counter", urcu_get_thread_id()); rcu_register_thread(); @@ -548,26 +547,25 @@ int main(int argc, char **argv) write_pool_offset, write_pool_size); printf_verbose("Number of hash chains: %lu.\n", nr_hash_chains); - printf_verbose("thread %-6s, thread id : %lx, tid %lu\n", - "main", (unsigned long) pthread_self(), - (unsigned long) gettid()); + printf_verbose("thread %-6s, tid %lu\n", + "main", urcu_get_thread_id()); - tid_reader = malloc(sizeof(*tid_reader) * nr_readers); + tid_reader = calloc(nr_readers, sizeof(*tid_reader)); if (!tid_reader) { mainret = 1; goto end; } - tid_writer = malloc(sizeof(*tid_writer) * nr_writers); + tid_writer = calloc(nr_writers, sizeof(*tid_writer)); if (!tid_writer) { mainret = 1; goto end_free_tid_reader; } - count_reader = malloc(sizeof(*count_reader) * nr_readers); + count_reader = calloc(nr_readers, sizeof(*count_reader)); if (!count_reader) { mainret = 1; goto end_free_tid_writer; } - count_writer = malloc(sizeof(*count_writer) * nr_writers); + count_writer = calloc(nr_writers, sizeof(*count_writer)); if (!count_writer) { mainret = 1; goto end_free_count_reader;