[Oilpan] Unify memory usage reporters of Oilpan

third_party/WebKit/Source/platform/heap/ThreadState.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 502 matching lines @@
 #endif
 
 #if defined(LEAK_SANITIZER)
     void registerStaticPersistentNode(PersistentNode*);
     void releaseStaticPersistentNodes();
 
     void enterStaticReferenceRegistrationDisabledScope();
     void leaveStaticReferenceRegistrationDisabledScope();
 #endif
 
+    void reportMemoryToV8();
+
+    size_t heapSize();

[sof, 2016/02/15 20:47:36]

This declaration appears to be without a definition.

[peria, 2016/02/16 03:20:20]

removed.

+    size_t allocatedObjectSize() { return m_allocatedObjectSize; }

[sof, 2016/02/15 20:47:36]

These two can be const methods.

And, if concurrent R/W is an issue for these, then you need to symmetrically use
acquireLoad() if you're using atomicAdd() for the other half.

However, I don't understand how such a race can happen -- the thread associated
with the ThreadState is either parked at a safepoint or running the GC. And we
don't support cross-thread heap updates (e.g., in-place expand/shrink of objects
by another thread), so thread contention on these new fields doesn't appear
possible.

[peria, 2016/02/16 03:20:20]

Yes and they should be, but I removed these accessors.
Agree. We don't need to care for thread race.

[sof, 2016/02/16 06:32:56]

If so, why is the latest patchset still using atomicAdd() et al?

+    size_t markedObjectSize() { return m_markedObjectSize; }
+
+    void resetHeapCounters();
+    void increaseAllocatedObjectSize(size_t);
+    void decreaseAllocatedObjectSize(size_t);
+    void increaseMarkedObjectSize(size_t);
+
 private:
     enum SnapshotType {
         HeapSnapshot,
         FreelistSnapshot
     };
 
     ThreadState();
     ~ThreadState();
 
     NO_SANITIZE_ADDRESS void copyStackUntilSafePointScope();
@@ skipping 138 matching lines @@
     size_t m_disabledStaticPersistentsRegistration;
 #endif
 
     // Ideally we want to allocate an array of size |gcInfoTableMax| but it will
     // waste memory. Thus we limit the array size to 2^8 and share one entry
     // with multiple types of vectors. This won't be an issue in practice,
     // since there will be less than 2^8 types of objects in common cases.
     static const int likelyToBePromptlyFreedArraySize = (1 << 8);
     static const int likelyToBePromptlyFreedArrayMask = likelyToBePromptlyFreedArraySize - 1;
     OwnPtr<int[]> m_likelyToBePromptlyFreed;
+
+    // Stats for heap memory of this thread.
+    size_t m_allocatedObjectSize;
+    size_t m_markedObjectSize;
+    size_t m_reportedMemoryToV8;
 };
 
 template<ThreadAffinity affinity> class ThreadStateFor;
 
 template<> class ThreadStateFor<MainThreadOnly> {
     STATIC_ONLY(ThreadStateFor);
 public:
     static ThreadState* state()
     {
         // This specialization must only be used from the main thread.
         ASSERT(ThreadState::current()->isMainThread());
         return ThreadState::mainThreadState();
     }
 };
 
 template<> class ThreadStateFor<AnyThread> {
     STATIC_ONLY(ThreadStateFor);
 public:
     static ThreadState* state() { return ThreadState::current(); }
 };
 
 } // namespace blink
 
 #endif // ThreadState_h