[Oilpan] Unify memory usage reporters of Oilpan

third_party/WebKit/Source/platform/MemoryUsageProvider.cpp

+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "platform/MemoryUsageProvider.h"
+
+#include "public/platform/WebMemoryAllocatorDump.h"
+#include "public/platform/WebProcessMemoryDump.h"
+#include "wtf/Partitions.h"
+#include "wtf/Threading.h"
+#include "wtf/text/WTFString.h"
+
+#include <v8.h>
+
+namespace blink {
+
+MemoryUsageProvider* MemoryUsageProvider::instance()
+{
+    DEFINE_THREAD_SAFE_STATIC_LOCAL(WTF::ThreadSpecific<MemoryUsageProvider>, provider, new WTF::ThreadSpecific<MemoryUsageProvider>);
+    return provider;
+}
+
+MemoryUsageProvider::MemoryUsageProvider()
+    : m_isolate(nullptr)
+    , m_previousSize(0)
+{
+}
+
+MemoryUsageProvider::~MemoryUsageProvider()
+{
+}
+
+void MemoryUsageProvider::adjustAmountOfAllocatedMemory()
+{
+    if (!m_isolate)
+        return;
+
+    int64_t partitionAllocSize = WTF::Partitions::totalSizeOfCommittedPages();
+    int64_t oilpanHeapSize = Heap::allocatedSpace();

[haraken, 2016/02/04 12:00:29]

Heap::allocatedSpace() is the size of mmapped regions. If you want to get the
size of allocated objects, you should use Heap::allocatedObjectSize() +
Heap::markedObjectSize().

Also consider using ThreadState::totalMemorySize(). (Note: Before keishi@
finishes implementing the per-thread heap, ThreadState::totalMemorySize()
returns the size of the entire Oilpan's heap, not the size of the thread's
heap.)

[peria, 2016/02/08 08:41:10]

Done with Heap methods, as we discussed offline.

+    int64_t currentTotalSize = partitionAllocSize + oilpanHeapSize;
+    int64_t diff = currentTotalSize - m_previousSize;
+    m_isolate->AdjustAmountOfExternalAllocatedMemory(diff);
+    m_previousSize = currentTotalSize;
+}
+
+} // namespace blink