Changeset 137892 in webkit

Timestamp:

Dec 17, 2012 3:29:39 AM (11 years ago)

Author:

loislo@chromium.org

Message:

Web Inspector: Native Memory Instrumentation: MemoryInstrumentation doesn't detect reportMemoryUsage method defined in a base class.
​https://bugs.webkit.org/show_bug.cgi?id=105026

Reviewed by Yury Semikhatsky.

Old SFINAE test was replaced with new one based on this article:
​http://stackoverflow.com/questions/1966362/sfinae-to-check-for-inherited-member-functions

Source/WTF:

• wtf/MemoryInstrumentation.h:

(MemoryInstrumentation):
(yes):
(IsInstrumented):
(no):
(WTF::MemoryInstrumentation::IsInstrumented::BaseMixin::reportMemoryUsage):
(WTF::MemoryInstrumentation::selectInstrumentationMethod):
(InstrumentationSelector):
(WTF):
(WTF::::reportObjectMemoryUsage):

Tools:

New test which covers this problem was added.

• TestWebKitAPI/Tests/WTF/MemoryInstrumentationTest.cpp:

Location:

trunk

Files:

• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/MemoryInstrumentation.h (modified) (3 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WTF/MemoryInstrumentationTest.cpp (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2012-12-14  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Web Inspector: Native Memory Instrumentation: MemoryInstrumentation doesn't detect reportMemoryUsage method defined in a base class.
+        https://bugs.webkit.org/show_bug.cgi?id=105026
+
+        Reviewed by Yury Semikhatsky.
+
+        Old SFINAE test was replaced with new one based on this article:
+        http://stackoverflow.com/questions/1966362/sfinae-to-check-for-inherited-member-functions
+
+        * wtf/MemoryInstrumentation.h:
+        (MemoryInstrumentation):
+        (yes):
+        (IsInstrumented):
+        (no):
+        (WTF::MemoryInstrumentation::IsInstrumented::BaseMixin::reportMemoryUsage):
+        (WTF::MemoryInstrumentation::selectInstrumentationMethod):
+        (InstrumentationSelector):
+        (WTF):
+        (WTF::::reportObjectMemoryUsage):
+
 2012-12-14  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/Source/WTF/wtf/MemoryInstrumentation.h

@@ -117 +117 @@
     template<typename T> friend void reportMemoryUsage(const T*, MemoryObjectInfo*);
 
-    template<typename T> static void selectInstrumentationMethod(const T* object, MemoryObjectInfo* memoryObjectInfo)
-    {
-        // If there is reportMemoryUsage method on the object, call it.
-        // Otherwise count only object's self size.
-        reportObjectMemoryUsage<T, void (T::*)(MemoryObjectInfo*) const>(object, memoryObjectInfo, 0);
-    }
-
-    template<typename Type, Type Ptr> struct MemberHelperStruct;
-    template<typename T, typename Type>
-    static void reportObjectMemoryUsage(const T* object, MemoryObjectInfo* memoryObjectInfo,  MemberHelperStruct<Type, &T::reportMemoryUsage>*)
-    {
-        object->reportMemoryUsage(memoryObjectInfo);
-    }
-
-    template<typename T, typename Type>
-    static void reportObjectMemoryUsage(const T* object, MemoryObjectInfo* memoryObjectInfo, ...)
-    {
-        callReportObjectInfo(memoryObjectInfo, object, 0, sizeof(T));
-    }
+    template <typename Type>
+    class IsInstrumented {
+        class yes {
+            char m;
+        };
+
+        class no {
+            yes m[2];
+        };
+
+        struct Mixin {
+            void reportMemoryUsage(MemoryObjectInfo*) const { }
+        };
+
+        struct Derived : public Type, public Mixin { };
+        template <typename T, T t> class Helper { };
+
+        template <typename U> static no deduce(U*, Helper<void (Mixin::*)(MemoryObjectInfo*) const, &U::reportMemoryUsage>* = 0);
+        static yes deduce(...);
+
+    public:
+        static const bool result = sizeof(yes) == sizeof(deduce((Derived*)(0)));
+
+    };
+
+    template <bool>
+    struct InstrumentationSelector {
+        template <typename T> static void reportObjectMemoryUsage(const T*, MemoryObjectInfo*);
+    };
+
     WTF_EXPORT_PRIVATE static void callReportObjectInfo(MemoryObjectInfo*, const void* pointer, MemoryObjectType, size_t objectSize);
 
@@ -189 +200 @@
     MemoryInstrumentationClient* m_client;
 };
+
+template <>
+template <typename T>
+void MemoryInstrumentation::InstrumentationSelector<true>::reportObjectMemoryUsage(const T* object, MemoryObjectInfo* memoryObjectInfo)
+{
+    object->reportMemoryUsage(memoryObjectInfo);
+}
+
+template <>
+template <typename T>
+void MemoryInstrumentation::InstrumentationSelector<false>::reportObjectMemoryUsage(const T* object, MemoryObjectInfo* memoryObjectInfo)
+{
+    callReportObjectInfo(memoryObjectInfo, object, 0, sizeof(T));
+}
 
 class MemoryClassInfo {
@@ -225 +250 @@
 void reportMemoryUsage(const T* object, MemoryObjectInfo* memoryObjectInfo)
 {
-    MemoryInstrumentation::selectInstrumentationMethod<T>(object, memoryObjectInfo);
+    MemoryInstrumentation::InstrumentationSelector<MemoryInstrumentation::IsInstrumented<T>::result>::reportObjectMemoryUsage(object, memoryObjectInfo);
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2012-12-14  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Web Inspector: Native Memory Instrumentation: MemoryInstrumentation doesn't detect reportMemoryUsage method defined in a base class.
+        https://bugs.webkit.org/show_bug.cgi?id=105026
+
+        Reviewed by Yury Semikhatsky.
+
+        Old SFINAE test was replaced with new one based on this article:
+        http://stackoverflow.com/questions/1966362/sfinae-to-check-for-inherited-member-functions
+
+        New test which covers this problem was added.
+
+        * TestWebKitAPI/Tests/WTF/MemoryInstrumentationTest.cpp:
+
 2012-12-17  Oswald Buddenhagen  <oswald.buddenhagen@digia.com>
 

trunk/Tools/TestWebKitAPI/Tests/WTF/MemoryInstrumentationTest.cpp

@@ -873 +873 @@
     EXPECT_EQ(1, client.linkCount());
 }
+
+class DerivedClass : public Instrumented {
+public:
+    size_t m_member;
+};
+
+TEST(MemoryInstrumentationTest, detectBaseClassInstrumentation)
+{
+    OwnPtr<DerivedClass> instance = adoptPtr(new DerivedClass());
+
+    InstrumentationTestHelper helper;
+    helper.addRootObject(instance.get(), TestType);
+    EXPECT_EQ(sizeof(Instrumented) + sizeof(NotInstrumented), helper.reportedSizeForAllTypes());
+    EXPECT_EQ(2u, helper.visitedObjects());
+}
+
 } // namespace