Changeset 127195 in webkit

Timestamp:

Aug 30, 2012 2:56:45 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][WK2] Add WebMemorySampler feature.
​https://bugs.webkit.org/show_bug.cgi?id=91214

Patch by JungJik Lee <​jungjik.lee@samsung.com> on 2012-08-30
Reviewed by Kenneth Rohde Christiansen.

.:

Set WebMemorySampler feature on in EFL port.

• Source/cmake/OptionsEfl.cmake:
• Source/cmake/WebKitFeatures.cmake:
• Source/cmakeconfig.h.cmake:

Source/JavaScriptCore:

WebMemorySampler collects Javascript stack and JIT memory usage in globalMemoryStatistics.

• PlatformEfl.cmake:

Source/WebKit2:

Add WebMemorySampler feature to EFL port. WebMemorySampler records memory usage of
WebProcess and UI Process and also it records application memory status in real time.
Included items on the result are JIT, JS heap, fastmalloc bytes and
application memory info from /proc/process_id/statm.

• PlatformEfl.cmake:
• Shared/linux/WebMemorySamplerLinux.cpp: Added.

(WebKit):
(ApplicationMemoryStats):
(WebKit::nextToken):
(WebKit::appendKeyValuePair):
(WebKit::sampleMemoryAllocatedForApplication):
(WebKit::WebMemorySampler::processName):
(WebKit::WebMemorySampler::sampleWebKit):
(WebKit::WebMemorySampler::sendMemoryPressureEvent):

• UIProcess/API/efl/ewk_context.cpp:

(_Ewk_Context::_Ewk_Context):

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/PlatformEfl.cmake (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/PlatformEfl.cmake (modified) (2 diffs)
• Source/WebKit2/Shared/linux (added)
• Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp (added)
• Source/WebKit2/UIProcess/API/efl/ewk_context.cpp (modified) (2 diffs)
• Source/cmake/OptionsEfl.cmake (modified) (1 diff)
• Source/cmake/WebKitFeatures.cmake (modified) (1 diff)
• Source/cmakeconfig.h.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2012-08-30  JungJik Lee  <jungjik.lee@samsung.com>
+
+        [EFL][WK2] Add WebMemorySampler feature.
+        https://bugs.webkit.org/show_bug.cgi?id=91214
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Set WebMemorySampler feature on in EFL port.
+
+        * Source/cmake/OptionsEfl.cmake:
+        * Source/cmake/WebKitFeatures.cmake:
+        * Source/cmakeconfig.h.cmake:
+
 2012-08-30  Rob Buis  <rbuis@rim.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-08-30  JungJik Lee  <jungjik.lee@samsung.com>
+
+        [EFL][WK2] Add WebMemorySampler feature.
+        https://bugs.webkit.org/show_bug.cgi?id=91214
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        WebMemorySampler collects Javascript stack and JIT memory usage in globalMemoryStatistics.
+
+        * PlatformEfl.cmake:
+
 2012-08-30  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/JavaScriptCore/PlatformEfl.cmake

@@ -2 +2 @@
     jit/ExecutableAllocatorFixedVMPool.cpp
     jit/ExecutableAllocator.cpp
+
+    runtime/MemoryStatistics.cpp
 )
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-08-30  JungJik Lee  <jungjik.lee@samsung.com>
+
+        [EFL][WK2] Add WebMemorySampler feature.
+        https://bugs.webkit.org/show_bug.cgi?id=91214
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Add WebMemorySampler feature to EFL port. WebMemorySampler records memory usage of
+        WebProcess and UI Process and also it records application memory status in real time.
+        Included items on the result are JIT, JS heap, fastmalloc bytes and
+        application memory info from /proc/process_id/statm.
+
+        * PlatformEfl.cmake:
+        * Shared/linux/WebMemorySamplerLinux.cpp: Added.
+        (WebKit):
+        (ApplicationMemoryStats):
+        (WebKit::nextToken):
+        (WebKit::appendKeyValuePair):
+        (WebKit::sampleMemoryAllocatedForApplication):
+        (WebKit::WebMemorySampler::processName):
+        (WebKit::WebMemorySampler::sampleWebKit):
+        (WebKit::WebMemorySampler::sendMemoryPressureEvent):
+        * UIProcess/API/efl/ewk_context.cpp:
+        (_Ewk_Context::_Ewk_Context):
+
 2012-08-30  Pratik Solanki  <psolanki@apple.com>
 

trunk/Source/WebKit2/PlatformEfl.cmake

@@ -16 +16 @@
     Platform/CoreIPC/unix/AttachmentUnix.cpp
 
+    Shared/WebMemorySampler.cpp
+
     Shared/API/c/cairo/WKImageCairo.cpp
 
@@ -28 +30 @@
     Shared/efl/ProcessExecutablePathEfl.cpp
     Shared/efl/WebEventFactory.cpp
+
+    Shared/linux/WebMemorySamplerLinux.cpp
 
     Shared/soup/PlatformCertificateInfo.cpp

trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp

@@ -26 +26 @@
 #include "WKAPICast.h"
 #include "WKContextSoup.h"
+#include "WKNumber.h"
 #include "WKRetainPtr.h"
 #include "WKString.h"
@@ -86 +87 @@
 #endif
 
+#if ENABLE(MEMORY_SAMPLER)
+        static bool initializeMemorySampler = false;
+        static const char environmentVariable[] = "SAMPLE_MEMORY";
+
+        if (!initializeMemorySampler && getenv(environmentVariable)) {
+            WKRetainPtr<WKDoubleRef> interval(AdoptWK, WKDoubleCreate(0.0));
+            WKContextStartMemorySampler(context.get(), interval.get());
+            initializeMemorySampler = true;
+        }
+#endif
         ewk_context_request_manager_client_attach(this);
         ewk_context_download_client_attach(this);

trunk/Source/cmake/OptionsEfl.cmake

@@ -79 +79 @@
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LINK_PREFETCH ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CAPTURE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MICRODATA ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NAVIGATOR_CONTENT_UTILS ON)

trunk/Source/cmake/WebKitFeatures.cmake

@@ -78 +78 @@
     WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_STATISTICS "Toggle Media Statistics support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_STREAM "Toggle Media Stream API support" OFF)
+    WEBKIT_OPTION_DEFINE(ENABLE_MEMORY_SAMPLER "Toggle Memory Sampler support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_METER_ELEMENT "Toggle Meter Tag support" ON)
     WEBKIT_OPTION_DEFINE(ENABLE_MHTML "Toggle MHTML support" OFF)

trunk/Source/cmakeconfig.h.cmake

@@ -68 +68 @@
 #cmakedefine01 ENABLE_MEDIA_CAPTURE
 #cmakedefine01 ENABLE_MEDIA_STREAM
+#cmakedefine01 ENABLE_MEMORY_SAMPLER
 #cmakedefine01 ENABLE_METER_ELEMENT
 #cmakedefine01 ENABLE_MICRODATA