*/
#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"
#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_;
// 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) );
+void simple (CuTest* tc) {
+
+#ifdef TEST_STRING_KEYS
+ map_t *map = map_alloc(map_type_, &DATATYPE_NSTRING);
+ nstring_t *k1 = ns_alloc(3); strcpy(k1->data, "k1");
+ nstring_t *k2 = ns_alloc(3); strcpy(k1->data, "k2");
+ nstring_t *k3 = ns_alloc(3); strcpy(k1->data, "k3");
+ nstring_t *k4 = ns_alloc(3); strcpy(k1->data, "k4");
+#else
+ map_t *map = map_alloc(map_type_, NULL);
+ void *k1 = (void *)1;
+ void *k2 = (void *)2;
+ void *k3 = (void *)3;
+ void *k4 = (void *)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( DOES_NOT_EXIST, map_add (map, k2,20) );
+ ASSERT_EQUAL( 2, map_count (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( 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( DOES_NOT_EXIST, map_remove (map, k1) );
+ ASSERT_EQUAL( 21, map_remove (map, k2) );
+ ASSERT_EQUAL( 0, map_count (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( 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( 40, map_remove (map, k4) );
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_get (map, k4) );
+ ASSERT_EQUAL( 0, map_count (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( 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) );
- map_free(ht);
+ map_free(map);
// In a quiecent state; it is safe to free.
rcu_update();
}
-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 iters = 10000;
SYNC_ADD(wd->wait, -1);
- do { } while (*((volatile worker_data_t *)wd)->wait); // wait for all workers to be ready
+ do { } while (*wd->wait); // wait for all workers to be ready
+
+#ifdef TEST_STRING_KEYS
+ nstring_t *key = ns_alloc(9);
+#else
+ void *key;
+#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 (uint64_t i = d+1; i < iters; i+=2) {
+#ifdef TEST_STRING_KEYS
+ memset(key->data, 0, key->len);
+ snprintf(key->data, key->len, "%llu", i);
+#else
+ key = (void *)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) );
+ CuAssertIntEquals_Msg(tc, (void *)i, DOES_NOT_EXIST, map_add(map, key, d+1) );
rcu_update();
}
- for (int i = d; i < iters; i+=2) {
- char key[10];
- sprintf(key, "k%u", i);
+ for (uint64_t i = d+1; i < iters; i+=2) {
+#ifdef TEST_STRING_KEYS
+ memset(key->data, 0, key->len);
+ snprintf(key->data, key->len, "%llu", i);
+#else
+ key = (void *)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) );
+ CuAssertIntEquals_Msg(tc, (void *)i, d+1, map_remove(map, key) );
rcu_update();
}
}
}
// Do some simple concurrent testing
-void simple_add_remove (CuTest* tc) {
+void add_remove (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("Th:%d Time:%dms\n", 2, ms);
+ fflush(stdout);
+
// In the end, all members should be removed
- ASSERT_EQUAL( 0, map_count(ht) );
+ ASSERT_EQUAL( 0, map_count(map) );
// In a quiecent state; it is safe to free.
- map_free(ht);
+ map_free(map);
}
-
void *inserter_worker (void *arg) {
//pthread_t thread[NUM_THREADS];
- //map_t *ht = map_alloc(MAP_TYPE_HASHTABLE);
+ //map_t *map = map_alloc(map_type_);
return NULL;
}
int main (void) {
nbd_init();
- //lwt_set_trace_level("h0");
+ lwt_set_trace_level("h3");
- map_type_t map_types[] = { MAP_TYPE_LIST, MAP_TYPE_SKIPLIST, MAP_TYPE_HASHTABLE };
+ static const map_impl_t *map_types[] = { &ll_map_impl, &sl_map_impl, &ht_map_impl };
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, simple);
+ SUITE_ADD_TEST(suite, add_remove);
CuSuiteRun(suite);
- CuSuiteSummary(suite, output);
CuSuiteDetails(suite, output);
printf("%s\n", output->buffer);
}
projects / nbds / blobdiff