Changeset 123773 in webkit


Ignore:
Timestamp:
Jul 26, 2012 11:16:54 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Add FastMalloc statistics in window.internals
​https://bugs.webkit.org/show_bug.cgi?id=91274

Patch by Olivier Blin <Olivier Blin> on 2012-07-26
Reviewed by Ryosuke Niwa.

Source/WebCore:

Test: fast/harness/fastmallocstatistics-object.html

  • CMakeLists.txt:
  • DerivedSources.make:
  • DerivedSources.pri:
  • GNUmakefile.list.am:
  • Target.pri:
  • WebCore.gyp/WebCore.gyp:
  • WebCore.gypi:
  • WebCore.vcproj/WebCoreTestSupport.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • testing/FastMallocStatistics.h: Added.

(WebCore):
(FastMallocStatistics):
(WebCore::FastMallocStatistics::create):
(WebCore::FastMallocStatistics::reservedVMBytes):
(WebCore::FastMallocStatistics::committedVMBytes):
(WebCore::FastMallocStatistics::freeListBytes):
(WebCore::FastMallocStatistics::FastMallocStatistics):

  • testing/FastMallocStatistics.idl: Added.
  • testing/Internals.cpp:

(WebCore::Internals::fastMallocStatistics):
(WebCore):

  • testing/Internals.h:

(WebCore):
(Internals):

  • testing/Internals.idl:

Tools:

  • GNUmakefile.am:

LayoutTests:

  • fast/harness/fastmallocstatistics-object-expected.txt: Added.
  • fast/harness/fastmallocstatistics-object.html: Added.
