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

closes #5272, address CR comments

Browse source 
git-svn-id: file:///svn/toku/tokudb@45930 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Zardosht Kasheff 2013-04-17 00:00:59 -04:00 • committed by Yoni Fogel
parent f51339dd09
commit f402d9dbaa
4 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ft/cachetable.cc
View file

@ -2518,6 +2518,7 @@ toku_cachetable_close (CACHETABLE *ctp) {
toku_kibbutz_destroy(ct->checkpointing_kibbutz);
bjm_destroy(ct->checkpoint_clones_bjm);
toku_cond_destroy(&ct->flow_control_cond);
toku_mutex_destroy(&ct->mutex);
toku_free(ct->table);
toku_free(ct->env_dir);
toku_free(ct);
@ -2632,14 +2633,10 @@ int toku_cachetable_unpin_and_remove (
//
cachetable_remove_pair(ct, p);
if (nb_mutex_blocked_writers(&p->value_nb_mutex)>0) {
toku_cond_t cond;
toku_cond_init(&cond, NULL);
nb_mutex_wait_for_users(
&p->value_nb_mutex,
&ct->mutex,
&cond
&ct->mutex
);
toku_cond_destroy(&cond);
assert(!p->checkpoint_pending);
assert(p->attr.cache_pressure_size == 0);
}

6
ft/kibbutz.h
View file

@ -8,12 +8,6 @@
//
// The kibbutz is another threadpool meant to do arbitrary work.
// It is introduced in Dr. No, and as of Dr. No, the only work kibbutzim
// do is flusher thread work. In Dr. No, we already have a threadpool for
// the writer threads and a threadpool for serializing ftnodes. A natural
// question is why did we introduce another threadpool in Dr. No. The short
// answer is that this was the simplest way to get the flusher threads work
// done.
//
typedef struct kibbutz *KIBBUTZ;

5
ft/nonblocking_mutex.h
View file

@ -55,11 +55,10 @@ static inline void nb_mutex_unlock(NB_MUTEX nb_mutex) {
static inline void nb_mutex_wait_for_users(
NB_MUTEX nb_mutex,
toku_mutex_t *mutex,
toku_cond_t* cond
toku_mutex_t *mutex
)
{
rwlock_wait_for_users(&nb_mutex->lock, mutex, cond);
rwlock_wait_for_users(&nb_mutex->lock, mutex);
}
// returns: the number of writers who are waiting for the lock

10
ft/rwlock.h
View file

@ -154,16 +154,18 @@ static inline int rwlock_writers(RWLOCK rwlock) {
static inline void rwlock_wait_for_users(
RWLOCK rwlock,
toku_mutex_t *mutex,
toku_cond_t* cond
toku_mutex_t *mutex
)
{
assert(!rwlock->wait_users_go_to_zero);
toku_cond_t cond;
toku_cond_init(&cond, NULL);
while (rwlock_users(rwlock) > 0) {
rwlock->wait_users_go_to_zero = cond;
toku_cond_wait(cond, mutex);
rwlock->wait_users_go_to_zero = &cond;
toku_cond_wait(&cond, mutex);
}
rwlock->wait_users_go_to_zero = NULL;
toku_cond_destroy(&cond);
}