Changeset 125691 in webkit


Ignore:
Timestamp:
Aug 15, 2012 12:08:06 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Rename window.internals.fastMallocStatistics to mallocStatistics
​https://bugs.webkit.org/show_bug.cgi?id=94033

Patch by Scott Graham <​scottmg@chromium.org> on 2012-08-15
Reviewed by Adam Barth.

PerformanceTests:

  • resources/runner.js:

(PerfTestRunner.storeHeapResults):
(PerfTestRunner.getUsedMallocHeap):
(PerfTestRunner.getAndPrintMemoryStatistics):
(PerfTestRunner.initAndStartLoop):

Source/WebCore:

Mechanical rename. In preparation for plumbing allocation information
from allocators that aren't "fastMalloc".

  • 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:
  • loader/DocumentLoader.h:

(WebCore::DocumentLoader::didTellClientAboutLoad):

  • loader/cache/CachedResourceLoader.cpp:

(WebCore::CachedResourceLoader::loadResource):

  • testing/FastMallocStatistics.h: Removed.
  • testing/FastMallocStatistics.idl: Removed.
  • testing/Internals.cpp:

(WebCore::Internals::mallocStatistics):

  • testing/Internals.h:

(WebCore):
(Internals):

  • testing/Internals.idl:
  • testing/MallocStatistics.h: Added.
  • testing/MallocStatistics.idl: Added.

Tools:

  • GNUmakefile.am:
  • Scripts/webkitpy/performance_tests/perftest.py:

(PerfTest):

  • Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py:

(test_run_memory_test):

LayoutTests:

  • fast/harness/fastmallocstatistics-object.html:
