3a559a3b3c
------------------------------------------------------------------------ r1601 | sears.russell@gmail.com | 2012-03-20 18:43:00 -0400 (Tue, 20 Mar 2012) | 1 line commit bLSM bloom filter to stasis/util, which is where it really belongs ------------------------------------------------------------------------ r1600 | sears.russell@gmail.com | 2012-03-04 01:58:38 -0500 (Sun, 04 Mar 2012) | 1 line fix memory leak in skiplist unit test (now it is valgrind clean) ------------------------------------------------------------------------ r1599 | sears.russell@gmail.com | 2012-03-04 01:58:05 -0500 (Sun, 04 Mar 2012) | 1 line fix typo in finalize type ------------------------------------------------------------------------ r1598 | sears.russell@gmail.com | 2012-03-04 00:59:59 -0500 (Sun, 04 Mar 2012) | 1 line add comparator and finalizer parameters to skiplist constructor ------------------------------------------------------------------------ r1597 | sears.russell@gmail.com | 2012-03-03 18:23:16 -0500 (Sat, 03 Mar 2012) | 1 line bugfixes for skiplist ------------------------------------------------------------------------ r1596 | sears.russell@gmail.com | 2012-03-02 15:05:07 -0500 (Fri, 02 Mar 2012) | 1 line updated concurrentSkipList. Seeing strange crashes ------------------------------------------------------------------------ r1595 | sears.russell@gmail.com | 2012-03-01 16:51:59 -0500 (Thu, 01 Mar 2012) | 1 line add progress reports ------------------------------------------------------------------------ r1594 | sears.russell@gmail.com | 2012-02-28 13:17:05 -0500 (Tue, 28 Feb 2012) | 1 line experimental support for automatic logfile preallocation ------------------------------------------------------------------------ r1593 | sears.russell@gmail.com | 2012-02-28 12:10:01 -0500 (Tue, 28 Feb 2012) | 1 line add histogram reporting to rawIOPS benchmark ------------------------------------------------------------------------ r1592 | sears.russell@gmail.com | 2012-02-24 16:31:36 -0500 (Fri, 24 Feb 2012) | 1 line userspace raid 0 implementation ------------------------------------------------------------------------ r1591 | sears.russell@gmail.com | 2012-02-12 01:47:25 -0500 (Sun, 12 Feb 2012) | 1 line add skiplist unit test, fix compile warnings ------------------------------------------------------------------------ r1590 | sears.russell@gmail.com | 2012-02-12 00:52:52 -0500 (Sun, 12 Feb 2012) | 1 line fix compile error ------------------------------------------------------------------------ r1589 | sears.russell@gmail.com | 2012-02-12 00:50:21 -0500 (Sun, 12 Feb 2012) | 1 line fix some bugs in hazard.h surrounding thread list management and overruns of R under high contention ------------------------------------------------------------------------ r1588 | sears.russell@gmail.com | 2012-02-11 14:23:10 -0500 (Sat, 11 Feb 2012) | 1 line add hazard pointer for get_lock. It was implicitly blowing away the hazard pointer protecting y in the caller ------------------------------------------------------------------------ r1587 | sears.russell@gmail.com | 2012-02-10 18:51:25 -0500 (Fri, 10 Feb 2012) | 1 line fix null pointer bug ------------------------------------------------------------------------ r1586 | sears.russell@gmail.com | 2012-02-10 18:03:39 -0500 (Fri, 10 Feb 2012) | 1 line add simple refcounting scheme to concurrentSkipList. This solves the problem where a deleted node points to another deleted node, and we only have a hazard pointer for the first node. ------------------------------------------------------------------------ r1585 | sears.russell@gmail.com | 2012-02-10 14:19:14 -0500 (Fri, 10 Feb 2012) | 1 line add hazard pointers for update using the smallest free slot first. The old method left a race condition, since hazard_scan stops at the first null pointer. ------------------------------------------------------------------------ r1584 | sears.russell@gmail.com | 2012-02-10 02:45:30 -0500 (Fri, 10 Feb 2012) | 1 line add hazard pointers for update array ------------------------------------------------------------------------ r1583 | sears.russell@gmail.com | 2012-02-10 00:04:50 -0500 (Fri, 10 Feb 2012) | 1 line skiplist update: concurrent, but broken ------------------------------------------------------------------------ r1582 | sears.russell@gmail.com | 2012-02-09 17:44:27 -0500 (Thu, 09 Feb 2012) | 1 line skip list implementation. Not concurrent yet. ------------------------------------------------------------------------ r1581 | sears.russell@gmail.com | 2012-02-08 13:33:29 -0500 (Wed, 08 Feb 2012) | 1 line Commit of a bunch of new, unused code: KISS random number generator, Hazard Pointers, SUX latches (untested) and bit twiddling for concurrent b-tree ------------------------------------------------------------------------ r1580 | sears.russell@gmail.com | 2012-01-17 19:17:37 -0500 (Tue, 17 Jan 2012) | 1 line fix typo ------------------------------------------------------------------------ r1579 | sears.russell@gmail.com | 2012-01-11 18:33:31 -0500 (Wed, 11 Jan 2012) | 1 line static build fixes for linux. hopefully these do not break macos... ------------------------------------------------------------------------ r1578 | sears.russell@gmail.com | 2012-01-09 19:13:34 -0500 (Mon, 09 Jan 2012) | 1 line fix cmake under linux ------------------------------------------------------------------------ r1577 | sears.russell@gmail.com | 2012-01-09 18:37:15 -0500 (Mon, 09 Jan 2012) | 1 line fix linux static binary compilation bugs ------------------------------------------------------------------------ r1576 | sears.russell | 2012-01-09 18:00:08 -0500 (Mon, 09 Jan 2012) | 1 line port to macos x ------------------------------------------------------------------------ r1575 | sears.russell | 2012-01-09 17:39:43 -0500 (Mon, 09 Jan 2012) | 1 line add missing _ from sync call name ------------------------------------------------------------------------ r1574 | sears.russell@gmail.com | 2012-01-09 14:26:31 -0500 (Mon, 09 Jan 2012) | 1 line add -rt flag to static builds ------------------------------------------------------------------------ r1573 | sears.russell@gmail.com | 2011-12-20 23:38:29 -0500 (Tue, 20 Dec 2011) | 1 line Simple makefile geared toward building libstasis.so and libstasis.a (and nothing else) ------------------------------------------------------------------------ r1572 | sears.russell@gmail.com | 2011-12-20 22:37:54 -0500 (Tue, 20 Dec 2011) | 1 line add some missing #include<config.h> lines
205 lines
5.7 KiB
C
205 lines
5.7 KiB
C
/*
|
|
* check_concurrentSkipList.c
|
|
*
|
|
* Created on: Feb 8, 2012
|
|
* Author: sears
|
|
*/
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
#include <stasis/common.h>
|
|
|
|
int num_keys = 1000000;
|
|
void * key_dup(intptr_t p) {
|
|
intptr_t * ret = malloc(sizeof(intptr_t));
|
|
*ret = p;
|
|
return ret;
|
|
}
|
|
#ifdef STRINGS
|
|
static inline int stasis_util_skiplist_cmp(const void *a, const void *b) {
|
|
if(a == NULL) return -1;
|
|
if(b == NULL) return 1;
|
|
assert(!(a == NULL && b == NULL));
|
|
return strcmp(a,b);
|
|
}
|
|
#else
|
|
static inline int stasis_util_skiplist_cmp(const void *a, const void *b) {
|
|
// Note: Below, we ensure a and b are both >= 0 and small.
|
|
//assert(*(intptr_t*)a < 2*num_keys);
|
|
//assert(*(intptr_t*)b < 2*num_keys);
|
|
return ((int)*(intptr_t*)a-(long)*(intptr_t*)b);
|
|
}
|
|
#endif
|
|
#include <stasis/util/concurrentSkipList.h>
|
|
#include "../check_includes.h"
|
|
|
|
#include <stasis/constants.h>
|
|
#include <stasis/util/random.h>
|
|
|
|
#include <sys/time.h>
|
|
#include <time.h>
|
|
|
|
#define LOG_NAME "check_lhtable.log"
|
|
|
|
int num_threads = 4;
|
|
int concurrent = 0;
|
|
stasis_skiplist_t * list;
|
|
void * worker(void* p) {
|
|
intptr_t * keys = p;
|
|
intptr_t collisions = 0;
|
|
for(int i = 0; i < num_keys; i++) {
|
|
char * ret = stasis_util_skiplist_insert(list, key_dup(keys[i]));
|
|
if(ret != NULL) {
|
|
assert(!stasis_util_skiplist_cmp(ret, &keys[i]));
|
|
collisions++;
|
|
}
|
|
}
|
|
for(int i = 0; i < num_keys; i++) {
|
|
char * ret = stasis_util_skiplist_search(list, &keys[i]);
|
|
if(!concurrent) assert(!stasis_util_skiplist_cmp(ret, &keys[i]));
|
|
}
|
|
for(int i = 0; i < num_keys; i++) {
|
|
char * ret = stasis_util_skiplist_delete(list, &keys[i]);
|
|
if(ret == NULL) {
|
|
collisions--;
|
|
}
|
|
}
|
|
stasis_skiplist_release(list);
|
|
return (void*) collisions;
|
|
}
|
|
/**
|
|
@test
|
|
*/
|
|
START_TEST(concurrentSkipList_smokeTest) {
|
|
list = stasis_util_skiplist_init(stasis_util_skiplist_cmp, 0);
|
|
char ** const keys = malloc(sizeof(char*) * num_keys);
|
|
for(int i = 0; i < num_keys; i++) {
|
|
#ifdef STRINGS
|
|
int err = asprintf(&keys[i], "%d", (int)stasis_util_random64(2*num_keys));
|
|
(void) err;
|
|
#else
|
|
keys[i] = (void*)(1+stasis_util_random64(2*num_keys));
|
|
#endif
|
|
}
|
|
printf("Initted\n");
|
|
fflush(stdout);
|
|
struct timeval tv;
|
|
gettimeofday(&tv,0);
|
|
double start = stasis_timeval_to_double(tv);
|
|
intptr_t collisions = (intptr_t)worker(keys);
|
|
assert(collisions == 0);
|
|
gettimeofday(&tv,0);
|
|
double stop = stasis_timeval_to_double(tv);
|
|
double elapsed = stop - start;
|
|
double opspersec = 3.0*num_keys / elapsed;
|
|
printf("Run took %f seconds. %f ops/sec 1 thread %f ops/thread-second\n", elapsed, opspersec, opspersec);
|
|
stasis_util_skiplist_deinit(list);
|
|
#ifdef STRINGS
|
|
for(int i = 0; i < num_keys; i++) {
|
|
free(keys[i]);
|
|
}
|
|
#endif
|
|
free(keys);
|
|
} END_TEST
|
|
|
|
START_TEST(concurrentSkipList_concurrentTest) {
|
|
list = stasis_util_skiplist_init(stasis_util_skiplist_cmp, 0);
|
|
concurrent = 1;
|
|
char *** const keys = malloc(sizeof(char**) * num_threads);
|
|
for(int j = 0; j < num_threads; j++) {
|
|
keys[j] = malloc(sizeof(char*) * num_keys);
|
|
for(int i = 0; i < num_keys; i++) {
|
|
#ifdef STRINGS
|
|
int err = asprintf(&keys[i], "%d", (int)stasis_util_random64(2*num_keys));
|
|
(void) err;
|
|
#else
|
|
keys[j][i] = (void*)(1+stasis_util_random64(2*num_keys));
|
|
#endif
|
|
}
|
|
}
|
|
printf("Initted\n");
|
|
fflush(stdout);
|
|
pthread_t * threads = malloc(sizeof(pthread_t) * num_threads);
|
|
struct timeval tv;
|
|
gettimeofday(&tv,0);
|
|
double start = stasis_timeval_to_double(tv);
|
|
int collisions = 0;
|
|
for(int j = 0; j < num_threads; j++) {
|
|
pthread_create(&threads[j], 0, worker, keys[j]);
|
|
}
|
|
for(int j = 0; j < num_threads; j++) {
|
|
intptr_t ret;
|
|
pthread_join(threads[j], (void*)&ret);
|
|
collisions += ret;
|
|
#ifdef STRINGS
|
|
for(int i = 0; i < num_keys; i++) {
|
|
free(keys[j][i]);
|
|
}
|
|
#endif
|
|
free(keys[j]);
|
|
}
|
|
assert(collisions == 0);
|
|
free(threads);
|
|
gettimeofday(&tv,0);
|
|
double stop = stasis_timeval_to_double(tv);
|
|
double elapsed = stop - start;
|
|
double opspersec = 3.0*(double)num_keys*num_threads / elapsed;
|
|
double opsperthsec = 3.0*(double)num_keys / elapsed;
|
|
printf("Run took %f seconds. %f ops/sec %d threads %f ops/thread-second\n", elapsed, opspersec, num_threads, opsperthsec);
|
|
stasis_util_skiplist_deinit(list);
|
|
free(keys);
|
|
} END_TEST
|
|
void * worker2(void * p) {
|
|
for(int i = 0; i < num_keys; i++) {
|
|
intptr_t key = (intptr_t)stasis_util_random64(1000);
|
|
switch(stasis_util_random64(3)) {
|
|
case 0: {
|
|
stasis_util_skiplist_insert(list, key_dup(key));
|
|
} break;
|
|
case 1: {
|
|
stasis_util_skiplist_search(list, &key);
|
|
} break;
|
|
case 2: {
|
|
stasis_util_skiplist_delete(list, &key);
|
|
} break;
|
|
}
|
|
}
|
|
stasis_skiplist_release(list);
|
|
return 0;
|
|
}
|
|
START_TEST(concurrentSkipList_concurrentRandom) {
|
|
list = stasis_util_skiplist_init(stasis_util_skiplist_cmp, 0);
|
|
pthread_t thread[num_threads];
|
|
for(int i = 0; i < num_threads; i++) {
|
|
pthread_create(&thread[i], 0, worker2, 0);
|
|
}
|
|
for(int i = 0; i < num_threads; i++) {
|
|
pthread_join(thread[i], 0);
|
|
}
|
|
for(intptr_t i = 0; i < 1000; i++) {
|
|
stasis_util_skiplist_delete(list, &i);
|
|
}
|
|
stasis_util_skiplist_deinit(list);
|
|
} END_TEST
|
|
Suite * check_suite(void) {
|
|
Suite *s = suite_create("concurrentSkipList");
|
|
/* Begin a new test */
|
|
TCase *tc = tcase_create("concurrentSkipList");
|
|
tcase_set_timeout(tc, 0); // disable timeouts
|
|
|
|
/* Sub tests are added, one per line, here */
|
|
tcase_add_test(tc, concurrentSkipList_smokeTest);
|
|
tcase_add_test(tc, concurrentSkipList_concurrentTest);
|
|
tcase_add_test(tc, concurrentSkipList_concurrentRandom);
|
|
|
|
/* --------------------------------------------- */
|
|
|
|
tcase_add_checked_fixture(tc, setup, teardown);
|
|
|
|
|
|
suite_add_tcase(s, tc);
|
|
return s;
|
|
}
|
|
|
|
#include "../check_setup.h"
|
|
|
|
|