Location:
trunk
Files:
4 added
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r123772 r123773  
     12012-07-26  Olivier Blin  <olivier.blin@softathome.com>
     2
     3        Add FastMalloc statistics in window.internals
     4        https://bugs.webkit.org/show_bug.cgi?id=91274
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        * fast/harness/fastmallocstatistics-object-expected.txt: Added.
     9        * fast/harness/fastmallocstatistics-object.html: Added.
     10
    1112012-07-26  Luciano Wolf  <luciano.wolf@openbossa.org>
    212

  • trunk/Source/WebCore/CMakeLists.txt

    r123724 r123773  
    26272627
    26282628SET(WebCoreTestSupport_IDL_FILES
     2629    testing/FastMallocStatistics.idl
    26292630    testing/Internals.idl
    26302631    testing/InternalSettings.idl

  • trunk/Source/WebCore/ChangeLog

    r123772 r123773  
     12012-07-26  Olivier Blin  <olivier.blin@softathome.com>
     2
     3        Add FastMalloc statistics in window.internals
     4        https://bugs.webkit.org/show_bug.cgi?id=91274
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        Test: fast/harness/fastmallocstatistics-object.html
     9
     10        * CMakeLists.txt:
     11        * DerivedSources.make:
     12        * DerivedSources.pri:
     13        * GNUmakefile.list.am:
     14        * Target.pri:
     15        * WebCore.gyp/WebCore.gyp:
     16        * WebCore.gypi:
     17        * WebCore.vcproj/WebCoreTestSupport.vcproj:
     18        * WebCore.xcodeproj/project.pbxproj:
     19        * testing/FastMallocStatistics.h: Added.
     20        (WebCore):
     21        (FastMallocStatistics):
     22        (WebCore::FastMallocStatistics::create):
     23        (WebCore::FastMallocStatistics::reservedVMBytes):
     24        (WebCore::FastMallocStatistics::committedVMBytes):
     25        (WebCore::FastMallocStatistics::freeListBytes):
     26        (WebCore::FastMallocStatistics::FastMallocStatistics):
     27        * testing/FastMallocStatistics.idl: Added.
     28        * testing/Internals.cpp:
     29        (WebCore::Internals::fastMallocStatistics):
     30        (WebCore):
     31        * testing/Internals.h:
     32        (WebCore):
     33        (Internals):
     34        * testing/Internals.idl:
     35
    1362012-07-26  Adrienne Walker  <enne@google.com>
    237

  • trunk/Source/WebCore/DerivedSources.make

    r123722 r123773  
    590590    $(WebCore)/svg/SVGZoomAndPan.idl \
    591591    $(WebCore)/svg/SVGZoomEvent.idl \
     592    $(WebCore)/testing/FastMallocStatistics.idl \
    592593    $(WebCore)/testing/Internals.idl \
    593594    $(WebCore)/testing/InternalSettings.idl \

  • trunk/Source/WebCore/DerivedSources.pri

    r123722 r123773  
    444444    $$PWD/storage/Storage.idl \
    445445    $$PWD/storage/StorageEvent.idl \
     446    $$PWD/testing/FastMallocStatistics.idl \
    446447    $$PWD/testing/Internals.idl \
    447448    $$PWD/testing/InternalSettings.idl \

  • trunk/Source/WebCore/GNUmakefile.list.am

    r123724 r123773  
    994994        $(WebCore)/storage/Storage.idl \
    995995        $(WebCore)/storage/StorageEvent.idl \
     996        $(WebCore)/testing/FastMallocStatistics.idl \
    996997        $(WebCore)/testing/Internals.idl \
    997998        $(WebCore)/testing/InternalSettings.idl \

  • trunk/Source/WebCore/Target.pri

    r123522 r123773  
    26432643    svg/SVGZoomAndPan.h \
    26442644    svg/SVGZoomEvent.h \
     2645    testing/FastMallocStatistics.h \
    26452646    testing/Internals.h \
    26462647    testing/InternalSettings.h \

  • trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

    r123668 r123773  
    21312131      'sources': [
    21322132        '<@(webcore_test_support_files)',
     2133        '<(SHARED_INTERMEDIATE_DIR)/webcore/bindings/V8FastMallocStatistics.cpp',
     2134        '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/V8FastMallocStatistics.h',
    21332135        '<(SHARED_INTERMEDIATE_DIR)/webcore/bindings/V8Internals.cpp',
    21342136        '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/V8Internals.h',

  • trunk/Source/WebCore/WebCore.gypi

    r123768 r123773  
    61976197        ],
    61986198        'webcore_test_support_idl_files': [
     6199          'testing/FastMallocStatistics.idl',
    61996200          'testing/Internals.idl',
    62006201          'testing/InternalSettings.idl',
    … …  
    62056206            'testing/js/WebCoreTestSupport.cpp',
    62066207            'testing/js/WebCoreTestSupport.h',
     6208            'testing/FastMallocStatistics.h',
    62076209            'testing/Internals.cpp',
    62086210            'testing/Internals.h',

  • trunk/Source/WebCore/WebCore.vcproj/WebCoreTestSupport.vcproj

    r112506 r123773  
    349349                        >
    350350                        <File
     351                                RelativePath="$(ConfigurationBuildDir)\obj\WebCore\DerivedSources\JSFastMallocStatistics.cpp"
     352                                >
     353                                <FileConfiguration
     354                                        Name="Debug|Win32"
     355                                        >
     356                                        <Tool
     357                                                Name="VCCLCompilerTool"
     358                                                UsePrecompiledHeader="0"
     359                                                DisableSpecificWarnings="4065;4273;4565;4701;4702"
     360                                                ForcedIncludeFiles="$(NOINHERIT)"
     361                                        />
     362                                </FileConfiguration>
     363                                <FileConfiguration
     364                                        Name="Release|Win32"
     365                                        >
     366                                        <Tool
     367                                                Name="VCCLCompilerTool"
     368                                                UsePrecompiledHeader="0"
     369                                                DisableSpecificWarnings="4065;4273;4565;4701;4702"
     370                                                ForcedIncludeFiles="$(NOINHERIT)"
     371                                        />
     372                                </FileConfiguration>
     373                                <FileConfiguration
     374                                        Name="Debug_Cairo_CFLite|Win32"
     375                                        >
     376                                        <Tool
     377                                                Name="VCCLCompilerTool"
     378                                                UsePrecompiledHeader="0"
     379                                                DisableSpecificWarnings="4065;4273;4565;4701;4702"
     380                                                ForcedIncludeFiles="$(NOINHERIT)"
     381                                        />
     382                                </FileConfiguration>
     383                                <FileConfiguration
     384                                        Name="Release_Cairo_CFLite|Win32"
     385                                        >
     386                                        <Tool
     387                                                Name="VCCLCompilerTool"
     388                                                UsePrecompiledHeader="0"
     389                                                DisableSpecificWarnings="4065;4273;4565;4701;4702"
     390                                                ForcedIncludeFiles="$(NOINHERIT)"
     391                                        />
     392                                </FileConfiguration>
     393                                <FileConfiguration
     394                                        Name="Debug_All|Win32"
     395                                        >
     396                                        <Tool
     397                                                Name="VCCLCompilerTool"
     398                                                UsePrecompiledHeader="0"
     399                                                DisableSpecificWarnings="4065;4273;4565;4701;4702"
     400                                                ForcedIncludeFiles="$(NOINHERIT)"
     401                                        />
     402                                </FileConfiguration>
     403                                <FileConfiguration
     404                                        Name="Production|Win32"
     405                                        >
     406                                        <Tool
     407                                                Name="VCCLCompilerTool"
     408                                                UsePrecompiledHeader="0"
     409                                                DisableSpecificWarnings="4065;4273;4565;4701;4702"
     410                                                ForcedIncludeFiles="$(NOINHERIT)"
     411                                        />
     412                                </FileConfiguration>
     413                        </File>
     414                        <File
     415                                RelativePath="$(ConfigurationBuildDir)\obj\WebCore\DerivedSources\JSFastMallocStatistics.h"
     416                                >
     417                        </File>
     418                        <File
    351419                                RelativePath="$(ConfigurationBuildDir)\obj\WebCore\DerivedSources\JSInternals.cpp"
    352420                                >
    … …  
    488556                        Name="testing"
    489557                        >
     558                        <File
     559                                RelativePath="..\testing\FastMallocStatistics.h"
     560                                >
     561                        </File>
    490562                        <File
    491563                                RelativePath="..\testing\Internals.cpp"

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r123722 r123773  
    37953795                A73F95FE12C97BFE0031AAF9 /* RoundedRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A73F95FC12C97BFE0031AAF9 /* RoundedRect.cpp */; };
    37963796                A73F95FF12C97BFE0031AAF9 /* RoundedRect.h in Headers */ = {isa = PBXBuildFile; fileRef = A73F95FD12C97BFE0031AAF9 /* RoundedRect.h */; settings = {ATTRIBUTES = (Private, ); }; };
     3797                A740B59514C935AB00A77FA4 /* JSFastMallocStatistics.h in Headers */ = {isa = PBXBuildFile; fileRef = A7B4EA6914C9348400C8F5BF /* JSFastMallocStatistics.h */; };
     3798                A740B59714C935AF00A77FA4 /* JSFastMallocStatistics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7B4EA6814C9348400C8F5BF /* JSFastMallocStatistics.cpp */; };
    37973799                A740B5A514C935AB00A77FA4 /* JSInternalSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = A7B4EA7914C9348400C8F5BF /* JSInternalSettings.h */; };
    37983800                A740B5A714C935AF00A77FA4 /* JSInternalSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7B4EA7814C9348400C8F5BF /* JSInternalSettings.cpp */; };
    … …  
    38333835                A7BBE26611AFB3F20005EA03 /* JSHTMLMeterElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7BBE26411AFB3F20005EA03 /* JSHTMLMeterElement.cpp */; };
    38343836                A7BBE26711AFB3F20005EA03 /* JSHTMLMeterElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A7BBE26511AFB3F20005EA03 /* JSHTMLMeterElement.h */; };
     3837                A7BE7EDF14C9175A0014489D /* FastMallocStatistics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7BE7EDC14C9175A0014489D /* FastMallocStatistics.cpp */; };
    38353838                A7BF7EDF14C9175A0014489D /* InternalSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7BF7EDC14C9175A0014489D /* InternalSettings.cpp */; };
    38363839                A7BF7EE014C9175A0014489D /* InternalSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = A7BF7EDD14C9175A0014489D /* InternalSettings.h */; };
    … …  
    1100111004                A7B070D0130A409C00A3763C /* FrameActionScheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FrameActionScheduler.cpp; sourceTree = "<group>"; };
    1100211005                A7B070D1130A409C00A3763C /* FrameActionScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FrameActionScheduler.h; sourceTree = "<group>"; };
     11006                A7B4EA6814C9348400C8F5BF /* JSFastMallocStatistics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFastMallocStatistics.cpp; sourceTree = "<group>"; };
     11007                A7B4EA6914C9348400C8F5BF /* JSFastMallocStatistics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSFastMallocStatistics.h; sourceTree = "<group>"; };
    1100311008                A7B4EA7814C9348400C8F5BF /* JSInternalSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSInternalSettings.cpp; sourceTree = "<group>"; };
    1100411009                A7B4EA7914C9348400C8F5BF /* JSInternalSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSInternalSettings.h; sourceTree = "<group>"; };
    … …  
    1100711012                A7BBE26411AFB3F20005EA03 /* JSHTMLMeterElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLMeterElement.cpp; sourceTree = "<group>"; };
    1100811013                A7BBE26511AFB3F20005EA03 /* JSHTMLMeterElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSHTMLMeterElement.h; sourceTree = "<group>"; };
     11014                A7BE7EDD14C9175A0014489D /* FastMallocStatistics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FastMallocStatistics.h; sourceTree = "<group>"; };
     11015                A7BE7EDE14C9175A0014489D /* FastMallocStatistics.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = FastMallocStatistics.idl; sourceTree = "<group>"; };
    1100911016                A7BF7EDC14C9175A0014489D /* InternalSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InternalSettings.cpp; sourceTree = "<group>"; };
    1101011017                A7BF7EDD14C9175A0014489D /* InternalSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InternalSettings.h; sourceTree = "<group>"; };
    … …  
    1488914896                        children = (
    1489014897                                41815C1B138319630057AAA4 /* js */,
     14898                                A7BE7EDD14C9175A0014489D /* FastMallocStatistics.h */,
     14899                                A7BE7EDE14C9175A0014489D /* FastMallocStatistics.idl */,
    1489114900                                417DA4CF13734326007C57FB /* Internals.cpp */,
    1489214901                                417DA4CE13734326007C57FB /* Internals.h */,
    … …  
    1490214911                        isa = PBXGroup;
    1490314912                        children = (
     14913                                A7B4EA6814C9348400C8F5BF /* JSFastMallocStatistics.cpp */,
     14914                                A7B4EA6914C9348400C8F5BF /* JSFastMallocStatistics.h */,
    1490414915                                417DA71B13735DFA007C57FB /* JSInternals.cpp */,
    1490514916                                417DA71C13735DFA007C57FB /* JSInternals.h */,
    … …  
    2204422055                        buildActionMask = 2147483647;
    2204522056                        files = (
     22057                                A7BE7EE014C9175A0014489D /* FastMallocStatistics.h in Headers */,
    2204622058                                417DA6DA13734E6E007C57FB /* Internals.h in Headers */,
    2204722059                                A7BF7EE014C9175A0014489D /* InternalSettings.h in Headers */,
     22060                                A740B59514C935AB00A77FA4 /* JSFastMallocStatistics.h in Headers */,
    2204822061                                417DA71E13735DFA007C57FB /* JSInternals.h in Headers */,
    2204922062                                A740B5A514C935AB00A77FA4 /* JSInternalSettings.h in Headers */,
    … …  
    2565525668                                417DA6D913734E6E007C57FB /* Internals.cpp in Sources */,
    2565625669                                A7BF7EDF14C9175A0014489D /* InternalSettings.cpp in Sources */,
     25670                                A740B59714C935AF00A77FA4 /* JSFastMallocStatistics.cpp in Sources */,
    2565725671                                417DA71D13735DFA007C57FB /* JSInternals.cpp in Sources */,
    2565825672                                A740B5A714C935AF00A77FA4 /* JSInternalSettings.cpp in Sources */,

  • trunk/Source/WebCore/testing/Internals.cpp

    r123719 r123773  
    3939#include "ElementShadow.h"
    4040#include "ExceptionCode.h"
     41#include "FastMallocStatistics.h"
    4142#include "Frame.h"
    4243#include "FrameView.h"
    … …  
    11691170}
    11701171
    1171 }
     1172PassRefPtr<FastMallocStatistics> Internals::fastMallocStatistics() const
     1173{
     1174    return FastMallocStatistics::create();
     1175}
     1176
     1177}

  • trunk/Source/WebCore/testing/Internals.h

    r123719 r123773  
    5050class ShadowRoot;
    5151class WebKitPoint;
     52class FastMallocStatistics;
    5253
    5354typedef int ExceptionCode;
    … …  
    206207    void removeURLSchemeRegisteredAsBypassingContentSecurityPolicy(const String& scheme);
    207208
     209    PassRefPtr<FastMallocStatistics> fastMallocStatistics() const;
     210
    208211private:
    209212    explicit Internals(Document*);

  • trunk/Source/WebCore/testing/Internals.idl

    r123711 r123773  
    183183        void registerURLSchemeAsBypassingContentSecurityPolicy(in DOMString scheme);
    184184        void removeURLSchemeRegisteredAsBypassingContentSecurityPolicy(in DOMString scheme);
     185
     186        FastMallocStatistics fastMallocStatistics();
    185187    };
    186188}

  • trunk/Tools/ChangeLog

    r123757 r123773  
     12012-07-26  Olivier Blin  <olivier.blin@softathome.com>
     2
     3        Add FastMalloc statistics in window.internals
     4        https://bugs.webkit.org/show_bug.cgi?id=91274
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        * GNUmakefile.am:
     9
    1102012-07-20  Holger Hans Peter Freyther  <holger@moiji-mobile.com>
    211

  • trunk/Tools/GNUmakefile.am

    r122707 r123773  
    4444        Source/WebCore/bindings/js/JSDOMWrapper.cpp \
    4545        Source/WebCore/bindings/js/JSDOMWrapper.h \
     46        Source/WebCore/testing/FastMallocStatistics.h \
    4647        Source/WebCore/testing/Internals.cpp \
    4748        Source/WebCore/testing/Internals.h \
    … …  
    5455
    5556libwebcoreinternals_built_sources += \
     57        DerivedSources/WebCore/JSFastMallocStatistics.cpp \
     58        DerivedSources/WebCore/JSFastMallocStatistics.h   \
    5659        DerivedSources/WebCore/JSInternals.cpp \
    5760        DerivedSources/WebCore/JSInternals.h   \
Note: See TracChangeset for help on using the changeset viewer.