Summary:
Add a counter for collecting the wait time on db mutex.
Also add MutexWrapper and CondVarWrapper for measuring wait time.
Test Plan:
./db_test
export ROCKSDB_TESTS=MutexWaitStats
./db_test
verify stats output using db_bench
make clean
make release
./db_bench --statistics=1 --benchmarks=fillseq,readwhilewriting --num=10000 --threads=10
Sample output:
rocksdb.db.mutex.wait.micros COUNT : 7546866
Reviewers: MarkCallaghan, rven, sdong, igor
Reviewed By: igor
Subscribers: dhruba, leveldb
Differential Revision: https://reviews.facebook.net/D32787
main
Yueh-Hsuan Chiang
10 years ago
parent
f36d394aed
commit
181191a1e4
@ -0,0 +1,72 @@ |
|||||||
|
// Copyright (c) 2015, Facebook, Inc. All rights reserved.
|
||||||
|
// This source code is licensed under the BSD-style license found in the
|
||||||
|
// LICENSE file in the root directory of this source tree. An additional grant
|
||||||
|
// of patent rights can be found in the PATENTS file in the same directory.
|
||||||
|
|
||||||
|
#include "util/instrumented_mutex.h" |
||||||
|
#include "util/thread_status_util.h" |
||||||
|
|
||||||
|
namespace rocksdb { |
||||||
|
void InstrumentedMutex::Lock() { |
||||||
|
uint64_t wait_time_micros = 0; |
||||||
|
if (env_ != nullptr && stats_ != nullptr) { |
||||||
|
{ |
||||||
|
StopWatch sw(env_, nullptr, 0, &wait_time_micros); |
||||||
|
LockInternal(); |
||||||
|
} |
||||||
|
RecordTick(stats_, stats_code_, wait_time_micros); |
||||||
|
} else { |
||||||
|
LockInternal(); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
void InstrumentedMutex::LockInternal() { |
||||||
|
#ifndef NDEBUG |
||||||
|
ThreadStatusUtil::TEST_StateDelay(ThreadStatus::STATE_MUTEX_WAIT); |
||||||
|
#endif |
||||||
|
mutex_.Lock(); |
||||||
|
} |
||||||
|
|
||||||
|
void InstrumentedCondVar::Wait() { |
||||||
|
uint64_t wait_time_micros = 0; |
||||||
|
if (env_ != nullptr && stats_ != nullptr) { |
||||||
|
{ |
||||||
|
StopWatch sw(env_, nullptr, 0, &wait_time_micros); |
||||||
|
WaitInternal(); |
||||||
|
} |
||||||
|
RecordTick(stats_, stats_code_, wait_time_micros); |
||||||
|
} else { |
||||||
|
WaitInternal(); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
void InstrumentedCondVar::WaitInternal() { |
||||||
|
#ifndef NDEBUG |
||||||
|
ThreadStatusUtil::TEST_StateDelay(ThreadStatus::STATE_MUTEX_WAIT); |
||||||
|
#endif |
||||||
|
cond_.Wait(); |
||||||
|
} |
||||||
|
|
||||||
|
bool InstrumentedCondVar::TimedWait(uint64_t abs_time_us) { |
||||||
|
uint64_t wait_time_micros = 0; |
||||||
|
bool result = false; |
||||||
|
if (env_ != nullptr && stats_ != nullptr) { |
||||||
|
{ |
||||||
|
StopWatch sw(env_, nullptr, 0, &wait_time_micros); |
||||||
|
result = TimedWaitInternal(abs_time_us); |
||||||
|
} |
||||||
|
RecordTick(stats_, stats_code_, wait_time_micros); |
||||||
|
} else { |
||||||
|
result = TimedWaitInternal(abs_time_us); |
||||||
|
} |
||||||
|
return result; |
||||||
|
} |
||||||
|
|
||||||
|
bool InstrumentedCondVar::TimedWaitInternal(uint64_t abs_time_us) { |
||||||
|
#ifndef NDEBUG |
||||||
|
ThreadStatusUtil::TEST_StateDelay(ThreadStatus::STATE_MUTEX_WAIT); |
||||||
|
#endif |
||||||
|
return cond_.TimedWait(abs_time_us); |
||||||
|
} |
||||||
|
|
||||||
|
} // namespace rocksdb
|
||||||
@ -0,0 +1,98 @@ |
|||||||
|
// Copyright (c) 2015, Facebook, Inc. All rights reserved.
|
||||||
|
// This source code is licensed under the BSD-style license found in the
|
||||||
|
// LICENSE file in the root directory of this source tree. An additional grant
|
||||||
|
// of patent rights can be found in the PATENTS file in the same directory.
|
||||||
|
|
||||||
|
#pragma once |
||||||
|
|
||||||
|
#include "port/port.h" |
||||||
|
#include "rocksdb/env.h" |
||||||
|
#include "rocksdb/statistics.h" |
||||||
|
#include "rocksdb/thread_status.h" |
||||||
|
#include "util/statistics.h" |
||||||
|
#include "util/stop_watch.h" |
||||||
|
|
||||||
|
namespace rocksdb { |
||||||
|
class InstrumentedCondVar; |
||||||
|
|
||||||
|
// A wrapper class for port::Mutex that provides additional layer
|
||||||
|
// for collecting stats and instrumentation.
|
||||||
|
class InstrumentedMutex { |
||||||
|
public: |
||||||
|
explicit InstrumentedMutex(bool adaptive = false) |
||||||
|
: mutex_(adaptive), stats_(nullptr), env_(nullptr), |
||||||
|
stats_code_(0) {} |
||||||
|
|
||||||
|
InstrumentedMutex( |
||||||
|
Statistics* stats, Env* env, |
||||||
|
int stats_code, bool adaptive = false) |
||||||
|
: mutex_(adaptive), stats_(stats), env_(env), |
||||||
|
stats_code_(stats_code) {} |
||||||
|
|
||||||
|
void Lock(); |
||||||
|
|
||||||
|
void Unlock() { |
||||||
|
mutex_.Unlock(); |
||||||
|
} |
||||||
|
|
||||||
|
void AssertHeld() { |
||||||
|
mutex_.AssertHeld(); |
||||||
|
} |
||||||
|
|
||||||
|
private: |
||||||
|
void LockInternal(); |
||||||
|
friend class InstrumentedCondVar; |
||||||
|
port::Mutex mutex_; |
||||||
|
Statistics* stats_; |
||||||
|
Env* env_; |
||||||
|
int stats_code_; |
||||||
|
}; |
||||||
|
|
||||||
|
// A wrapper class for port::Mutex that provides additional layer
|
||||||
|
// for collecting stats and instrumentation.
|
||||||
|
class InstrumentedMutexLock { |
||||||
|
public: |
||||||
|
explicit InstrumentedMutexLock(InstrumentedMutex* mutex) : mutex_(mutex) { |
||||||
|
mutex_->Lock(); |
||||||
|
} |
||||||
|
|
||||||
|
~InstrumentedMutexLock() { |
||||||
|
mutex_->Unlock(); |
||||||
|
} |
||||||
|
|
||||||
|
private: |
||||||
|
InstrumentedMutex* const mutex_; |
||||||
|
InstrumentedMutexLock(const InstrumentedMutexLock&) = delete; |
||||||
|
void operator=(const InstrumentedMutexLock&) = delete; |
||||||
|
}; |
||||||
|
|
||||||
|
class InstrumentedCondVar { |
||||||
|
public: |
||||||
|
explicit InstrumentedCondVar(InstrumentedMutex* instrumented_mutex) |
||||||
|
: cond_(&(instrumented_mutex->mutex_)), |
||||||
|
stats_(instrumented_mutex->stats_), |
||||||
|
env_(instrumented_mutex->env_), |
||||||
|
stats_code_(instrumented_mutex->stats_code_) {} |
||||||
|
|
||||||
|
void Wait(); |
||||||
|
|
||||||
|
bool TimedWait(uint64_t abs_time_us); |
||||||
|
|
||||||
|
void Signal() { |
||||||
|
cond_.Signal(); |
||||||
|
} |
||||||
|
|
||||||
|
void SignalAll() { |
||||||
|
cond_.SignalAll(); |
||||||
|
} |
||||||
|
|
||||||
|
private: |
||||||
|
void WaitInternal(); |
||||||
|
bool TimedWaitInternal(uint64_t abs_time_us); |
||||||
|
port::CondVar cond_; |
||||||
|
Statistics* stats_; |
||||||
|
Env* env_; |
||||||
|
int stats_code_; |
||||||
|
}; |
||||||
|
|
||||||
|
} // namespace rocksdb
|
||||||
Loading…
Reference in new issue