Location:
trunk
Files:
22 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r125689 r125691  
     12012-08-15  Scott Graham  <scottmg@chromium.org>
     2
     3        Rename window.internals.fastMallocStatistics to mallocStatistics
     4        https://bugs.webkit.org/show_bug.cgi?id=94033
     5
     6        Reviewed by Adam Barth.
     7
     8        * fast/harness/fastmallocstatistics-object.html:
     9
    1102012-08-15  Ojan Vafai  <ojan@chromium.org>
    211

  • trunk/LayoutTests/fast/harness/fastmallocstatistics-object-expected.txt

    r123773 r125691  
    11PASS [object Internals] is defined.
    2 PASS [object FastMallocStatistics] is defined.
     2PASS [object MallocStatistics] is defined.
    33PASS stats.reservedVMBytes is >= 0
    44PASS stats.committedVMBytes is >= 0

  • trunk/LayoutTests/fast/harness/fastmallocstatistics-object.html

    r123773 r125691  
    66shouldBeDefined(window.internals);
    77
    8 var stats = window.internals.fastMallocStatistics();
     8var stats = window.internals.mallocStatistics();
    99shouldBeDefined(stats);
    1010shouldBeGreaterThanOrEqual("stats.reservedVMBytes", "0");

  • trunk/PerformanceTests/ChangeLog

    r125317 r125691  
     12012-08-15  Scott Graham  <scottmg@chromium.org>
     2
     3        Rename window.internals.fastMallocStatistics to mallocStatistics
     4        https://bugs.webkit.org/show_bug.cgi?id=94033
     5
     6        Reviewed by Adam Barth.
     7
     8        * resources/runner.js:
     9        (PerfTestRunner.storeHeapResults):
     10        (PerfTestRunner.getUsedMallocHeap):
     11        (PerfTestRunner.getAndPrintMemoryStatistics):
     12        (PerfTestRunner.initAndStartLoop):
     13
    1142012-08-10  Ryosuke Niwa  <rniwa@webkit.org>
    215

  • trunk/PerformanceTests/resources/runner.js

    r125194 r125691  
    131131        if (this._jsHeapResults.length) {
    132132            this.logStatistics(this._jsHeapResults, "bytes", "JS Heap:");
    133             this.logStatistics(this._fastMallocHeapResults, "bytes", "FastMalloc:");
     133            this.logStatistics(this._mallocHeapResults, "bytes", "Malloc:");
    134134        }
    135135        if (this._logLines) {
    … …  
    169169        return;
    170170    this._jsHeapResults.push(this.getUsedJSHeap());
    171     this._fastMallocHeapResults.push(this.getUsedFastMallocHeap());
    172 }
    173 
    174 PerfTestRunner.getUsedFastMallocHeap = function() {
    175     var stats = window.internals.fastMallocStatistics();
     171    this._mallocHeapResults.push(this.getUsedMallocHeap());
     172}
     173
     174PerfTestRunner.getUsedMallocHeap = function() {
     175    var stats = window.internals.mallocStatistics();
    176176    return stats.committedVMBytes - stats.freeListBytes;
    177177}
    … …  
    187187    PerfTestRunner.printStatistics(jsMemoryStats, "JS Heap:");
    188188
    189     var fastMallocMemoryStats = PerfTestRunner.computeStatistics([PerfTestRunner.getUsedFastMallocHeap()], "bytes");
    190     PerfTestRunner.printStatistics(fastMallocMemoryStats, "FastMalloc:");
     189    var mallocMemoryStats = PerfTestRunner.computeStatistics([PerfTestRunner.getUsedMallocHeap()], "bytes");
     190    PerfTestRunner.printStatistics(mallocMemoryStats, "Malloc:");
    191191}
    192192
    … …  
    209209    this._results = [];
    210210    this._jsHeapResults = [];
    211     this._fastMallocHeapResults = [];
     211    this._mallocHeapResults = [];
    212212    this._logLines = window.testRunner ? [] : null;
    213213    this.log("Running " + this._runCount + " times");

  • trunk/Source/WebCore/CMakeLists.txt

    r125496 r125691  
    26872687
    26882688SET(WebCoreTestSupport_IDL_FILES
    2689     testing/FastMallocStatistics.idl
    26902689    testing/Internals.idl
    26912690    testing/InternalSettings.idl
     2691    testing/MallocStatistics.idl
    26922692)
    26932693

  • trunk/Source/WebCore/ChangeLog

    r125690 r125691  
     12012-08-15  Scott Graham  <scottmg@chromium.org>
     2
     3        Rename window.internals.fastMallocStatistics to mallocStatistics
     4        https://bugs.webkit.org/show_bug.cgi?id=94033
     5
     6        Reviewed by Adam Barth.
     7
     8        Mechanical rename. In preparation for plumbing allocation information
     9        from allocators that aren't "fastMalloc".
     10
     11        * CMakeLists.txt:
     12        * DerivedSources.make:
     13        * DerivedSources.pri:
     14        * GNUmakefile.list.am:
     15        * Target.pri:
     16        * WebCore.gyp/WebCore.gyp:
     17        * WebCore.gypi:
     18        * WebCore.vcproj/WebCoreTestSupport.vcproj:
     19        * WebCore.xcodeproj/project.pbxproj:
     20        * loader/DocumentLoader.h:
     21        (WebCore::DocumentLoader::didTellClientAboutLoad):
     22        * loader/cache/CachedResourceLoader.cpp:
     23        (WebCore::CachedResourceLoader::loadResource):
     24        * testing/FastMallocStatistics.h: Removed.
     25        * testing/FastMallocStatistics.idl: Removed.
     26        * testing/Internals.cpp:
     27        (WebCore::Internals::mallocStatistics):
     28        * testing/Internals.h:
     29        (WebCore):
     30        (Internals):
     31        * testing/Internals.idl:
     32        * testing/MallocStatistics.h: Added.
     33        * testing/MallocStatistics.idl: Added.
     34
    1352012-08-15  Joshua Netterfield  <jnetterfield@rim.com>
    236

  • trunk/Source/WebCore/DerivedSources.make

    r125251 r125691  
    592592    $(WebCore)/svg/SVGZoomAndPan.idl \
    593593    $(WebCore)/svg/SVGZoomEvent.idl \
    594     $(WebCore)/testing/FastMallocStatistics.idl \
    595594    $(WebCore)/testing/Internals.idl \
    596595    $(WebCore)/testing/InternalSettings.idl \
     596    $(WebCore)/testing/MallocStatistics.idl \
    597597    $(WebCore)/workers/AbstractWorker.idl \
    598598    $(WebCore)/workers/DedicatedWorkerContext.idl \

  • trunk/Source/WebCore/DerivedSources.pri

    r125278 r125691  
    444444    $$PWD/storage/Storage.idl \
    445445    $$PWD/storage/StorageEvent.idl \
    446     $$PWD/testing/FastMallocStatistics.idl \
    447446    $$PWD/testing/Internals.idl \
    448447    $$PWD/testing/InternalSettings.idl \
     448    $$PWD/testing/MallocStatistics.idl \
    449449    $$PWD/workers/AbstractWorker.idl \
    450450    $$PWD/workers/DedicatedWorkerContext.idl \

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

    r125583 r125691  
    16871687        $(WebCore)/svg/SVGZoomAndPan.idl \
    16881688        $(WebCore)/svg/SVGZoomEvent.idl \
    1689         $(WebCore)/testing/FastMallocStatistics.idl \
    16901689        $(WebCore)/testing/Internals.idl \
    16911690        $(WebCore)/testing/InternalSettings.idl \
     1691        $(WebCore)/testing/MallocStatistics.idl \
    16921692        $(WebCore)/workers/AbstractWorker.idl \
    16931693        $(WebCore)/workers/DedicatedWorkerContext.idl \

  • trunk/Source/WebCore/Target.pri

    r125265 r125691  
    26462646    svg/SVGZoomAndPan.h \
    26472647    svg/SVGZoomEvent.h \
    2648     testing/FastMallocStatistics.h \
    26492648    testing/Internals.h \
    26502649    testing/InternalSettings.h \
     2650    testing/MallocStatistics.h \
    26512651    workers/AbstractWorker.h \
    26522652    workers/DedicatedWorkerContext.h \

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

    r125641 r125691  
    22072207      'sources': [
    22082208        '<@(webcore_test_support_files)',
    2209         '<(SHARED_INTERMEDIATE_DIR)/webcore/bindings/V8FastMallocStatistics.cpp',
    2210         '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/V8FastMallocStatistics.h',
     2209        '<(SHARED_INTERMEDIATE_DIR)/webcore/bindings/V8MallocStatistics.cpp',
     2210        '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/V8MallocStatistics.h',
    22112211        '<(SHARED_INTERMEDIATE_DIR)/webcore/bindings/V8Internals.cpp',
    22122212        '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/V8Internals.h',

  • trunk/Source/WebCore/WebCore.gypi

    r125550 r125691  
    62296229        ],
    62306230        'webcore_test_support_idl_files': [
    6231           'testing/FastMallocStatistics.idl',
    62326231          'testing/Internals.idl',
    62336232          'testing/InternalSettings.idl',
     6233          'testing/MallocStatistics.idl',
    62346234        ],
    62356235        'webcore_test_support_files': [
    … …  
    62386238            'testing/js/WebCoreTestSupport.cpp',
    62396239            'testing/js/WebCoreTestSupport.h',
    6240             'testing/FastMallocStatistics.h',
    62416240            'testing/Internals.cpp',
    62426241            'testing/Internals.h',
    62436242            'testing/InternalSettings.cpp',
    62446243            'testing/InternalSettings.h',
     6244            'testing/MallocStatistics.h',
    62456245            'testing/MockPagePopupDriver.cpp',
    62466246            'testing/MockPagePopupDriver.h',

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

    r123773 r125691  
    349349                        >
    350350                        <File
    351                                 RelativePath="$(ConfigurationBuildDir)\obj\WebCore\DerivedSources\JSFastMallocStatistics.cpp"
     351                                RelativePath="$(ConfigurationBuildDir)\obj\WebCore\DerivedSources\JSMallocStatistics.cpp"
    352352                                >
    353353                                <FileConfiguration
    … …  
    413413                        </File>
    414414                        <File
    415                                 RelativePath="$(ConfigurationBuildDir)\obj\WebCore\DerivedSources\JSFastMallocStatistics.h"
     415                                RelativePath="$(ConfigurationBuildDir)\obj\WebCore\DerivedSources\JSMallocStatistics.h"
    416416                                >
    417417                        </File>
    … …  
    557557                        >
    558558                        <File
    559                                 RelativePath="..\testing\FastMallocStatistics.h"
     559                                RelativePath="..\testing\MallocStatistics.h"
    560560                                >
    561561                        </File>

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

    r125550 r125691  
    37983798                A73F95FE12C97BFE0031AAF9 /* RoundedRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A73F95FC12C97BFE0031AAF9 /* RoundedRect.cpp */; };
    37993799                A73F95FF12C97BFE0031AAF9 /* RoundedRect.h in Headers */ = {isa = PBXBuildFile; fileRef = A73F95FD12C97BFE0031AAF9 /* RoundedRect.h */; settings = {ATTRIBUTES = (Private, ); }; };
    3800                 A740B59514C935AB00A77FA4 /* JSFastMallocStatistics.h in Headers */ = {isa = PBXBuildFile; fileRef = A7B4EA6914C9348400C8F5BF /* JSFastMallocStatistics.h */; };
    3801                 A740B59714C935AF00A77FA4 /* JSFastMallocStatistics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7B4EA6814C9348400C8F5BF /* JSFastMallocStatistics.cpp */; };
     3800                A740B59514C935AB00A77FA4 /* JSMallocStatistics.h in Headers */ = {isa = PBXBuildFile; fileRef = A7B4EA6914C9348400C8F5BF /* JSMallocStatistics.h */; };
     3801                A740B59714C935AF00A77FA4 /* JSMallocStatistics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7B4EA6814C9348400C8F5BF /* JSMallocStatistics.cpp */; };
    38023802                A740B5A514C935AB00A77FA4 /* JSInternalSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = A7B4EA7914C9348400C8F5BF /* JSInternalSettings.h */; };
    38033803                A740B5A714C935AF00A77FA4 /* JSInternalSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7B4EA7814C9348400C8F5BF /* JSInternalSettings.cpp */; };
    … …  
    1102011020                A7B070D0130A409C00A3763C /* FrameActionScheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FrameActionScheduler.cpp; sourceTree = "<group>"; };
    1102111021                A7B070D1130A409C00A3763C /* FrameActionScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FrameActionScheduler.h; sourceTree = "<group>"; };
    11022                 A7B4EA6814C9348400C8F5BF /* JSFastMallocStatistics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFastMallocStatistics.cpp; sourceTree = "<group>"; };
    11023                 A7B4EA6914C9348400C8F5BF /* JSFastMallocStatistics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSFastMallocStatistics.h; sourceTree = "<group>"; };
     11022                A7B4EA6814C9348400C8F5BF /* JSMallocStatistics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMallocStatistics.cpp; sourceTree = "<group>"; };
     11023                A7B4EA6914C9348400C8F5BF /* JSMallocStatistics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMallocStatistics.h; sourceTree = "<group>"; };
    1102411024                A7B4EA7814C9348400C8F5BF /* JSInternalSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSInternalSettings.cpp; sourceTree = "<group>"; };
    1102511025                A7B4EA7914C9348400C8F5BF /* JSInternalSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSInternalSettings.h; sourceTree = "<group>"; };
    … …  
    1102811028                A7BBE26411AFB3F20005EA03 /* JSHTMLMeterElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLMeterElement.cpp; sourceTree = "<group>"; };
    1102911029                A7BBE26511AFB3F20005EA03 /* JSHTMLMeterElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSHTMLMeterElement.h; sourceTree = "<group>"; };
    11030                 A7BE7EDD14C9175A0014489D /* FastMallocStatistics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FastMallocStatistics.h; sourceTree = "<group>"; };
    11031                 A7BE7EDE14C9175A0014489D /* FastMallocStatistics.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = FastMallocStatistics.idl; sourceTree = "<group>"; };
     11030                A7BE7EDD14C9175A0014489D /* MallocStatistics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MallocStatistics.h; sourceTree = "<group>"; };
     11031                A7BE7EDE14C9175A0014489D /* MallocStatistics.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MallocStatistics.idl; sourceTree = "<group>"; };
    1103211032                A7BF7EDC14C9175A0014489D /* InternalSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InternalSettings.cpp; sourceTree = "<group>"; };
    1103311033                A7BF7EDD14C9175A0014489D /* InternalSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InternalSettings.h; sourceTree = "<group>"; };
    … …  
    1493214932                        children = (
    1493314933                                41815C1B138319630057AAA4 /* js */,
    14934                                 A7BE7EDD14C9175A0014489D /* FastMallocStatistics.h */,
    14935                                 A7BE7EDE14C9175A0014489D /* FastMallocStatistics.idl */,
     14934                                A7BE7EDD14C9175A0014489D /* MallocStatistics.h */,
     14935                                A7BE7EDE14C9175A0014489D /* MallocStatistics.idl */,
    1493614936                                417DA4CF13734326007C57FB /* Internals.cpp */,
    1493714937                                417DA4CE13734326007C57FB /* Internals.h */,
    … …  
    1494714947                        isa = PBXGroup;
    1494814948                        children = (
    14949                                 A7B4EA6814C9348400C8F5BF /* JSFastMallocStatistics.cpp */,
    14950                                 A7B4EA6914C9348400C8F5BF /* JSFastMallocStatistics.h */,
     14949                                A7B4EA6814C9348400C8F5BF /* JSMallocStatistics.cpp */,
     14950                                A7B4EA6914C9348400C8F5BF /* JSMallocStatistics.h */,
    1495114951                                417DA71B13735DFA007C57FB /* JSInternals.cpp */,
    1495214952                                417DA71C13735DFA007C57FB /* JSInternals.h */,
    … …  
    2211522115                                417DA6DA13734E6E007C57FB /* Internals.h in Headers */,
    2211622116                                A7BF7EE014C9175A0014489D /* InternalSettings.h in Headers */,
    22117                                 A740B59514C935AB00A77FA4 /* JSFastMallocStatistics.h in Headers */,
     22117                                A740B59514C935AB00A77FA4 /* JSMallocStatistics.h in Headers */,
    2211822118                                417DA71E13735DFA007C57FB /* JSInternals.h in Headers */,
    2211922119                                A740B5A514C935AB00A77FA4 /* JSInternalSettings.h in Headers */,
    … …  
    2573725737                                417DA6D913734E6E007C57FB /* Internals.cpp in Sources */,
    2573825738                                A7BF7EDF14C9175A0014489D /* InternalSettings.cpp in Sources */,
    25739                                 A740B59714C935AF00A77FA4 /* JSFastMallocStatistics.cpp in Sources */,
     25739                                A740B59714C935AF00A77FA4 /* JSMallocStatistics.cpp in Sources */,
    2574025740                                417DA71D13735DFA007C57FB /* JSInternals.cpp in Sources */,
    2574125741                                A740B5A714C935AF00A77FA4 /* JSInternalSettings.cpp in Sources */,

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

    r125025 r125691  
    3838#include "ElementShadow.h"
    3939#include "ExceptionCode.h"
    40 #include "FastMallocStatistics.h"
    4140#include "Frame.h"
    4241#include "FrameView.h"
    … …  
    5554#include "IntRect.h"
    5655#include "Language.h"
     56#include "MallocStatistics.h"
    5757#include "NodeRenderingContext.h"
    5858#include "Page.h"
    … …  
    11841184}
    11851185
    1186 PassRefPtr<FastMallocStatistics> Internals::fastMallocStatistics() const
    1187 {
    1188     return FastMallocStatistics::create();
    1189 }
    1190 
    1191 }
     1186PassRefPtr<MallocStatistics> Internals::mallocStatistics() const
     1187{
     1188    return MallocStatistics::create();
     1189}
     1190
     1191}

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

    r124304 r125691  
    5050class ShadowRoot;
    5151class WebKitPoint;
    52 class FastMallocStatistics;
     52class MallocStatistics;
    5353
    5454typedef int ExceptionCode;
    … …  
    209209    void removeURLSchemeRegisteredAsBypassingContentSecurityPolicy(const String& scheme);
    210210
    211     PassRefPtr<FastMallocStatistics> fastMallocStatistics() const;
     211    PassRefPtr<MallocStatistics> mallocStatistics() const;
    212212
    213213private:

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

    r124304 r125691  
    186186        void removeURLSchemeRegisteredAsBypassingContentSecurityPolicy(in DOMString scheme);
    187187
    188         FastMallocStatistics fastMallocStatistics();
     188        MallocStatistics mallocStatistics();
    189189    };
    190190}

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

    r125690 r125691  
    2424 */
    2525
    26 #ifndef FastMallocStatistics_h
    27 #define FastMallocStatistics_h
     26#ifndef MallocStatistics_h
     27#define MallocStatistics_h
    2828
    2929#include <wtf/FastMalloc.h>
    … …  
    3333namespace WebCore {
    3434
    35 class FastMallocStatistics : public RefCounted<FastMallocStatistics> {
     35class MallocStatistics : public RefCounted<MallocStatistics> {
    3636public:
    37     static PassRefPtr<FastMallocStatistics> create() { return adoptRef(new FastMallocStatistics()); }
     37    static PassRefPtr<MallocStatistics> create() { return adoptRef(new MallocStatistics()); }
    3838
    3939    size_t reservedVMBytes() const { return m_stats.reservedVMBytes; }
    … …  
    4242
    4343private:
    44     FastMallocStatistics()
     44    MallocStatistics()
    4545    {
    4646        m_stats = WTF::fastMallocStatistics();

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

    r125690 r125691  
    2727    interface [
    2828        OmitConstructor
    29     ] FastMallocStatistics {
     29    ] MallocStatistics {
    3030        readonly attribute unsigned long reservedVMBytes;
    3131        readonly attribute unsigned long committedVMBytes;

  • trunk/Tools/ChangeLog

    r125683 r125691  
     12012-08-15  Scott Graham  <scottmg@chromium.org>
     2
     3        Rename window.internals.fastMallocStatistics to mallocStatistics
     4        https://bugs.webkit.org/show_bug.cgi?id=94033
     5
     6        Reviewed by Adam Barth.
     7
     8        * GNUmakefile.am:
     9        * Scripts/webkitpy/performance_tests/perftest.py:
     10        (PerfTest):
     11        * Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py:
     12        (test_run_memory_test):
     13
    1142012-08-15  Peter Beverloo  <peter@chromium.org>
    215

  • trunk/Tools/GNUmakefile.am

    r125511 r125691  
    4444        Source/WebCore/bindings/js/JSDOMWrapper.cpp \
    4545        Source/WebCore/bindings/js/JSDOMWrapper.h \
    46         Source/WebCore/testing/FastMallocStatistics.h \
     46        Source/WebCore/testing/MallocStatistics.h \
    4747        Source/WebCore/testing/Internals.cpp \
    4848        Source/WebCore/testing/Internals.h \
    … …  
    5555
    5656libwebcoreinternals_built_sources += \
    57         DerivedSources/WebCore/JSFastMallocStatistics.cpp \
    58         DerivedSources/WebCore/JSFastMallocStatistics.h   \
     57        DerivedSources/WebCore/JSMallocStatistics.cpp \
     58        DerivedSources/WebCore/JSMallocStatistics.h   \
    5959        DerivedSources/WebCore/JSInternals.cpp \
    6060        DerivedSources/WebCore/JSInternals.h   \

  • trunk/Tools/Scripts/webkitpy/performance_tests/perftest.py

    r125332 r125691  
    113113
    114114    _description_regex = re.compile(r'^Description: (?P<description>.*)$', re.IGNORECASE)
    115     _result_classes = ['Time', 'JS Heap', 'FastMalloc']
     115    _result_classes = ['Time', 'JS Heap', 'Malloc']
    116116    _result_class_regex = re.compile(r'^(?P<resultclass>' + r'|'.join(_result_classes) + '):')
    117117    _statistics_keys = ['avg', 'median', 'stdev', 'min', 'max', 'unit']

  • trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py

    r125332 r125691  
    124124max 848000 bytes
    125125
    126 FastMalloc:
     126Malloc:
    127127avg 532000 bytes
    128128median 529000 bytes
    … …  
    275275            'RESULT Parser: memory-test: JSHeap= 832000.0 bytes',
    276276            'median= 829000.0 bytes, stdev= 15000.0 bytes, min= 811000.0 bytes, max= 848000.0 bytes',
    277             'RESULT Parser: memory-test: FastMalloc= 532000.0 bytes',
     277            'RESULT Parser: memory-test: Malloc= 532000.0 bytes',
    278278            'median= 529000.0 bytes, stdev= 13000.0 bytes, min= 511000.0 bytes, max= 548000.0 bytes',
    279279            '', '']))
    … …  
    281281        self.assertEqual(results['Parser/memory-test'], {'min': 1080.0, 'max': 1120.0, 'median': 1101.0, 'stdev': 11.0, 'avg': 1100.0, 'unit': 'ms'})
    282282        self.assertEqual(results['Parser/memory-test:JSHeap'], {'min': 811000.0, 'max': 848000.0, 'median': 829000.0, 'stdev': 15000.0, 'avg': 832000.0, 'unit': 'bytes'})
    283         self.assertEqual(results['Parser/memory-test:FastMalloc'], {'min': 511000.0, 'max': 548000.0, 'median': 529000.0, 'stdev': 13000.0, 'avg': 532000.0, 'unit': 'bytes'})
     283        self.assertEqual(results['Parser/memory-test:Malloc'], {'min': 511000.0, 'max': 548000.0, 'median': 529000.0, 'stdev': 13000.0, 'avg': 532000.0, 'unit': 'bytes'})
    284284
    285285    def _test_run_with_json_output(self, runner, filesystem, upload_suceeds=True, expected_exit_code=0):
Note: See TracChangeset for help on using the changeset viewer.