Commit d050bd42 authored by Leif Walsh's avatar Leif Walsh Committed by Yoni Fogel

refs #5672 don't bother doing fancy drd things for m_size_evicting


git-svn-id: file:///svn/toku/tokudb@50762 c7de825b-a66e-492c-adef-691d508d4ae1
parent 774354d8
......@@ -3453,6 +3453,7 @@ static void *eviction_thread(void *evictor_v) {
//
void evictor::init(long _size_limit, pair_list* _pl, KIBBUTZ _kibbutz, uint32_t eviction_period) {
TOKU_VALGRIND_HG_DISABLE_CHECKING(&m_ev_thread_is_running, sizeof m_ev_thread_is_running);
TOKU_VALGRIND_HG_DISABLE_CHECKING(&m_size_evicting, sizeof m_size_evicting);
m_low_size_watermark = _size_limit;
// these values are selected kind of arbitrarily right now as
......@@ -4012,7 +4013,7 @@ bool evictor::should_sleeping_clients_wakeup() {
bool evictor::should_client_wake_eviction_thread() {
return
!m_ev_thread_is_running &&
((unsafe_read_size_current() - unsafe_read_size_evicting()) > m_low_size_hysteresis);
((unsafe_read_size_current() - m_size_evicting) > m_low_size_hysteresis);
}
//
......@@ -4028,11 +4029,6 @@ inline int64_t evictor::unsafe_read_size_current(void) const {
return m_size_current;
}
inline int64_t evictor::unsafe_read_size_evicting(void) const {
return m_size_evicting;
}
void evictor::fill_engine_status() {
STATUS_VALUE(CT_SIZE_CURRENT) = m_size_current;
STATUS_VALUE(CT_SIZE_LIMIT) = m_low_size_hysteresis;
......
......@@ -89,11 +89,6 @@
drd:ConflictingAccess
fun:_ZNK4toku8locktree46unsafe_read_single_txnid_optimization_possibleEv
}
{
unsafe_read_size_evicting
drd:ConflictingAccess
fun:_ZNK7evictor25unsafe_read_size_evictingEv
}
{
unsafe_read_size_current
drd:ConflictingAccess
......
......@@ -39,11 +39,6 @@
Helgrind:Race
fun:_ZNK4toku8locktree46unsafe_read_single_txnid_optimization_possibleEv
}
{
unsafe_read_size_evicting
Helgrind:Race
fun:_ZNK7evictor25unsafe_read_size_evictingEv
}
{
unsafe_read_size_current
Helgrind:Race
......
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