/*
* Written by Josh Dybnis and released to the public domain, as explained at
* http://creativecommons.org/licenses/publicdomain
+ *
+ * tests ported from high-scale-lib
+ * http://sourceforge.net/projects/high-scale-lib
*/
#include <stdio.h>
#include <pthread.h>
-#include "runtime.h"
+#include <sys/time.h>
+
#include "CuTest.h"
+
#include "common.h"
+#include "runtime.h"
+#include "nstring.h"
#include "map.h"
-#include "mem.h"
+#include "list.h"
+#include "skiplist.h"
+#include "hashtable.h"
#include "lwt.h"
+#include "mem.h"
+#include "rcu.h"
#define ASSERT_EQUAL(x, y) CuAssertIntEquals(tc, x, y)
+//#define TEST_STRING_KEYS
+
typedef struct worker_data {
int id;
CuTest *tc;
- map_t *ht;
- int *wait;
+ map_t *map;
+ volatile int *wait;
} worker_data_t;
-static map_type_t map_type_;
+static const map_impl_t *map_type_;
+
+static size_t iterator_size (map_t *map) {
+ map_iter_t *iter = map_iter_begin(map, 0);
+ size_t count = 0;
+ while (map_iter_next(iter, NULL) != DOES_NOT_EXIST) {
+ count++;
+ }
+ map_iter_free(iter);
+ return count;
+}
// Test some basic stuff; add a few keys, remove a few keys
void basic_test (CuTest* tc) {
- map_t *ht = map_alloc(map_type_);
-
- ASSERT_EQUAL( 0, map_count(ht) );
- ASSERT_EQUAL( DOES_NOT_EXIST, map_add(ht,"a",2,10) );
- ASSERT_EQUAL( 1, map_count(ht) );
- ASSERT_EQUAL( DOES_NOT_EXIST, map_add(ht,"b",2,20) );
- ASSERT_EQUAL( 2, map_count(ht) );
- ASSERT_EQUAL( 20, map_get(ht,"b",2) );
- ASSERT_EQUAL( 10, map_set(ht,"a",2,11) );
- ASSERT_EQUAL( 20, map_set(ht,"b",2,21) );
- ASSERT_EQUAL( 2, map_count(ht) );
- ASSERT_EQUAL( 21, map_add(ht,"b",2,22) );
- ASSERT_EQUAL( 11, map_remove(ht,"a",2) );
- ASSERT_EQUAL( DOES_NOT_EXIST, map_get(ht,"a",2) );
- ASSERT_EQUAL( 1, map_count(ht) );
- ASSERT_EQUAL( DOES_NOT_EXIST, map_remove(ht,"a",2) );
- ASSERT_EQUAL( 21, map_remove(ht,"b",2) );
- ASSERT_EQUAL( 0, map_count(ht) );
- ASSERT_EQUAL( DOES_NOT_EXIST, map_remove(ht,"b",2) );
- ASSERT_EQUAL( DOES_NOT_EXIST, map_remove(ht,"c",2) );
- ASSERT_EQUAL( 0, map_count(ht) );
+#ifdef TEST_STRING_KEYS
+ map_t *map = map_alloc(map_type_, &DATATYPE_NSTRING);
+ nstring_t *s1 = ns_alloc(3); strcpy(s1->data, "k1");
+ nstring_t *s2 = ns_alloc(3); strcpy(s2->data, "k2");
+ nstring_t *s3 = ns_alloc(3); strcpy(s3->data, "k3");
+ nstring_t *s4 = ns_alloc(3); strcpy(s4->data, "k4");
+ map_key_t k1 = (map_key_t)s1;
+ map_key_t k2 = (map_key_t)s2;
+ map_key_t k3 = (map_key_t)s3;
+ map_key_t k4 = (map_key_t)s4;
+#else
+ map_t *map = map_alloc(map_type_, NULL);
+ map_key_t k1 = (map_key_t)1;
+ map_key_t k2 = (map_key_t)2;
+ map_key_t k3 = (map_key_t)3;
+ map_key_t k4 = (map_key_t)4;
+#endif
+
+ ASSERT_EQUAL( 0, map_count (map) );
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_add (map, k1,10) );
+ ASSERT_EQUAL( 1, map_count (map) );
+ ASSERT_EQUAL( 1, iterator_size(map) );
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_add (map, k2,20) );
+ ASSERT_EQUAL( 2, map_count (map) );
+ ASSERT_EQUAL( 2, iterator_size(map) );
+ ASSERT_EQUAL( 20, map_get (map, k2) );
+ ASSERT_EQUAL( 10, map_set (map, k1,11) );
+ ASSERT_EQUAL( 20, map_set (map, k2,21) );
+ ASSERT_EQUAL( 2, map_count (map) );
+ ASSERT_EQUAL( 2, iterator_size(map) );
+ ASSERT_EQUAL( 21, map_add (map, k2,22) );
+ ASSERT_EQUAL( 11, map_remove (map, k1) );
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_get (map, k1) );
+ ASSERT_EQUAL( 1, map_count (map) );
+ ASSERT_EQUAL( 1, iterator_size(map) );
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_remove (map, k1) );
+ ASSERT_EQUAL( 21, map_remove (map, k2) );
+ ASSERT_EQUAL( 0, map_count (map) );
+ ASSERT_EQUAL( 0, iterator_size(map) );
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_remove (map, k2) );
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_remove (map, k3) );
+ ASSERT_EQUAL( 0, map_count (map) );
+ ASSERT_EQUAL( 0, iterator_size(map) );
- ASSERT_EQUAL( DOES_NOT_EXIST, map_add(ht,"d",2,40) );
- ASSERT_EQUAL( 40, map_get(ht,"d",2) );
- ASSERT_EQUAL( 1, map_count(ht) );
- ASSERT_EQUAL( 40, map_remove(ht,"d",2) );
- ASSERT_EQUAL( DOES_NOT_EXIST, map_get(ht,"d",2) );
- ASSERT_EQUAL( 0, map_count(ht) );
-
- ASSERT_EQUAL( DOES_NOT_EXIST, map_replace(ht,"d",2,10) );
- ASSERT_EQUAL( DOES_NOT_EXIST, map_get(ht,"d",2) );
- ASSERT_EQUAL( DOES_NOT_EXIST, map_set(ht,"d",2,40) );
- ASSERT_EQUAL( 40, map_replace(ht,"d",2,41) );
- ASSERT_EQUAL( 41, map_get(ht,"d",2) );
- ASSERT_EQUAL( 41, map_remove(ht,"d",2) );
- ASSERT_EQUAL( DOES_NOT_EXIST, map_get(ht,"d",2) );
- ASSERT_EQUAL( 0, map_count(ht) );
-
- ASSERT_EQUAL( DOES_NOT_EXIST, map_replace(ht,"b",2,20) );
- ASSERT_EQUAL( DOES_NOT_EXIST, map_get(ht,"b",2) );
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_add (map, k4,40) );
+ ASSERT_EQUAL( 40, map_get (map, k4) );
+ ASSERT_EQUAL( 1, map_count (map) );
+ ASSERT_EQUAL( 1, iterator_size(map) );
+ ASSERT_EQUAL( 40, map_remove (map, k4) );
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_get (map, k4) );
+ ASSERT_EQUAL( 0, map_count (map) );
+ ASSERT_EQUAL( 0, iterator_size(map) );
+
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_replace(map, k4,10) );
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_get (map, k4) );
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_set (map, k4,40) );
+ ASSERT_EQUAL( 40, map_replace(map, k4,41) );
+ ASSERT_EQUAL( 41, map_get (map, k4) );
+ ASSERT_EQUAL( 41, map_remove (map, k4) );
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_get (map, k4) );
+ ASSERT_EQUAL( 0, map_count (map) );
+ ASSERT_EQUAL( 0, iterator_size(map) );
+
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_replace(map, k2,20) );
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_get (map, k2) );
// In the end, all entries should be removed
- ASSERT_EQUAL( DOES_NOT_EXIST, map_set(ht,"b",2,20) );
- ASSERT_EQUAL( 20, map_replace(ht,"b",2,21) );
- ASSERT_EQUAL( 21, map_get(ht,"b",2) );
- ASSERT_EQUAL( 21, map_remove(ht,"b",2) );
- ASSERT_EQUAL( DOES_NOT_EXIST, map_get(ht,"b",2) );
- ASSERT_EQUAL( 0, map_count(ht) );
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_set (map, k2,20) );
+ ASSERT_EQUAL( 20, map_replace(map, k2,21) );
+ ASSERT_EQUAL( 21, map_get (map, k2) );
+ ASSERT_EQUAL( 21, map_remove (map, k2) );
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_get (map, k2) );
+ ASSERT_EQUAL( 0, map_count (map) );
+ ASSERT_EQUAL( 0, iterator_size(map) );
- map_free(ht);
+ map_free(map);
- // In a quiecent state; it is safe to free.
- rcu_update();
+ rcu_update(); // In a quiecent state.
+#ifdef TEST_STRING_KEYS
+ nbd_free(s1); nbd_free(s2); nbd_free(s3); nbd_free(s4);
+#endif
}
-void *simple_worker (void *arg) {
+void *add_remove_worker (void *arg) {
worker_data_t *wd = (worker_data_t *)arg;
- map_t *ht = wd->ht;
+ map_t *map = wd->map;
CuTest* tc = wd->tc;
- uint64_t d = wd->id;
- int iters = map_type_ == MAP_TYPE_LIST ? 100 : 1000000;
+ int d = wd->id;
+ int iters = (map_type_ == &MAP_IMPL_LL ? 10000 : 100000);
- SYNC_ADD(wd->wait, -1);
- do { } while (*((volatile worker_data_t *)wd)->wait); // wait for all workers to be ready
+ (void)SYNC_ADD(wd->wait, -1);
+ do { } while (*wd->wait); // wait for all workers to be ready
+
+ map_key_t key;
+#ifdef TEST_STRING_KEYS
+ nstring_t *s = ns_alloc(9);
+ key = (map_key_t)s;
+#endif
for (int j = 0; j < 10; ++j) {
- for (int i = d; i < iters; i+=2) {
- char key[10];
- sprintf(key, "k%u", i);
+ for (int i = d+1; i < iters; i+=2) {
+#ifdef TEST_STRING_KEYS
+ s->len = 1 + snprintf(s->data, 9, "%u", i);
+#else
+ key = (map_key_t)i;
+#endif
TRACE("t0", "test map_add() iteration (%llu, %llu)", j, i);
- CuAssertIntEquals_Msg(tc, key, DOES_NOT_EXIST, map_add(ht, key, strlen(key)+1, d+1) );
- rcu_update();
+ ASSERT_EQUAL(DOES_NOT_EXIST, map_add(map, key, d+1) );
+ rcu_update(); // In a quiecent state.
}
- for (int i = d; i < iters; i+=2) {
- char key[10];
- sprintf(key, "k%u", i);
+ for (int i = d+1; i < iters; i+=2) {
+#ifdef TEST_STRING_KEYS
+ s->len = 1 + snprintf(s->data, 9, "%u", i);
+#else
+ key = (map_key_t)i;
+#endif
TRACE("t0", "test map_remove() iteration (%llu, %llu)", j, i);
- CuAssertIntEquals_Msg(tc, key, d+1, map_remove(ht, key, strlen(key)+1) );
- rcu_update();
+ ASSERT_EQUAL(d+1, map_remove(map, key) );
+ rcu_update(); // In a quiecent state.
}
}
+#ifdef TEST_STRING_KEYS
+ nbd_free(s);
+#endif
return NULL;
}
// Do some simple concurrent testing
-void simple_add_remove (CuTest* tc) {
+void concurrent_add_remove_test (CuTest* tc) {
pthread_t thread[2];
worker_data_t wd[2];
- int wait = 2;
- map_t *ht = map_alloc(map_type_);
+ volatile int wait = 2;
+#ifdef TEST_STRING_KEYS
+ map_t *map = map_alloc(map_type_, &DATATYPE_NSTRING);
+#else
+ map_t *map = map_alloc(map_type_, NULL);
+#endif
+
+ struct timeval tv1, tv2;
+ gettimeofday(&tv1, NULL);
// In 2 threads, add & remove even & odd elements concurrently
int i;
for (i = 0; i < 2; ++i) {
wd[i].id = i;
wd[i].tc = tc;
- wd[i].ht = ht;
+ wd[i].map = map;
wd[i].wait = &wait;
- int rc = nbd_thread_create(thread + i, i, simple_worker, wd + i);
+ int rc = nbd_thread_create(thread + i, i, add_remove_worker, wd + i);
if (rc != 0) { perror("nbd_thread_create"); return; }
}
+
for (i = 0; i < 2; ++i) {
pthread_join(thread[i], NULL);
}
+ gettimeofday(&tv2, NULL);
+ int ms = (int)(1000000*(tv2.tv_sec - tv1.tv_sec) + tv2.tv_usec - tv1.tv_usec) / 1000;
+ map_print(map);
+ printf("Time:%dms\n", ms);
+ fflush(stdout);
+
// In the end, all members should be removed
- ASSERT_EQUAL( 0, map_count(ht) );
+ ASSERT_EQUAL( 0, map_count(map) );
+ ASSERT_EQUAL( 0, iterator_size(map) );
// In a quiecent state; it is safe to free.
- map_free(ht);
+ map_free(map);
}
+void basic_iteration_test (CuTest* tc) {
+#ifdef TEST_STRING_KEYS
+ map_t *map = map_alloc(map_type_, &DATATYPE_NSTRING);
+ nstring_t *s1 = ns_alloc(3); strcpy(s1->data, "k1");
+ nstring_t *s2 = ns_alloc(3); strcpy(s2->data, "k2");
+ map_key_t k1 = (map_key_t)s1;
+ map_key_t k2 = (map_key_t)s2;
+ nstring_t *x_k;
+ nstring_t *y_k;
+#else
+ map_t *map = map_alloc(map_type_, NULL);
+ map_key_t k1 = (map_key_t)1;
+ map_key_t k2 = (map_key_t)2;
+ map_key_t x_k;
+ map_key_t y_k;
+#endif
-void *inserter_worker (void *arg) {
- //pthread_t thread[NUM_THREADS];
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_add (map, k1,1) );
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_add (map, k2,2) );
- //map_t *ht = map_alloc(MAP_TYPE_HASHTABLE);
- return NULL;
+ map_val_t x_v, y_v;
+ map_iter_t *iter = map_iter_begin(map, 0);
+ x_v = map_iter_next(iter, (map_key_t *)&x_k);
+ y_v = map_iter_next(iter, (map_key_t *)&y_k);
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_iter_next(iter, NULL) );
+ map_iter_free(iter);
+#ifdef TEST_STRING_KEYS
+ ASSERT_EQUAL( TRUE, (ns_cmp(x_k, s1) == 0 && x_v == 1) || (ns_cmp(y_k, s1) == 0 && y_v == 1) );
+ ASSERT_EQUAL( TRUE, (ns_cmp(x_k, s2) == 0 && x_v == 2) || (ns_cmp(y_k, s2) == 0 && y_v == 2) );
+ nbd_free(s1);
+ nbd_free(s2);
+#else
+ ASSERT_EQUAL( TRUE, (x_k == k1 && x_v == 1) || (y_k == k1 && y_v == 1) );
+ ASSERT_EQUAL( TRUE, (x_k == k2 && x_v == 2) || (y_k == k2 && y_v == 2) );
+#endif
+
+ map_free(map);
}
-// Concurrent insertion
-void concurrent_insert (CuTest* tc) {
+void big_iteration_test (CuTest* tc) {
+ static const int n = 10000;
+
+#ifdef TEST_STRING_KEYS
+ map_t *map = map_alloc(map_type_, &DATATYPE_NSTRING);
+ nstring_t *s = ns_alloc(9);
+ nstring_t *s3 = ns_alloc(3); strcpy(s3->data, "k3");
+ nstring_t *s4 = ns_alloc(3); strcpy(s4->data, "k4");
+ map_key_t k3 = (map_key_t)s3;
+ map_key_t k4 = (map_key_t)s4;
+ map_key_t key = (map_key_t)s;
+#else
+ map_t *map = map_alloc(map_type_, NULL);
+ map_key_t k3 = (map_key_t)3;
+ map_key_t k4 = (map_key_t)4;
+ map_key_t key;
+#endif
+
+ for (int i = 1; i <= n; ++i) {
+#ifdef TEST_STRING_KEYS
+ s->len = 1 + snprintf(s->data, 9, "k%d", i);
+#else
+ key = (map_key_t)i;
+#endif
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_get(map, key) );
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_set(map, key, i) );
+ ASSERT_EQUAL( i, map_get(map, key) );
+ rcu_update(); // In a quiecent state.
+ }
+
+ ASSERT_EQUAL( n, map_count(map) );
+ ASSERT_EQUAL( n, iterator_size(map) );
+
+ uint64_t sum = 0;
+ map_val_t val;
+ map_iter_t *iter = map_iter_begin(map, 0);
+ while ((val = map_iter_next(iter, NULL)) != DOES_NOT_EXIST) {
+ sum += val;
+ }
+ map_iter_free(iter);
+ ASSERT_EQUAL(n*(n+1)/2, sum);
+ ASSERT_EQUAL(3, map_remove(map, k3));
+ ASSERT_EQUAL(4, map_remove(map, k4));
+ sum = 0;
+ iter = map_iter_begin(map, 0);
+ while ((val = map_iter_next(iter, NULL)) != DOES_NOT_EXIST) {
+ sum += val;
+ }
+ map_iter_free(iter);
+ ASSERT_EQUAL(n*(n+1)/2 - (3+4), sum);
+
+#ifdef TEST_STRING_KEYS
+ nbd_free(s);
+#endif
}
int main (void) {
+ lwt_set_trace_level("r0m3l2t0");
- nbd_init();
- //lwt_set_trace_level("h0");
-
- map_type_t map_types[] = { MAP_TYPE_LIST, MAP_TYPE_SKIPLIST, MAP_TYPE_HASHTABLE };
+ 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) {
map_type_ = map_types[i];
CuString *output = CuStringNew();
CuSuite* suite = CuSuiteNew();
- SUITE_ADD_TEST(suite, basic_test);
- SUITE_ADD_TEST(suite, simple_add_remove);
+ SUITE_ADD_TEST(suite, concurrent_add_remove_test);
+// SUITE_ADD_TEST(suite, basic_test);
+// SUITE_ADD_TEST(suite, basic_iteration_test);
+// SUITE_ADD_TEST(suite, big_iteration_test);
CuSuiteRun(suite);
- CuSuiteSummary(suite, output);
CuSuiteDetails(suite, output);
printf("%s\n", output->buffer);
}