Commit 07c6b9a0 authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel

#4761 hold the lock tree manager mutex and the lock tree mutex when doing lock...

#4761 hold the lock tree manager mutex and the lock tree mutex when doing lock escalation refs[t:4761]

git-svn-id: file:///svn/toku/tokudb@42329 c7de825b-a66e-492c-adef-691d508d4ae1
parent ce59e63b
This diff is collapsed.
...@@ -75,9 +75,11 @@ struct __toku_lock_tree { ...@@ -75,9 +75,11 @@ struct __toku_lock_tree {
DICTIONARY_ID dict_id; DICTIONARY_ID dict_id;
OMT dbs; //The extant dbs using this lock tree. OMT dbs; //The extant dbs using this lock tree.
OMT lock_requests; OMT lock_requests;
toku_pthread_mutex_t mutex;
toku_rth* txns_to_unlock; // set of txn's that could not release their locks because there was no db for the comparison function toku_rth* txns_to_unlock; // set of txn's that could not release their locks because there was no db for the comparison function
toku_pthread_mutex_t mutex;
bool mutex_locked;
/** A temporary area where we store the results of various find on /** A temporary area where we store the results of various find on
the range trees that this lock tree owns the range trees that this lock tree owns
Memory ownership: Memory ownership:
...@@ -149,6 +151,8 @@ struct __toku_ltm { ...@@ -149,6 +151,8 @@ struct __toku_ltm {
int (*panic)(DB*, int); int (*panic)(DB*, int);
toku_pthread_mutex_t mutex; toku_pthread_mutex_t mutex;
bool mutex_locked;
struct timeval lock_wait_time; struct timeval lock_wait_time;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment