Changeset 246421 in webkit

Timestamp:

Jun 13, 2019, 7:30:48 PM (7 years ago)

Author:

Kocsen Chung

Message:

Apply patch. rdar://problem/51656608

Location:

branches/safari-607-branch

Files:

• Source/bmalloc/ChangeLog (modified) (1 diff)
• Source/bmalloc/bmalloc.xcodeproj/project.pbxproj (modified) (15 diffs)
• Source/bmalloc/bmalloc/IsoDirectory.h (modified) (2 diffs)
• Source/bmalloc/bmalloc/IsoDirectoryInlines.h (modified) (4 diffs)
• Source/bmalloc/bmalloc/IsoHeapImpl.h (modified) (3 diffs)
• Source/bmalloc/bmalloc/IsoHeapImplInlines.h (modified) (5 diffs)
• Source/bmalloc/bmalloc/IsoTLS.cpp (modified) (1 diff)
• Source/bmalloc/bmalloc/ProcessCheck.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (modified) (5 diffs)
• Tools/TestWebKitAPI/Tests/WTF/bmalloc (added)
• Tools/TestWebKitAPI/Tests/WTF/bmalloc/IsoHeap.cpp (moved) (moved from branches/safari-607-branch/Source/bmalloc/test/testbmalloc.cpp ) (12 diffs)

branches/safari-607-branch/Source/bmalloc/ChangeLog

@@ +1 @@
+2019-06-13  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Apply patch. rdar://problem/51656608
+
+    2019-06-13  Keith Miller  <keith_miller@apple.com>
+
+            IsoHeaps don't notice uncommitted VA becoming the first eligible.
+            https://bugs.webkit.org/show_bug.cgi?id=198301
+
+            Reviewed by Yusuke Suzuki.
+
+            IsoDirectory has a firstEligible member that is used as an
+            optimization to help find the first fit. However if the scavenger
+            decommitted a page before firstEligible then we wouldn't move
+            firstEligible. Thus, if no space is ever freed below firstEligible
+            we will never reused the decommitted memory (e.g. if the VA page
+            is decommitted). The fix is to make IsoDirectory::didDecommit move
+            the firstEligible page back if the decommitted page is smaller
+            than the current firstEligible. As such, this patch renames
+            firstEligible to firstEligibleOrDecommitted.
+
+            Also, this patch changes gigacageEnabledForProcess to check if the
+            process starts with Test rather than just test as TestWTF does.
+
+            Lastly, unbeknownst to me IsoHeaps are dependent on gigacage, so
+            by removing gigacage from arm64 I accidentally disabled
+            IsoHeaps...
+
+            * bmalloc.xcodeproj/project.pbxproj:
+            * bmalloc/IsoDirectory.h:
+            * bmalloc/IsoDirectoryInlines.h:
+            (bmalloc::passedNumPages>::takeFirstEligible):
+            (bmalloc::passedNumPages>::didBecome):
+            (bmalloc::passedNumPages>::didDecommit):
+            * bmalloc/IsoHeapImpl.h:
+            * bmalloc/IsoHeapImplInlines.h:
+            (bmalloc::IsoHeapImpl<Config>::takeFirstEligible):
+            (bmalloc::IsoHeapImpl<Config>::didBecomeEligibleOrDecommited):
+            (bmalloc::IsoHeapImpl<Config>::didCommit):
+            (bmalloc::IsoHeapImpl<Config>::didBecomeEligible): Deleted.
+            * bmalloc/IsoTLS.cpp:
+            (bmalloc::IsoTLS::determineMallocFallbackState):
+            * bmalloc/ProcessCheck.mm:
+            (bmalloc::gigacageEnabledForProcess):
+
 2019-01-23  Alan Coon  <alancoon@apple.com>
 

branches/safari-607-branch/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj

@@ -34 +34 @@
                 0F74B93E1F89713E00B935D3 /* CryptoRandom.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F74B93C1F89713E00B935D3 /* CryptoRandom.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 0F74B93F1F89713E00B935D3 /* CryptoRandom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F74B93D1F89713E00B935D3 /* CryptoRandom.cpp */; };
-                0F7EB7F21F95285300F1ABCB /* testbmalloc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F7EB7F11F95285300F1ABCB /* testbmalloc.cpp */; };
-                0F7EB7FA1F95414C00F1ABCB /* libbmalloc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14F271BE18EA3963008C152F /* libbmalloc.a */; };
                 0F7EB8231F9541B000F1ABCB /* EligibilityResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F7EB7FC1F9541AD00F1ABCB /* EligibilityResult.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 0F7EB8241F9541B000F1ABCB /* IsoHeapImplInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F7EB7FD1F9541AD00F1ABCB /* IsoHeapImplInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -144 +142 @@
 
 /* Begin PBXContainerItemProxy section */
-                0F7EB7F71F95412900F1ABCB /* PBXContainerItemProxy */ = {
-                        isa = PBXContainerItemProxy;
-                        containerPortal = 145F6837179DC45F00D65598 /* Project object */;
-                        proxyType = 1;
-                        remoteGlobalIDString = 14F271BD18EA3963008C152F;
-                        remoteInfo = bmalloc;
-                };
                 0F7EB8551F95505400F1ABCB /* PBXContainerItemProxy */ = {
                         isa = PBXContainerItemProxy;
@@ -166 +157 @@
                 };
 /* End PBXContainerItemProxy section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-                0F7EB7ED1F95285300F1ABCB /* CopyFiles */ = {
-                        isa = PBXCopyFilesBuildPhase;
-                        buildActionMask = 2147483647;
-                        dstPath = /usr/share/man/man1/;
-                        dstSubfolderSpec = 0;
-                        files = (
-                        );
-                        runOnlyForDeploymentPostprocessing = 1;
-                };
-/* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
@@ -192 +171 @@
                 0F74B93C1F89713E00B935D3 /* CryptoRandom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CryptoRandom.h; path = bmalloc/CryptoRandom.h; sourceTree = "<group>"; };
                 0F74B93D1F89713E00B935D3 /* CryptoRandom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CryptoRandom.cpp; path = bmalloc/CryptoRandom.cpp; sourceTree = "<group>"; };
-                0F7EB7EF1F95285300F1ABCB /* testbmalloc */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testbmalloc; sourceTree = BUILT_PRODUCTS_DIR; };
-                0F7EB7F11F95285300F1ABCB /* testbmalloc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = testbmalloc.cpp; sourceTree = "<group>"; };
                 0F7EB7FC1F9541AD00F1ABCB /* EligibilityResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EligibilityResult.h; path = bmalloc/EligibilityResult.h; sourceTree = SOURCE_ROOT; };
                 0F7EB7FD1F9541AD00F1ABCB /* IsoHeapImplInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IsoHeapImplInlines.h; path = bmalloc/IsoHeapImplInlines.h; sourceTree = SOURCE_ROOT; };
@@ -307 +284 @@
 
 /* Begin PBXFrameworksBuildPhase section */
