Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(497)

Unified Diff: sync/syncable/directory.cc

Issue 2084243004: [WIP][tracing] Add memory dump provider for sync Directory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add visitors for memory. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sync/syncable/directory.cc
diff --git a/sync/syncable/directory.cc b/sync/syncable/directory.cc
index ca1efc1c95bda86f708e288e667e15b106d39b25..efb21403d3f3072e489f5cef85416932b7707e45 100644
--- a/sync/syncable/directory.cc
+++ b/sync/syncable/directory.cc
@@ -4,6 +4,7 @@
#include "sync/syncable/directory.h"
+#include <inttypes.h>
#include <stddef.h>
#include <stdint.h>
@@ -16,10 +17,14 @@
#include "base/metrics/histogram.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
+#include "base/strings/stringprintf.h"
+#include "base/trace_event/memory_dump_manager.h"
+#include "base/trace_event/process_memory_dump.h"
#include "base/trace_event/trace_event.h"
#include "sync/internal_api/public/base/attachment_id_proto.h"
#include "sync/internal_api/public/base/unique_position.h"
#include "sync/internal_api/public/util/unrecoverable_error_handler.h"
+#include "sync/protocol/proto_value_conversions.h"
#include "sync/syncable/entry.h"
#include "sync/syncable/entry_kernel.h"
#include "sync/syncable/in_memory_directory_backing_store.h"
@@ -39,6 +44,14 @@ using std::string;
namespace syncer {
namespace syncable {
+namespace {
+
+template <typename Key, typename Value>
+size_t GetMapMemoryUsage(const std::unordered_map<Key, Value> map) {
+ return map.size() * (sizeof(Key) + sizeof(Value));
stanisc 2016/07/06 21:50:32 This is too simplistic. See http://info.prelert.co
ssid 2016/07/19 22:10:35 Made it more accurate. Apart from these there are
+}
+}
+
// static
const base::FilePath::CharType Directory::kSyncDatabaseFilename[] =
FILE_PATH_LITERAL("SyncData.sqlite3");
@@ -215,6 +228,9 @@ DirOpenResult Directory::OpenImpl(
store_->SetCatastrophicErrorHandler(base::Bind(
&Directory::OnCatastrophicError, weak_ptr_factory_.GetWeakPtr()));
+ UMA_HISTOGRAM_COUNTS("Sync.DirectoryMemoryUsageKB",
stanisc 2016/07/06 21:50:32 Someone from the current sync team should comment
ssid 2016/07/19 22:10:35 Maybe that can be added later on top of this imple
+ GetApproximateMemoryUsage());
+
return OPENED;
}
@@ -920,6 +936,88 @@ size_t Directory::GetEntriesCount() const {
return kernel_->metahandles_map.size();
}
+size_t Directory::GetApproximateMemoryUsage() {
+ size_t total = 0;
+ ScopedKernelLock lock(this);
+ total += sizeof(this) + GetMapMemoryUsage(kernel_->metahandles_map) +
+ GetMapMemoryUsage(kernel_->ids_map) +
+ GetMapMemoryUsage(kernel_->server_tags_map) +
+ GetMapMemoryUsage(kernel_->client_tags_map) +
+ GetMapMemoryUsage(kernel_->index_by_attachment_id);
+ total += kernel_->parent_child_index.bytes_used();
+
+ for (size_t i = 0; i < MODEL_TYPE_COUNT; ++i)
+ total += kernel_->persisted_info.datatype_context[i].context().capacity();
+
+ for (auto entry : kernel_->index_by_attachment_id)
+ total += entry.first.capacity() + entry.second.size() * sizeof(int64_t);
+
+ for (auto handle : kernel_->metahandles_map) {
+ if (handle.second->cached_size()) {
stanisc 2016/07/06 21:50:32 A comment here would be useful
ssid 2016/07/19 22:10:35 Done.
+ total += handle.second->cached_size();
+ continue;
+ }
+
+ size_t entry_size = 0;
+ for (unsigned i = ID_FIELDS_BEGIN; i < ID_FIELDS_END; ++i) {
+ // Twice because the |ids_map| stores a copy of these strings.
+ entry_size +=
+ 2 * handle.second->ref(static_cast<IdField>(i)).value().capacity();
stanisc 2016/07/06 21:50:31 I am not sure this is right. client ID might be th
ssid 2016/07/19 22:10:35 counting the ids_map separately. The string capaci
+ }
+ for (unsigned i = STRING_FIELDS_BEGIN; i < STRING_FIELDS_END; ++i) {
+ if (i == UNIQUE_SERVER_TAG || i == UNIQUE_CLIENT_TAG) {
+ // These are stored again in tags_map.
stanisc 2016/07/06 21:50:32 The same is here - if the server tag is the same a
ssid 2016/07/19 22:10:35 This one will appear twice if the id is same. Ther
+ entry_size +=
+ 2 * handle.second->ref(static_cast<StringField>(i)).capacity();
+ } else {
+ entry_size +=
+ handle.second->ref(static_cast<StringField>(i)).capacity();
+ }
+ }
+ for (unsigned i = PROTO_FIELDS_BEGIN; i < PROTO_FIELDS_END; ++i) {
+ const auto& field = handle.second->ref(static_cast<ProtoField>(i));
+ if (&sync_pb::EntitySpecifics::default_instance() != &field) {
+ entry_size += GetEntitySpecificsSize(field);
stanisc 2016/07/06 21:50:32 Proto fields are often shared which means any cons
ssid 2016/07/19 22:10:35 Done.
+ }
+ }
+ for (unsigned i = ATTACHMENT_METADATA_FIELDS_BEGIN;
+ i < ATTACHMENT_METADATA_FIELDS_END; ++i) {
+ const auto& field =
+ handle.second->ref(static_cast<AttachmentMetadataField>(i));
+ if (&sync_pb::AttachmentMetadata::default_instance() != &field) {
+ entry_size += sizeof(sync_pb::AttachmentMetadata);
stanisc 2016/07/06 21:50:32 The same is here.
ssid 2016/07/19 22:10:35 Done.
+ entry_size +=
+ field.record_size() * (sizeof(sync_pb::AttachmentMetadataRecord) +
+ sizeof(sync_pb::AttachmentIdProto));
+ for (int i = 0; i < field.record_size(); ++i)
+ entry_size += field.record(i).id().unique_id().capacity();
+ }
+ }
+ for (unsigned i = UNIQUE_POSITION_FIELDS_BEGIN;
+ i < UNIQUE_POSITION_FIELDS_END; ++i) {
+ entry_size += handle.second->ref(static_cast<UniquePositionField>(i))
+ .compressed_size();
+ }
+
+ handle.second->set_cached_size(entry_size);
+ total += entry_size;
+ }
+ return total;
+}
+
+void Directory::OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd) {
+ auto dump = pmd->CreateAllocatorDump(base::StringPrintf(
+ "sync/0x%" PRIXPTR, reinterpret_cast<uintptr_t>(this)));
+ dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
+ base::trace_event::MemoryAllocatorDump::kUnitsBytes,
+ GetApproximateMemoryUsage());
+ const char* system_allocator_name =
+ base::trace_event::MemoryDumpManager::GetInstance()
+ ->system_allocator_pool_name();
+ if (system_allocator_name)
+ pmd->AddSuballocation(dump->guid(), system_allocator_name);
+}
+
void Directory::SetDownloadProgress(
ModelType model_type,
const sync_pb::DataTypeProgressMarker& new_progress) {

Powered by Google App Engine
This is Rietveld 408576698