[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 "platform/heap/Heap.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(ThreadSpecific<MemoryUsageProvider>, provider, new ThreadSpecific<MemoryUsageProvider>);
+    return provider;
+}
+
+MemoryUsageProvider::MemoryUsageProvider()
+    : m_isolate(nullptr)
+    , m_previousSize(0)
+{
+}
+
+MemoryUsageProvider::~MemoryUsageProvider()
+{
+}
+
+bool MemoryUsageProvider::adjustAmountOfAllocatedMemory()
+{
+    if (!m_isolate)
+        return false;
+
+    // TODO(peria): Use thread specific heap usage methods, if available.
+    int64_t currentTotalSize = Heap::allocatedObjectSize() + Heap::markedObjectSize();

[haraken, 2016/02/08 11:17:20]

This is not what we want to report.
Heap::allocatedObjectSize()+Heap::markedObjectSize() is the size of the entire
Oilpan's heap.

What we want to do here is to make each ThreadState report the size of Oilpan's
heap of the thread. So I'd suggest:

1) Introduce ThreadState::perThreadAllocatedObjectSize(), which keeps track of
the size of objects that got allocated by the thread since the last GC.

2) Introduce ThreadState::perThreadMarkedObjectSize(), which keeps track of the
size of objects that got marked by the thread in the last GC.

3) Call AdjustAmountOfExternalAllocatedMemory() in
ThreadState::scheduleGCIfNeeded() after the 'isSweepingInProgress()' check. The
reason we want to call AdjustAmountOfExternalAllocatedMemory() after the check
is that ThreadState::perThreadMarkedObjectSize() does not return a correct size
until the thread finishes sweeping.

Note:

- If you implement 1) - 3), you won't need MemoryUsageProvider.

- You can use ThreadState::m_isolate to get the isolate.

[peria, 2016/02/09 06:39:59]

Done.

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