X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Fbenchmark%2Ftest_urcu_hash.c;h=2313a88e6ac29bcd91b88a04ba60f80d2fc21e4a;hp=f862adbf92c58d827dfaf0fc1601ebe5a1c4b212;hb=70469b43316ecc8d6053550504858ad8a8ef9b16;hpb=f5ab766ee2c8300cb00ca5878b1cb464f960a66d diff --git a/tests/benchmark/test_urcu_hash.c b/tests/benchmark/test_urcu_hash.c index f862adb..2313a88 100644 --- a/tests/benchmark/test_urcu_hash.c +++ b/tests/benchmark/test_urcu_hash.c @@ -20,7 +20,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _GNU_SOURCE #include "test_urcu_hash.h" enum test_hash { @@ -57,26 +56,31 @@ struct test_hash_cb test_hash_cb[] = { static enum test_hash test_choice = TEST_HASH_RW; +static void (*get_sigusr1_cb(void))(int) { return test_hash_cb[test_choice].sigusr1; } +static void (*get_sigusr2_cb(void))(int) { return test_hash_cb[test_choice].sigusr2; } +static void *(*get_thr_reader_cb(void))(void *) { return test_hash_cb[test_choice].thr_reader; } +static void *(*get_thr_writer_cb(void))(void *) { return test_hash_cb[test_choice].thr_writer; } +static int (*get_populate_hash_cb(void))(void) { return test_hash_cb[test_choice].populate_hash; @@ -158,11 +162,7 @@ void set_affinity(void) } CPU_ZERO(&mask); CPU_SET(cpu, &mask); -#if SCHED_SETAFFINITY_ARGS == 2 - sched_setaffinity(0, &mask); -#else sched_setaffinity(0, sizeof(mask), &mask); -#endif #endif /* HAVE_SCHED_SETAFFINITY */ } @@ -199,7 +199,8 @@ unsigned long test_compare(const void *key1, size_t key1_len, return 1; } -void *thr_count(void *arg) +static +void *thr_count(void *arg __attribute__((unused))) { printf_verbose("thread_begin %s, tid %lu\n", "counter", urcu_get_thread_id()); @@ -264,14 +265,13 @@ void test_delete_all_nodes(struct cds_lfht *ht) printf("deleted %lu nodes.\n", count); } -void show_usage(int argc, char **argv) +static +void show_usage(char **argv) { printf("Usage : %s nr_readers nr_writers duration (s) \n", argv[0]); printf("OPTIONS:\n"); -#ifdef DEBUG_YIELD printf(" [-r] [-w] (yield reader and/or writer)\n"); -#endif printf(" [-d delay] (writer period (us))\n"); printf(" [-c duration] (reader C.S. duration (in loops))\n"); printf(" [-v] (verbose output)\n"); @@ -312,34 +312,35 @@ int main(int argc, char **argv) unsigned long count; long approx_before, approx_after; int i, a, ret, err, mainret = 0; + unsigned int i_thr; struct sigaction act; unsigned int remain; unsigned int nr_readers_created = 0, nr_writers_created = 0; long long nr_leaked; if (argc < 4) { - show_usage(argc, argv); + show_usage(argv); mainret = 1; goto end; } err = sscanf(argv[1], "%u", &nr_readers); if (err != 1) { - show_usage(argc, argv); + show_usage(argv); mainret = 1; goto end; } err = sscanf(argv[2], "%u", &nr_writers); if (err != 1) { - show_usage(argc, argv); + show_usage(argv); mainret = 1; goto end; } - + err = sscanf(argv[3], "%lu", &duration); if (err != 1) { - show_usage(argc, argv); + show_usage(argv); mainret = 1; goto end; } @@ -348,17 +349,15 @@ int main(int argc, char **argv) if (argv[i][0] != '-') continue; switch (argv[i][1]) { -#ifdef DEBUG_YIELD case 'r': - yield_active |= YIELD_READ; + rcu_debug_yield_enable(RCU_YIELD_READ); break; case 'w': - yield_active |= YIELD_WRITE; + rcu_debug_yield_enable(RCU_YIELD_WRITE); break; -#endif case 'a': if (argc < i + 2) { - show_usage(argc, argv); + show_usage(argv); mainret = 1; goto end; } @@ -369,7 +368,7 @@ int main(int argc, char **argv) break; case 'c': if (argc < i + 2) { - show_usage(argc, argv); + show_usage(argv); mainret = 1; goto end; } @@ -377,7 +376,7 @@ int main(int argc, char **argv) break; case 'd': if (argc < i + 2) { - show_usage(argc, argv); + show_usage(argv); mainret = 1; goto end; } @@ -388,7 +387,7 @@ int main(int argc, char **argv) break; case 'h': if (argc < i + 2) { - show_usage(argc, argv); + show_usage(argv); mainret = 1; goto end; } @@ -396,7 +395,7 @@ int main(int argc, char **argv) break; case 'm': if (argc < i + 2) { - show_usage(argc, argv); + show_usage(argv); mainret = 1; goto end; } @@ -404,7 +403,7 @@ int main(int argc, char **argv) break; case 'n': if (argc < i + 2) { - show_usage(argc, argv); + show_usage(argv); mainret = 1; goto end; } @@ -435,7 +434,7 @@ int main(int argc, char **argv) break; case 'B': if (argc < i + 2) { - show_usage(argc, argv); + show_usage(argv); mainret = 1; goto end; } @@ -623,10 +622,10 @@ int main(int argc, char **argv) goto end_close_pipe; } - for (i = 0; i < nr_readers; i++) { - err = pthread_create(&tid_reader[i], + for (i_thr = 0; i_thr < nr_readers; i_thr++) { + err = pthread_create(&tid_reader[i_thr], NULL, get_thr_reader_cb(), - &count_reader[i]); + &count_reader[i_thr]); if (err != 0) { errno = err; mainret = 1; @@ -635,10 +634,10 @@ int main(int argc, char **argv) } nr_readers_created++; } - for (i = 0; i < nr_writers; i++) { - err = pthread_create(&tid_writer[i], + for (i_thr = 0; i_thr < nr_writers; i_thr++) { + err = pthread_create(&tid_writer[i_thr], NULL, get_thr_writer_cb(), - &count_writer[i]); + &count_writer[i_thr]); if (err != 0) { errno = err; mainret = 1; @@ -660,26 +659,26 @@ int main(int argc, char **argv) test_stop = 1; end_pthread_join: - for (i = 0; i < nr_readers_created; i++) { - err = pthread_join(tid_reader[i], &tret); + for (i_thr = 0; i_thr < nr_readers_created; i_thr++) { + err = pthread_join(tid_reader[i_thr], &tret); if (err != 0) { errno = err; mainret = 1; perror("pthread_join"); } - tot_reads += count_reader[i]; + tot_reads += count_reader[i_thr]; } - for (i = 0; i < nr_writers_created; i++) { - err = pthread_join(tid_writer[i], &tret); + for (i_thr = 0; i_thr < nr_writers_created; i_thr++) { + err = pthread_join(tid_writer[i_thr], &tret); if (err != 0) { errno = err; mainret = 1; perror("pthread_join"); } - tot_writes += count_writer[i].update_ops; - tot_add += count_writer[i].add; - tot_add_exist += count_writer[i].add_exist; - tot_remove += count_writer[i].remove; + tot_writes += count_writer[i_thr].update_ops; + tot_add += count_writer[i_thr].add; + tot_add_exist += count_writer[i_thr].add_exist; + tot_remove += count_writer[i_thr].remove; } /* teardown counter thread */ @@ -692,11 +691,11 @@ end_pthread_join: } { char msg[1] = { 0x42 }; - ssize_t ret; + ssize_t sret; do { - ret = write(count_pipe[1], msg, 1); /* wakeup thread */ - } while (ret == -1L && errno == EINTR); + sret = write(count_pipe[1], msg, 1); /* wakeup thread */ + } while (sret == -1L && errno == EINTR); } err = pthread_join(tid_count, &tret); if (err != 0) {