andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

simplify user_access_only expression (#6360)

Browse Source 
Summary: Pull Request resolved: https://github.com/facebook/rocksdb/pull/6360

Differential Revision: D19698918

Pulled By: riversand963

fbshipit-source-id: d20ecca541376cccd32fc7afb504ea90021860ee
This commit is contained in:
Gaurav Singh 2020-02-20 10:25:14 -08:00 committed by Facebook Github Bot
parent a993cc3a62
commit 4e33f1e1dc
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/block_cache_analyzer/block_cache_trace_analyzer.cc
View File

@ -1200,7 +1200,7 @@ void BlockCacheTraceAnalyzer::WriteBlockReuseTimeline(
const uint64_t timestamp = timeline.first; const uint64_t timestamp = timeline.first;
const uint64_t elapsed_time = const uint64_t elapsed_time =
timestamp - trace_start_timestamp_in_seconds_; timestamp - trace_start_timestamp_in_seconds_;
if (!user_access_only || (user_access_only && is_user_access(caller))) { if (!user_access_only || is_user_access(caller)) {
uint64_t index = uint64_t index =
std::min(elapsed_time / reuse_window, reuse_vector_size - 1); std::min(elapsed_time / reuse_window, reuse_vector_size - 1);
block_accessed[block_id][index] = true; block_accessed[block_id][index] = true;
@ -1412,8 +1412,7 @@ void BlockCacheTraceAnalyzer::WriteAccessCountSummaryStats(
} }
uint64_t naccesses = 0; uint64_t naccesses = 0;
for (auto const& caller_access : block.caller_num_access_map) { for (auto const& caller_access : block.caller_num_access_map) {
if (!user_access_only || if (!user_access_only || is_user_access(caller_access.first)) {
(user_access_only && is_user_access(caller_access.first))) {
naccesses += caller_access.second; naccesses += caller_access.second;
} }
} }
@ -1648,8 +1647,7 @@ void BlockCacheTraceAnalyzer::PrintAccessCountStats(bool user_access_only,
const BlockAccessInfo& block) { const BlockAccessInfo& block) {
uint64_t naccesses = 0; uint64_t naccesses = 0;
for (auto const& caller_access : block.caller_num_access_map) { for (auto const& caller_access : block.caller_num_access_map) {
if (!user_access_only || if (!user_access_only || is_user_access(caller_access.first)) {
(user_access_only && is_user_access(caller_access.first))) {
naccesses += caller_access.second; naccesses += caller_access.second;
} }
} }
@ -1680,8 +1678,7 @@ void BlockCacheTraceAnalyzer::PrintAccessCountStats(bool user_access_only,
for (auto const& block_id : naccess_it->second) { for (auto const& block_id : naccess_it->second) {
BlockAccessInfo* block = block_info_map_.find(block_id)->second; BlockAccessInfo* block = block_info_map_.find(block_id)->second;
for (auto const& caller_access : block->caller_num_access_map) { for (auto const& caller_access : block->caller_num_access_map) {
if (!user_access_only || if (!user_access_only || is_user_access(caller_access.first)) {
(user_access_only && is_user_access(caller_access.first))) {
caller_naccesses[caller_access.first] += caller_access.second; caller_naccesses[caller_access.first] += caller_access.second;
naccesses += caller_access.second; naccesses += caller_access.second;
} }
@ -1714,15 +1711,13 @@ void BlockCacheTraceAnalyzer::PrintAccessCountStats(bool user_access_only,
std::string statistics("Caller:"); std::string statistics("Caller:");
uint64_t naccesses = 0; uint64_t naccesses = 0;
for (auto const& caller_access : block->caller_num_access_map) { for (auto const& caller_access : block->caller_num_access_map) {
if (!user_access_only || if (!user_access_only || is_user_access(caller_access.first)) {
(user_access_only && is_user_access(caller_access.first))) {
naccesses += caller_access.second; naccesses += caller_access.second;
} }
} }
assert(naccesses > 0); assert(naccesses > 0);
for (auto const& caller_access : block->caller_num_access_map) { for (auto const& caller_access : block->caller_num_access_map) {
if (!user_access_only || if (!user_access_only || is_user_access(caller_access.first)) {
(user_access_only && is_user_access(caller_access.first))) {
statistics += ","; statistics += ",";
statistics += caller_to_string(caller_access.first); statistics += caller_to_string(caller_access.first);
statistics += ":"; statistics += ":";
@ -1734,8 +1729,7 @@ void BlockCacheTraceAnalyzer::PrintAccessCountStats(bool user_access_only,
uint64_t ref_keys_does_not_exist_accesses = 0; uint64_t ref_keys_does_not_exist_accesses = 0;
for (auto const& ref_key_caller_access : block->key_num_access_map) { for (auto const& ref_key_caller_access : block->key_num_access_map) {
for (auto const& caller_access : ref_key_caller_access.second) { for (auto const& caller_access : ref_key_caller_access.second) {
if (!user_access_only || if (!user_access_only || is_user_access(caller_access.first)) {
(user_access_only && is_user_access(caller_access.first))) {
ref_keys_accesses += caller_access.second; ref_keys_accesses += caller_access.second;
} }
} }
@ -1743,8 +1737,7 @@ void BlockCacheTraceAnalyzer::PrintAccessCountStats(bool user_access_only,
for (auto const& ref_key_caller_access : for (auto const& ref_key_caller_access :
block->non_exist_key_num_access_map) { block->non_exist_key_num_access_map) {
for (auto const& caller_access : ref_key_caller_access.second) { for (auto const& caller_access : ref_key_caller_access.second) {
if (!user_access_only || if (!user_access_only || is_user_access(caller_access.first)) {
(user_access_only && is_user_access(caller_access.first))) {
ref_keys_does_not_exist_accesses += caller_access.second; ref_keys_does_not_exist_accesses += caller_access.second;
} }
} }