-                0F7EB7EC1F95285300F1ABCB /* Frameworks */ = {
-                        isa = PBXFrameworksBuildPhase;
-                        buildActionMask = 2147483647;
-                        files = (
-                                0F7EB7FA1F95414C00F1ABCB /* libbmalloc.a in Frameworks */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
-                };
                 14CC394118EA8743004AFE34 /* Frameworks */ = {
                         isa = PBXFrameworksBuildPhase;
@@ -334 +303 @@
 
 /* Begin PBXGroup section */
-                0F7EB7F01F95285300F1ABCB /* test */ = {
-                        isa = PBXGroup;
-                        children = (
-                                0F7EB7F11F95285300F1ABCB /* testbmalloc.cpp */,
-                        );
-                        path = test;
-                        sourceTree = "<group>";
-                };
                 0F7EB7F91F95414C00F1ABCB /* Frameworks */ = {
                         isa = PBXGroup;
@@ -422 +383 @@
                                 145F6840179DC45F00D65598 /* Products */,
                                 14D9DB4F17F2868900EAAB79 /* stdlib */,
-                                0F7EB7F01F95285300F1ABCB /* test */,
                         );
                         sourceTree = "<group>";
@@ -429 +389 @@
                         isa = PBXGroup;
                         children = (
-                                0F7EB7EF1F95285300F1ABCB /* testbmalloc */,
                                 14F271BE18EA3963008C152F /* libbmalloc.a */,
                                 14CC394418EA8743004AFE34 /* libmbmalloc.dylib */,
@@ -666 +625 @@
 
 /* Begin PBXNativeTarget section */
-                0F7EB7EE1F95285300F1ABCB /* testbmalloc */ = {
-                        isa = PBXNativeTarget;
-                        buildConfigurationList = 0F7EB7F61F95285300F1ABCB /* Build configuration list for PBXNativeTarget "testbmalloc" */;
-                        buildPhases = (
-                                0F7EB7EB1F95285300F1ABCB /* Sources */,
-                                0F7EB7EC1F95285300F1ABCB /* Frameworks */,
-                                0F7EB7ED1F95285300F1ABCB /* CopyFiles */,
-                        );
-                        buildRules = (
-                        );
-                        dependencies = (
-                                0F7EB7F81F95412900F1ABCB /* PBXTargetDependency */,
-                        );
-                        name = testbmalloc;
-                        productName = testbmalloc;
-                        productReference = 0F7EB7EF1F95285300F1ABCB /* testbmalloc */;
-                        productType = "com.apple.product-type.tool";
-                };
                 14CC394318EA8743004AFE34 /* mbmalloc */ = {
                         isa = PBXNativeTarget;
@@ -728 +669 @@
                                 LastUpgradeCheck = 1000;
                                 TargetAttributes = {
-                                        0F7EB7EE1F95285300F1ABCB = {
-                                                CreatedOnToolsVersion = 9.0;
-                                                ProvisioningStyle = Manual;
-                                        };
                                         0F7EB8501F95504B00F1ABCB = {
                                                 CreatedOnToolsVersion = 9.0;
@@ -753 +690 @@
                                 14F271BD18EA3963008C152F /* bmalloc */,
                                 14CC394318EA8743004AFE34 /* mbmalloc */,
-                                0F7EB7EE1F95285300F1ABCB /* testbmalloc */,
                         );
                 };
@@ -759 +695 @@
 
 /* Begin PBXSourcesBuildPhase section */
-                0F7EB7EB1F95285300F1ABCB /* Sources */ = {
-                        isa = PBXSourcesBuildPhase;
-                        buildActionMask = 2147483647;
-                        files = (
-                                0F7EB7F21F95285300F1ABCB /* testbmalloc.cpp in Sources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
-                };
                 14CC394018EA8743004AFE34 /* Sources */ = {
                         isa = PBXSourcesBuildPhase;
@@ -813 +741 @@
 
 /* Begin PBXTargetDependency section */
-                0F7EB7F81F95412900F1ABCB /* PBXTargetDependency */ = {
-                        isa = PBXTargetDependency;
-                        target = 14F271BD18EA3963008C152F /* bmalloc */;
-                        targetProxy = 0F7EB7F71F95412900F1ABCB /* PBXContainerItemProxy */;
-                };
                 0F7EB8561F95505400F1ABCB /* PBXTargetDependency */ = {
                         isa = PBXTargetDependency;
@@ -831 +754 @@
 
 /* Begin XCBuildConfiguration section */
-                0F7EB7F31F95285300F1ABCB /* Debug */ = {
-                        isa = XCBuildConfiguration;
-                        baseConfigurationReference = 14B650C718F39F4800751968 /* DebugRelease.xcconfig */;
-                        buildSettings = {
-                                PRODUCT_NAME = "$(TARGET_NAME)";
-                        };
-                        name = Debug;
-                };
-                0F7EB7F41F95285300F1ABCB /* Release */ = {
-                        isa = XCBuildConfiguration;
-                        baseConfigurationReference = 14B650C718F39F4800751968 /* DebugRelease.xcconfig */;
-                        buildSettings = {
-                                PRODUCT_NAME = "$(TARGET_NAME)";
-                        };
-                        name = Release;
-                };
-                0F7EB7F51F95285300F1ABCB /* Production */ = {
-                        isa = XCBuildConfiguration;
-                        baseConfigurationReference = 14B650C518F39F4800751968 /* Base.xcconfig */;
-                        buildSettings = {
-                                PRODUCT_NAME = "$(TARGET_NAME)";
-                        };
-                        name = Production;
-                };
                 0F7EB8521F95504B00F1ABCB /* Debug */ = {
                         isa = XCBuildConfiguration;
@@ -949 +848 @@
 
 /* Begin XCConfigurationList section */
-                0F7EB7F61F95285300F1ABCB /* Build configuration list for PBXNativeTarget "testbmalloc" */ = {
-                        isa = XCConfigurationList;
-                        buildConfigurations = (
-                                0F7EB7F31F95285300F1ABCB /* Debug */,
-                                0F7EB7F41F95285300F1ABCB /* Release */,
-                                0F7EB7F51F95285300F1ABCB /* Production */,
-                        );
-                        defaultConfigurationIsVisible = 0;
-                        defaultConfigurationName = Production;
-                };
                 0F7EB8511F95504B00F1ABCB /* Build configuration list for PBXAggregateTarget "All" */ = {
                         isa = XCConfigurationList;

branches/safari-607-branch/Source/bmalloc/bmalloc/IsoDirectory.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2017-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2017-2019 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -90 +90 @@
     Bits<numPages> m_committed;
     std::array<IsoPage<Config>*, numPages> m_pages;
-    unsigned m_firstEligible { 0 };
+    unsigned m_firstEligibleOrDecommitted { 0 };
     unsigned m_highWatermark { 0 };
 };

branches/safari-607-branch/Source/bmalloc/bmalloc/IsoDirectoryInlines.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2017-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2017-2019 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47 +47 @@
 EligibilityResult<Config> IsoDirectory<Config, passedNumPages>::takeFirstEligible()
 {
-    unsigned pageIndex = (m_eligible | ~m_committed).findBit(m_firstEligible, true);
-    m_firstEligible = pageIndex;
+    unsigned pageIndex = (m_eligible | ~m_committed).findBit(m_firstEligibleOrDecommitted, true);
+    m_firstEligibleOrDecommitted = pageIndex;
+    BASSERT((m_eligible | ~m_committed).findBit(0, true) == pageIndex);
     if (pageIndex >= numPages)
         return EligibilityKind::Full;
@@ -100 +101 @@
             fprintf(stderr, "%p: %p did become eligible.\n", this, page);
         m_eligible[pageIndex] = true;
-        m_firstEligible = std::min(m_firstEligible, pageIndex);
-        this->m_heap.didBecomeEligible(this);
+        m_firstEligibleOrDecommitted = std::min(m_firstEligibleOrDecommitted, pageIndex);
+        this->m_heap.didBecomeEligibleOrDecommited(this);
         return;
     case IsoPageTrigger::Empty:
@@ -125 +126 @@
     this->m_heap.isNoLongerFreeable(m_pages[index], IsoPageBase::pageSize);
     m_committed[index] = false;
+    m_firstEligibleOrDecommitted = std::min(m_firstEligibleOrDecommitted, index);
+    this->m_heap.didBecomeEligibleOrDecommited(this);
     this->m_heap.didDecommit(m_pages[index], IsoPageBase::pageSize);
 }

branches/safari-607-branch/Source/bmalloc/bmalloc/IsoHeapImpl.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2017-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2017-2019 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -69 +69 @@
     
     // Callbacks from directory.
-    void didBecomeEligible(IsoDirectory<Config, numPagesInInlineDirectory>*);
-    void didBecomeEligible(IsoDirectory<Config, IsoDirectoryPage<Config>::numPages>*);
+    void didBecomeEligibleOrDecommited(IsoDirectory<Config, numPagesInInlineDirectory>*);
+    void didBecomeEligibleOrDecommited(IsoDirectory<Config, IsoDirectoryPage<Config>::numPages>*);
     
     void scavenge(Vector<DeferredDecommit>&) override;
@@ -121 +121 @@
     unsigned m_directoryHighWatermark { 0 };
     
-    bool m_isInlineDirectoryEligible { true };
-    IsoDirectoryPage<Config>* m_firstEligibleDirectory { nullptr };
+    bool m_isInlineDirectoryEligibleOrDecommitted { true };
+    IsoDirectoryPage<Config>* m_firstEligibleOrDecommitedDirectory { nullptr };
     
     IsoTLSAllocatorEntry<Config> m_allocator;

branches/safari-607-branch/Source/bmalloc/bmalloc/IsoHeapImplInlines.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2017-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2017-2019 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43 +43 @@
 EligibilityResult<Config> IsoHeapImpl<Config>::takeFirstEligible()
 {
-    if (m_isInlineDirectoryEligible) {
+    if (m_isInlineDirectoryEligibleOrDecommitted) {
         EligibilityResult<Config> result = m_inlineDirectory.takeFirstEligible();
         if (result.kind == EligibilityKind::Full)
-            m_isInlineDirectoryEligible = false;
+            m_isInlineDirectoryEligibleOrDecommitted = false;
         else
             return result;
     }
     
-    if (!m_firstEligibleDirectory) {
+    if (!m_firstEligibleOrDecommitedDirectory) {
         // If nothing is eligible, it can only be because we have no directories. It wouldn't be the end
-        // of the world if we broke this invariant. It would only mean that didBecomeEligible() would need
+        // of the world if we broke this invariant. It would only mean that didBecomeEligibleOrDecommited() would need
         // a null check.
         RELEASE_BASSERT(!m_headDirectory);
@@ -59 +59 @@
     }
     
-    for (; m_firstEligibleDirectory; m_firstEligibleDirectory = m_firstEligibleDirectory->next) {
-        EligibilityResult<Config> result = m_firstEligibleDirectory->payload.takeFirstEligible();
+    for (; m_firstEligibleOrDecommitedDirectory; m_firstEligibleOrDecommitedDirectory = m_firstEligibleOrDecommitedDirectory->next) {
+        EligibilityResult<Config> result = m_firstEligibleOrDecommitedDirectory->payload.takeFirstEligible();
         if (result.kind != EligibilityKind::Full) {
-            m_directoryHighWatermark = std::max(m_directoryHighWatermark, m_firstEligibleDirectory->index());
+            m_directoryHighWatermark = std::max(m_directoryHighWatermark, m_firstEligibleOrDecommitedDirectory->index());
             return result;
         }
@@ -77 +77 @@
     }
     m_directoryHighWatermark = newDirectory->index();
-    m_firstEligibleDirectory = newDirectory;
+    m_firstEligibleOrDecommitedDirectory = newDirectory;
     EligibilityResult<Config> result = newDirectory->payload.takeFirstEligible();
     RELEASE_BASSERT(result.kind != EligibilityKind::Full);
@@ -84 +84 @@
 
 template<typename Config>
-void IsoHeapImpl<Config>::didBecomeEligible(IsoDirectory<Config, numPagesInInlineDirectory>* directory)
+void IsoHeapImpl<Config>::didBecomeEligibleOrDecommited(IsoDirectory<Config, numPagesInInlineDirectory>* directory)
 {
     RELEASE_BASSERT(directory == &m_inlineDirectory);
-    m_isInlineDirectoryEligible = true;
-}
-
-template<typename Config>
-void IsoHeapImpl<Config>::didBecomeEligible(IsoDirectory<Config, IsoDirectoryPage<Config>::numPages>* directory)
-{
-    RELEASE_BASSERT(m_firstEligibleDirectory);
+    m_isInlineDirectoryEligibleOrDecommitted = true;
+}
+
+template<typename Config>
+void IsoHeapImpl<Config>::didBecomeEligibleOrDecommited(IsoDirectory<Config, IsoDirectoryPage<Config>::numPages>* directory)
+{
+    RELEASE_BASSERT(m_firstEligibleOrDecommitedDirectory);
     auto* directoryPage = IsoDirectoryPage<Config>::pageFor(directory);
-    if (directoryPage->index() < m_firstEligibleDirectory->index())
-        m_firstEligibleDirectory = directoryPage;
+    if (directoryPage->index() < m_firstEligibleOrDecommitedDirectory->index())
+        m_firstEligibleOrDecommitedDirectory = directoryPage;
 }
 

branches/safari-607-branch/Source/bmalloc/bmalloc/IsoTLS.cpp

@@ -206 +206 @@
                 return;
 
-#if GIGACAGE_ENABLED
+#if GIGACAGE_ENABLED || BCPU(ARM64)
+#if !BCPU(ARM64)
             if (!Gigacage::shouldBeEnabled()) {
                 s_mallocFallbackState = MallocFallbackState::FallBackToMalloc;
                 return;
             }
+#endif
             const char* env = getenv("bmalloc_IsoHeap");
             if (env && (!strcasecmp(env, "false") || !strcasecmp(env, "no") || !strcmp(env, "0")))

branches/safari-607-branch/Source/bmalloc/bmalloc/ProcessCheck.mm

@@ -47 +47 @@
         || [processName isEqualToString:@"DumpRenderTree"]
         || [processName isEqualToString:@"wasm"]
-        || [processName hasPrefix:@"test"];
+        || [processName hasPrefix:@"test"]
+        || [processName hasPrefix:@"Test"];
 
     return isOptInBinary;

branches/safari-607-branch/Tools/ChangeLog

@@ +1 @@
+2019-06-13  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Apply patch. rdar://problem/51656608
+
+    2019-06-13  Keith Miller  <keith_miller@apple.com>
+
+            IsoHeaps don't notice uncommitted VA becoming the first eligible.
+            https://bugs.webkit.org/show_bug.cgi?id=198301
+
+            Reviewed by Yusuke Suzuki.
+
+            Move testbmalloc.cpp to TestWTF so it runs in automation.
+
+            * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+            * TestWebKitAPI/Tests/WTF/bmalloc/IsoHeap.cpp: Renamed from Source/bmalloc/test/testbmalloc.cpp.
+            (TEST):
+
 2019-06-12  Null  <null@apple.com>
 

branches/safari-607-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

@@ -259 +259 @@
                 536770361CC81B6100D425B1 /* WebScriptObjectDescription.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 536770351CC812F900D425B1 /* WebScriptObjectDescription.html */; };
                 53EC25411E96FD87000831B9 /* PriorityQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53EC253F1E96BC80000831B9 /* PriorityQueue.cpp */; };
+                53FCDE6B229EFFB900598ECF /* IsoHeap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53FCDE6A229EFFB900598ECF /* IsoHeap.cpp */; };
                 55226A2F1EBA44B900C36AD0 /* large-red-square-image.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 55226A2E1EB969B600C36AD0 /* large-red-square-image.html */; };
                 5597F8361D9596C80066BC21 /* SynchronizedFixedQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5597F8341D9596C80066BC21 /* SynchronizedFixedQueue.cpp */; };
@@ -1640 +1641 @@
                 536770351CC812F900D425B1 /* WebScriptObjectDescription.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = WebScriptObjectDescription.html; sourceTree = "<group>"; };
                 53EC253F1E96BC80000831B9 /* PriorityQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PriorityQueue.cpp; sourceTree = "<group>"; };
+                53FCDE6A229EFFB900598ECF /* IsoHeap.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = IsoHeap.cpp; sourceTree = "<group>"; };
                 55226A2E1EB969B600C36AD0 /* large-red-square-image.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "large-red-square-image.html"; sourceTree = "<group>"; };
                 5597F8341D9596C80066BC21 /* SynchronizedFixedQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SynchronizedFixedQueue.cpp; sourceTree = "<group>"; };
@@ -2742 +2744 @@
                         sourceTree = "<group>";
                 };
+                53FCDE69229EFF6800598ECF /* bmalloc */ = {
+                        isa = PBXGroup;
+                        children = (
+                                53FCDE6A229EFFB900598ECF /* IsoHeap.cpp */,
+                        );
+                        path = bmalloc;
+                        sourceTree = "<group>";
+                };
                 7560917619259C59009EF06E /* ios */ = {
                         isa = PBXGroup;
@@ -3198 +3208 @@
                         isa = PBXGroup;
                         children = (
+                                53FCDE69229EFF6800598ECF /* bmalloc */,
                                 C0991C4F143C7D68007998F2 /* cf */,
                                 E3C21A7821B25C82003B31A3 /* cocoa */,
@@ -3833 +3844 @@
                                 7C83DED41D0A590C00FEBCF3 /* HashSet.cpp in Sources */,
                                 7C83DEE01D0A590C00FEBCF3 /* IntegerToStringConversion.cpp in Sources */,
+                                53FCDE6B229EFFB900598ECF /* IsoHeap.cpp in Sources */,
                                 7A0509411FB9F06400B33FB8 /* JSONValue.cpp in Sources */,
                                 531C1D8E1DF8EF72006E979F /* LEBDecoder.cpp in Sources */,

branches/safari-607-branch/Tools/TestWebKitAPI/Tests/WTF/bmalloc/IsoHeap.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2017-2019 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -11 +11 @@
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include "config.h"
+
+#if !USE(SYSTEM_MALLOC)
 
 #include <bmalloc/bmalloc.h>
 #include <bmalloc/Environment.h>
 #include <bmalloc/IsoHeapInlines.h>
+
 #include <cmath>
 #include <cstdlib>
@@ -35 +40 @@
 using namespace bmalloc::api;
 
-// We don't have a NO_RETURN_DUE_TO_EXIT, nor should we. That's ridiculous.
-static bool hiddenTruthBecauseNoReturnIsStupid() { return true; }
-
-static void usage()
-{
-    puts("Usage: testb3 [<filter>]");
-    if (hiddenTruthBecauseNoReturnIsStupid())
-        exit(1);
-}
-
 #define RUN(test) do {                          \
-        if (!shouldRun(#test))                  \
-            break;                              \
-        puts(#test "...");                      \
-        test;                                   \
-        puts(#test ": OK!");                    \
-    } while (false)
+if (!shouldRun(#test))                  \
+break;                              \
+puts(#test "...");                      \
+test;                                   \
+puts(#test ": OK!");                    \
+} while (false)
 
 // Nothing fancy for now; we just use the existing WTF assertion machinery.
 #define CHECK(x) do {                                                   \
-        if (!!(x))                                                      \
-            break;                                                      \
-        fprintf(stderr, "%s:%d: in %s: assertion %s failed.\n",         \
-            __FILE__, __LINE__, __PRETTY_FUNCTION__, #x);               \
-        abort();                                                        \
-    } while (false)
+if (!!(x))                                                      \
+break;                                                      \
+fprintf(stderr, "%s:%d: in %s: assertion %s failed.\n",         \
+__FILE__, __LINE__, __PRETTY_FUNCTION__, #x);               \
+abort();                                                        \
+} while (false)
 
 static std::set<void*> toptrset(const std::vector<void*>& ptrs)
@@ -139 +134 @@
 }
 
-static void testIsoSimple()
+TEST(bmalloc, IsoSimple)
 {
     static IsoHeap<double> heap;
@@ -154 +149 @@
 }
 
-static void testIsoSimpleScavengeBeforeDealloc()
+TEST(bmalloc, IsoSimpleScavengeBeforeDealloc)
 {
     static IsoHeap<double> heap;
@@ -170 +165 @@
 }
 
-static void testIsoFlipFlopFragmentedPages()
+TEST(bmalloc, IsoFlipFlopFragmentedPages)
 {
     static IsoHeap<double> heap;
@@ -190 +185 @@
 }
 
-static void testIsoFlipFlopFragmentedPagesScavengeInMiddle()
+TEST(bmalloc, IsoFlipFlopFragmentedPagesScavengeInMiddle)
 {
     static IsoHeap<double> heap;
@@ -223 +218 @@
 }
 
-static void testIsoFlipFlopFragmentedPagesScavengeInMiddle288()
+TEST(bmalloc, IsoFlipFlopFragmentedPagesScavengeInMiddle288)
 {
     static IsoHeap<char[288]> heap;
@@ -264 +259 @@
     {
     }
-    
+
     int x;
     float y;
@@ -271 +266 @@
 MAKE_BISO_MALLOCED_IMPL(BisoMalloced);
 
-static void testBisoMalloced()
+TEST(bmalloc, BisoMalloced)
 {
     BisoMalloced* ptr = new BisoMalloced(4, 5);
@@ -287 +282 @@
     {
     }
-    
+
     int x;
     float y;
 };
 
-static void testBisoMallocedInline()
+TEST(bmalloc, BisoMallocedInline)
 {
     BisoMallocedInline* ptr = new BisoMallocedInline(4, 5);
@@ -300 +295 @@
 }
 
-static void run(const char* filter)
-{
-    auto shouldRun = [&] (const char* testName) -> bool {
-        return !filter || !!strcasestr(testName, filter);
+
+TEST(bmalloc, ScavengedMemoryShouldBeReused)
+{
+    static IsoHeap<double> heap;
+
+    auto run = [] (unsigned numPagesToCommit) {
+        auto* ptr1 = heap.allocate();
+
+        std::vector<void*> ptrs;
+
+        for (unsigned i = 0; ;i++) {
+            void* ptr = heap.allocate();
+            CHECK(ptr);
+            ptrs.push_back(ptr);
+            if (heap.impl().numCommittedPages() == numPagesToCommit)
+                break;
+        }
+
+        std::set<void*> uniquedPtrs = toptrset(ptrs);
+
+        heap.deallocate(ptr1);
+        for (unsigned i = 0; i < IsoPage<decltype(heap)::Config>::numObjects - 1; i++) {
+            heap.deallocate(ptrs[i]);
+            uniquedPtrs.erase(ptrs[i]);
+        }
+
+        scavenge();
+        assertHasOnlyObjects(heap, uniquedPtrs);
+
+        // FIXME: This only seems to pass when lldb is attached but the scavenger thread isn't running...
+        // see: https://bugs.webkit.org/show_bug.cgi?id=198384
+        // auto* ptr2 = heap.allocate();
+        // CHECK(ptr1 == ptr2);
     };
-    
-    RUN(testIsoSimple());
-    RUN(testIsoSimpleScavengeBeforeDealloc());
-    RUN(testIsoFlipFlopFragmentedPages());
-    RUN(testIsoFlipFlopFragmentedPagesScavengeInMiddle());
-    RUN(testIsoFlipFlopFragmentedPagesScavengeInMiddle288());
-    RUN(testBisoMalloced());
-    RUN(testBisoMallocedInline());
-    
-    puts("Success!");
-}
-
-int main(int argc, char** argv)
-{
-    const char* filter = nullptr;
-    switch (argc) {
-    case 1:
-        break;
-    case 2:
-        filter = argv[1];
-        break;
-    default:
-        usage();
-        break;
-    }
-    
-    run(filter);
-    return 0;
-}
-
+
+    run(2);
+}
+
+#endif