greg/wterl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update debugging messages a bit. Fix a bug in the signature function.

Browse source
This commit is contained in:
Gregory Burd 2013-06-18 13:49:25 -04:00
parent 34e88c9234
commit 4ae8ffb4cd
3 changed files with 36 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
c_src/common.h
View file

@ -33,7 +33,7 @@ extern "C" {
#include <stdarg.h> #include <stdarg.h>
#define DPRINTF(fmt, ...) \ #define DPRINTF(fmt, ...) \
do { \ do { \
fprintf(stderr, "%s:%d (%s) " fmt "\n", __FILE__, __LINE__, __func__, __VA_ARGS__); \ fprintf(stderr, "%s:%d " fmt "\n", __FILE__, __LINE__, __VA_ARGS__); \
fflush(stderr); \ fflush(stderr); \
} while(0) } while(0)
#define DPUTS(arg) DPRINTF("%s", arg) #define DPUTS(arg) DPRINTF("%s", arg)

32
c_src/wterl.c
View file

@ -223,6 +223,7 @@ __ctx_cache_evict(WterlConnHandle *conn_handle)
log = __log2(elapsed); log = __log2(elapsed);
if (log > mean) { if (log > mean) {
STAILQ_REMOVE(&conn_handle->cache, c, wterl_ctx, entries); STAILQ_REMOVE(&conn_handle->cache, c, wterl_ctx, entries);
DPRINTF("evicting: %llu", PRIuint64(c->sig));
c->session->close(c->session, NULL); c->session->close(c->session, NULL);
enif_free(c); enif_free(c);
num_evicted++; num_evicted++;
@ -329,9 +330,8 @@ __ctx_cache_sig(const char *c, va_list ap, int count, size_t *len)
} }
} }
sig = crc; sig = (uint64_t)crc << 32 | hash;
sig = sig << 32; //DPRINTF("sig %llu [%u:%u]", PRIuint64(sig), crc, hash);
sig &= hash;
return sig; return sig;
} }
@ -369,21 +369,22 @@ __retain_ctx(WterlConnHandle *conn_handle, uint32_t worker_id,
*ctx = NULL; *ctx = NULL;
do { do {
WMB_NEAR_CAS();
c = conn_handle->mru_ctx[worker_id]; c = conn_handle->mru_ctx[worker_id];
if (CASPO(&conn_handle->mru_ctx[worker_id], c, NULL) == c) { if (CASPO(&conn_handle->mru_ctx[worker_id], c, 0) == c) {
if (c == NULL) { if (c == 0) {
// mru miss: // mru miss:
DPRINTF("[%.4u] mru miss: %llu != NULL", worker_id, PRIuint64(sig)); DPRINTF("[%.4u] mru miss, empty", worker_id);
*ctx = NULL; *ctx = NULL;
} else { } else {
if (c->sig == sig) { if (c->sig == sig) {
// mru hit: // mru hit:
DPRINTF("[%.4u] mru hit: %llu", worker_id, PRIuint64(sig)); DPRINTF("[%.4u] mru hit: %llu found", worker_id, PRIuint64(sig));
*ctx = c; *ctx = c;
break; break;
} else { } else {
// mru mismatch: // mru mismatch:
DPRINTF("[%.4u] mru mismatch: %llu != %llu", worker_id, PRIuint64(sig), PRIuint64(c->sig)); DPRINTF("[%.4u] mru miss: %llu != %llu", worker_id, PRIuint64(sig), PRIuint64(c->sig));
__ctx_cache_add(conn_handle, c); __ctx_cache_add(conn_handle, c);
*ctx = NULL; *ctx = NULL;
} }
@ -397,7 +398,7 @@ __retain_ctx(WterlConnHandle *conn_handle, uint32_t worker_id,
(*ctx) = __ctx_cache_find(conn_handle, sig); (*ctx) = __ctx_cache_find(conn_handle, sig);
if ((*ctx) == NULL) { if ((*ctx) == NULL) {
// cache miss: // cache miss:
DPRINTF("[%.4u] cache miss: %llu [%d]", worker_id, PRIuint64(sig), conn_handle->cache_size); DPRINTF("[%.4u] cache miss: %llu [cache size: %d]", worker_id, PRIuint64(sig), conn_handle->cache_size);
WT_CONNECTION *conn = conn_handle->conn; WT_CONNECTION *conn = conn_handle->conn;
WT_SESSION *session = NULL; WT_SESSION *session = NULL;
int rc = conn->open_session(conn, NULL, session_config, &session); int rc = conn->open_session(conn, NULL, session_config, &session);
@ -435,7 +436,7 @@ __retain_ctx(WterlConnHandle *conn_handle, uint32_t worker_id,
va_end(ap); va_end(ap);
} else { } else {
// cache hit: // cache hit:
DPRINTF("[%.4u] cache hit: %llu [%d]", worker_id, PRIuint64(sig), conn_handle->cache_size); DPRINTF("[%.4u] cache hit: %llu [cache size: %d]", worker_id, PRIuint64(sig), conn_handle->cache_size);
} }
} }
return 0; return 0;
@ -456,6 +457,7 @@ __release_ctx(WterlConnHandle *conn_handle, uint32_t worker_id, struct wterl_ctx
cursor->reset(cursor); cursor->reset(cursor);
} }
WMB_NEAR_CAS();
c = conn_handle->mru_ctx[worker_id]; c = conn_handle->mru_ctx[worker_id];
if (CASPO(&conn_handle->mru_ctx[worker_id], c, ctx) != c) { if (CASPO(&conn_handle->mru_ctx[worker_id], c, ctx) != c) {
__ctx_cache_add(conn_handle, ctx); __ctx_cache_add(conn_handle, ctx);
@ -484,10 +486,11 @@ __close_all_sessions(WterlConnHandle *conn_handle)
// clear out the mru // clear out the mru
for (worker_id = 0; worker_id < ASYNC_NIF_MAX_WORKERS; worker_id++) { for (worker_id = 0; worker_id < ASYNC_NIF_MAX_WORKERS; worker_id++) {
do { do {
WMB_NEAR_CAS();
c = conn_handle->mru_ctx[worker_id]; c = conn_handle->mru_ctx[worker_id];
} while(CASPO(&conn_handle->mru_ctx[worker_id], c, NULL) != c); } while(CASPO(&conn_handle->mru_ctx[worker_id], c, 0) != c);
if (c != NULL) { if (c != 0) {
c->session->close(c->session, NULL); c->session->close(c->session, NULL);
enif_free(c); enif_free(c);
} }
@ -518,8 +521,9 @@ __close_cursors_on(WterlConnHandle *conn_handle, const char *uri)
// walk the mru first, look for open cursors on matching uri // walk the mru first, look for open cursors on matching uri
for (worker_id = 0; worker_id < ASYNC_NIF_MAX_WORKERS; worker_id++) { for (worker_id = 0; worker_id < ASYNC_NIF_MAX_WORKERS; worker_id++) {
WMB_NEAR_CAS();
c = conn_handle->mru_ctx[worker_id]; c = conn_handle->mru_ctx[worker_id];
if (CASPO(&conn_handle->mru_ctx[worker_id], c, NULL) == c && c != NULL) { if (CASPO(&conn_handle->mru_ctx[worker_id], c, 0) == c && c != 0) {
cnt = c->num_cursors; cnt = c->num_cursors;
for(idx = 0; idx < cnt; idx++) { for(idx = 0; idx < cnt; idx++) {
if (!strcmp(c->ci[idx].uri, uri)) { if (!strcmp(c->ci[idx].uri, uri)) {
@ -527,7 +531,7 @@ __close_cursors_on(WterlConnHandle *conn_handle, const char *uri)
enif_free(c); enif_free(c);
break; break;
} else { } else {
if (CASPO(&conn_handle->mru_ctx[worker_id], NULL, c) != NULL) { if (CASPO(&conn_handle->mru_ctx[worker_id], 0, c) != 0) {
__ctx_cache_add(conn_handle, c); __ctx_cache_add(conn_handle, c);
} }
} }

17
src/wterl.erl
View file

@ -586,6 +586,23 @@ insert_delete_test() ->
?assertMatch(not_found, get(ConnRef, "table:test", <<"a">>)), ?assertMatch(not_found, get(ConnRef, "table:test", <<"a">>)),
ok = connection_close(ConnRef). ok = connection_close(ConnRef).
cursor_fold_keys_test() ->
ConnRef = open_test_conn(?TEST_DATA_DIR),
ConnRef = open_test_table(ConnRef),
[wterl:put(ConnRef, "table:test-fold", crypto:sha(<<X>>),
crypto:rand_bytes(crypto:rand_uniform(128, 4096)))
|| X <- lists:seq(1, 2000)],
Cursor = wterl:cursor_open(ConnRef, "table:test-fold"),
try
{Result, _} = wterl:fold_keys(Cursor, fun(Key, Acc) -> [Key | Acc] end, [])
catch
_:_ -> wterl:cursor_close(Cursor)
after
ok = connection_close(ConnRef)
end.
% ?assertMatch(lists:sort(Result),
% lists:sort([crypto:sha(<<X>>) || X <- lists:seq(1, 2000)])).
many_open_tables_test_() -> many_open_tables_test_() ->
{timeout, 60, {timeout, 60,
fun() -> fun() ->