mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[t:5113] spruce up the default parameters and put a reader-writer lock around the global variable used in the assertion, so we know for certain we're not just racing to read THAT variable

Browse source 
git-svn-id: file:///svn/toku/tokudb@44778 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
John Esmet 2013-04-17 00:00:52 -04:00 • committed by Yoni Fogel
parent f75af8ab78
commit 6418c5c80f
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/tests/change_descriptor_race.c
View file

@ -7,6 +7,7 @@
// pointer value in the FT. // pointer value in the FT.
#include "test.h" #include "test.h"
#include <portability/toku_pthread.h>
const int envflags = DB_INIT_MPOOL|DB_CREATE|DB_THREAD |DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_TXN|DB_PRIVATE; const int envflags = DB_INIT_MPOOL|DB_CREATE|DB_THREAD |DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_TXN|DB_PRIVATE;
@ -14,6 +15,7 @@ static DB *db;
static DB_ENV *env; static DB_ENV *env;
static int desc_magic; static int desc_magic;
static toku_pthread_rwlock_t rwlock;
static int static int
int_cmp(DB *cmpdb, const DBT *a, const DBT *b) { int_cmp(DB *cmpdb, const DBT *a, const DBT *b) {
@ -24,10 +26,12 @@ int_cmp(DB *cmpdb, const DBT *a, const DBT *b) {
assert(b->size == sizeof(int)); assert(b->size == sizeof(int));
assert(cmpdb->cmp_descriptor->dbt.size == sizeof(int)); assert(cmpdb->cmp_descriptor->dbt.size == sizeof(int));
int magic = *(int *) cmpdb->cmp_descriptor->dbt.data; int magic = *(int *) cmpdb->cmp_descriptor->dbt.data;
toku_pthread_rwlock_rdlock(&rwlock);
if (magic != desc_magic) { if (magic != desc_magic) {
printf("got magic %d, wanted desc_magic %d\n", magic, desc_magic); printf("got magic %d, wanted desc_magic %d\n", magic, desc_magic);
} }
assert(magic == desc_magic); assert(magic == desc_magic);
toku_pthread_rwlock_rdunlock(&rwlock);
int x = *(int *) a->data; int x = *(int *) a->data;
int y = *(int *) b->data; int y = *(int *) b->data;
@ -62,6 +66,7 @@ cleanup(void) {
static void static void
next_descriptor(void) { next_descriptor(void) {
toku_pthread_rwlock_wrlock(&rwlock);
IN_TXN_COMMIT(env, NULL, txn, 0, { IN_TXN_COMMIT(env, NULL, txn, 0, {
// get a new magic value // get a new magic value
desc_magic++; desc_magic++;
@ -69,13 +74,14 @@ next_descriptor(void) {
dbt_init(&desc_dbt, &desc_magic, sizeof(int)); dbt_init(&desc_dbt, &desc_magic, sizeof(int));
{ int chk_r = db->change_descriptor(db, txn, &desc_dbt, DB_UPDATE_CMP_DESCRIPTOR); CKERR(chk_r); } { int chk_r = db->change_descriptor(db, txn, &desc_dbt, DB_UPDATE_CMP_DESCRIPTOR); CKERR(chk_r); }
}); });
toku_pthread_rwlock_wrunlock(&rwlock);
} }
static void static void
insert_change_descriptor_stress(void) { insert_change_descriptor_stress(void) {
const int num_changes = 1000000; const int num_changes = 1000;
const int inserts_per_change = 100; const int inserts_per_change = 1000;
const int valsize = 200 - sizeof(int); const int valsize = 200 - sizeof(int);
// bigger rows cause more flushes // bigger rows cause more flushes
DBT key, value; DBT key, value;