X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=test%2Fmap_test1.c;h=f05fa3dea001871492aeb8e75ba166c221c11037;hp=a6a7192b1626fbf06e540e8ff033e6c2aa4c89f8;hb=778b8c8ca708b082a1192acfb114a6751b2ad7c9;hpb=c7c053b290f15b7c8ba4f7327ead5a6fe836ec80 diff --git a/test/map_test1.c b/test/map_test1.c index a6a7192..f05fa3d 100644 --- a/test/map_test1.c +++ b/test/map_test1.c @@ -7,6 +7,7 @@ #include "nstring.h" #include "runtime.h" #include "map.h" +#include "rcu.h" #include "list.h" #include "skiplist.h" #include "hashtable.h" @@ -22,7 +23,7 @@ static map_t *map_; void *worker (void *arg) { // Wait for all the worker threads to be ready. - SYNC_ADD(&wait_, -1); + (void)SYNC_ADD(&wait_, -1); do {} while (wait_); #ifdef TEST_STRING_KEYS @@ -55,8 +56,7 @@ void *worker (void *arg) { } int main (int argc, char **argv) { - nbd_init(); - lwt_set_trace_level("r0m0l3"); + lwt_set_trace_level("r0m3s3"); char* program_name = argv[0]; pthread_t thread[MAX_NUM_THREADS]; @@ -66,7 +66,7 @@ int main (int argc, char **argv) { return -1; } - num_threads_ = 1; + num_threads_ = MAX_NUM_THREADS; if (argc == 2) { errno = 0; @@ -85,7 +85,7 @@ int main (int argc, char **argv) { } } - static const map_impl_t *map_types[] = { &ll_map_impl, &sl_map_impl, &ht_map_impl }; + static const map_impl_t *map_types[] = { &MAP_IMPL_LL, &MAP_IMPL_SL, &MAP_IMPL_HT }; for (int i = 0; i < sizeof(map_types)/sizeof(*map_types); ++i) { #ifdef TEST_STRING_KEYS map_ = map_alloc(map_types[i], &DATATYPE_NSTRING);