<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[181758] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/181758">181758</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-03-19 14:19:32 -0700 (Thu, 19 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>DFGAllocator should use bmalloc's aligned allocator.
<https://webkit.org/b/142871>
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
Switch DFGAllocator to using bmalloc through fastAlignedMalloc().
* dfg/DFGAllocator.h:
(JSC::DFG::Allocator<T>::allocateSlow):
(JSC::DFG::Allocator<T>::freeRegionsStartingAt):
* heap/CopiedSpace.h:
* heap/MarkedBlock.h:
* heap/MarkedSpace.h:
Source/WTF:
Remove PageAllocationAligned since it has no more clients.
* WTF.vcxproj/WTF.vcxproj:
* WTF.vcxproj/WTF.vcxproj.filters:
* WTF.xcodeproj/project.pbxproj:
* wtf/CMakeLists.txt:
* wtf/PageAllocationAligned.cpp: Removed.
* wtf/PageAllocationAligned.h: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGAllocatorh">trunk/Source/JavaScriptCore/dfg/DFGAllocator.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCopiedSpaceh">trunk/Source/JavaScriptCore/heap/CopiedSpace.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkedBlockh">trunk/Source/JavaScriptCore/heap/MarkedBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkedSpaceh">trunk/Source/JavaScriptCore/heap/MarkedSpace.h</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFvcxproj">trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFvcxprojfilters">trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters</a></li>
<li><a href="#trunkSourceWTFWTFxcodeprojprojectpbxproj">trunk/Source/WTF/WTF.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWTFwtfCMakeListstxt">trunk/Source/WTF/wtf/CMakeLists.txt</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWTFwtfPageAllocationAlignedcpp">trunk/Source/WTF/wtf/PageAllocationAligned.cpp</a></li>
<li><a href="#trunkSourceWTFwtfPageAllocationAlignedh">trunk/Source/WTF/wtf/PageAllocationAligned.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (181757 => 181758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-03-19 21:17:53 UTC (rev 181757)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-03-19 21:19:32 UTC (rev 181758)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-03-19 Andreas Kling <akling@apple.com>
+
+ DFGAllocator should use bmalloc's aligned allocator.
+ <https://webkit.org/b/142871>
+
+ Reviewed by Geoffrey Garen.
+
+ Switch DFGAllocator to using bmalloc through fastAlignedMalloc().
+
+ * dfg/DFGAllocator.h:
+ (JSC::DFG::Allocator<T>::allocateSlow):
+ (JSC::DFG::Allocator<T>::freeRegionsStartingAt):
+ * heap/CopiedSpace.h:
+ * heap/MarkedBlock.h:
+ * heap/MarkedSpace.h:
+
</ins><span class="cx"> 2015-03-18 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> ES6 Classes: Extends should accept an expression without parenthesis
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGAllocatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGAllocator.h (181757 => 181758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGAllocator.h 2015-03-19 21:17:53 UTC (rev 181757)
+++ trunk/Source/JavaScriptCore/dfg/DFGAllocator.h 2015-03-19 21:19:32 UTC (rev 181758)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><span class="cx">
</span><span class="cx"> #include "DFGCommon.h"
</span><del>-#include <wtf/PageAllocationAligned.h>
</del><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx">
</span><span class="cx"> namespace JSC { namespace DFG {
</span><span class="lines">@@ -70,7 +69,7 @@
</span><span class="cx"> bool isInThisRegion(const T* pointer) { return static_cast<unsigned>(pointer - data()) < numberOfThingsPerRegion(); }
</span><span class="cx"> static Region* regionFor(const T* pointer) { return bitwise_cast<Region*>(bitwise_cast<uintptr_t>(pointer) & ~(size() - 1)); }
</span><span class="cx">
</span><del>- PageAllocationAligned m_allocation;
</del><ins>+ void* m_allocation;
</ins><span class="cx"> Allocator* m_allocator;
</span><span class="cx"> Region* m_next;
</span><span class="cx"> };
</span><span class="lines">@@ -201,11 +200,9 @@
</span><span class="cx">
</span><span class="cx"> if (logCompilationChanges())
</span><span class="cx"> dataLog("Allocating another allocator region.\n");
</span><del>-
- PageAllocationAligned allocation = PageAllocationAligned::allocate(Region::size(), Region::size(), OSAllocator::JSGCHeapPages);
- if (!static_cast<bool>(allocation))
- CRASH();
- Region* region = static_cast<Region*>(allocation.base());
</del><ins>+
+ void* allocation = fastAlignedMalloc(Region::size(), Region::size());
+ Region* region = static_cast<Region*>(allocation);
</ins><span class="cx"> region->m_allocation = allocation;
</span><span class="cx"> region->m_allocator = this;
</span><span class="cx"> startBumpingIn(region);
</span><span class="lines">@@ -222,7 +219,7 @@
</span><span class="cx"> {
</span><span class="cx"> while (region) {
</span><span class="cx"> Region* nextRegion = region->m_next;
</span><del>- region->m_allocation.deallocate();
</del><ins>+ fastAlignedFree(region->m_allocation);
</ins><span class="cx"> region = nextRegion;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCopiedSpaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CopiedSpace.h (181757 => 181758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CopiedSpace.h 2015-03-19 21:17:53 UTC (rev 181757)
+++ trunk/Source/JavaScriptCore/heap/CopiedSpace.h 2015-03-19 21:19:32 UTC (rev 181758)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #include <wtf/DoublyLinkedList.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/OSAllocator.h>
</span><del>-#include <wtf/PageAllocationAligned.h>
</del><span class="cx"> #include <wtf/PageBlock.h>
</span><span class="cx"> #include <wtf/SpinLock.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedBlock.h (181757 => 181758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedBlock.h 2015-03-19 21:17:53 UTC (rev 181757)
+++ trunk/Source/JavaScriptCore/heap/MarkedBlock.h 2015-03-19 21:19:32 UTC (rev 181758)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include <wtf/DataLog.h>
</span><span class="cx"> #include <wtf/DoublyLinkedList.h>
</span><span class="cx"> #include <wtf/HashFunctions.h>
</span><del>-#include <wtf/PageAllocationAligned.h>
</del><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedSpaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedSpace.h (181757 => 181758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedSpace.h 2015-03-19 21:17:53 UTC (rev 181757)
+++ trunk/Source/JavaScriptCore/heap/MarkedSpace.h 2015-03-19 21:19:32 UTC (rev 181758)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include "MarkedBlock.h"
</span><span class="cx"> #include "MarkedBlockSet.h"
</span><span class="cx"> #include <array>
</span><del>-#include <wtf/PageAllocationAligned.h>
</del><span class="cx"> #include <wtf/Bitmap.h>
</span><span class="cx"> #include <wtf/DoublyLinkedList.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (181757 => 181758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-03-19 21:17:53 UTC (rev 181757)
+++ trunk/Source/WTF/ChangeLog 2015-03-19 21:19:32 UTC (rev 181758)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-03-19 Andreas Kling <akling@apple.com>
+
+ DFGAllocator should use bmalloc's aligned allocator.
+ <https://webkit.org/b/142871>
+
+ Reviewed by Geoffrey Garen.
+
+ Remove PageAllocationAligned since it has no more clients.
+
+ * WTF.vcxproj/WTF.vcxproj:
+ * WTF.vcxproj/WTF.vcxproj.filters:
+ * WTF.xcodeproj/project.pbxproj:
+ * wtf/CMakeLists.txt:
+ * wtf/PageAllocationAligned.cpp: Removed.
+ * wtf/PageAllocationAligned.h: Removed.
+
</ins><span class="cx"> 2015-03-18 Dhi Aurrahman <diorahman@rockybars.com>
</span><span class="cx">
</span><span class="cx"> Fix StringView misplaced implementations after r181525 and r181558
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj (181757 => 181758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj 2015-03-19 21:17:53 UTC (rev 181757)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj 2015-03-19 21:19:32 UTC (rev 181758)
</span><span class="lines">@@ -113,7 +113,6 @@
</span><span class="cx"> <ClCompile Include="..\wtf\NumberOfCores.cpp" />
</span><span class="cx"> <ClCompile Include="..\wtf\OSAllocatorWin.cpp" />
</span><span class="cx"> <ClCompile Include="..\wtf\OSRandomSource.cpp" />
</span><del>- <ClCompile Include="..\wtf\PageAllocationAligned.cpp" />
</del><span class="cx"> <ClCompile Include="..\wtf\PageBlock.cpp" />
</span><span class="cx"> <ClCompile Include="..\wtf\ParallelJobsGeneric.cpp" />
</span><span class="cx"> <ClCompile Include="..\wtf\PrintStream.cpp" />
</span><span class="lines">@@ -242,7 +241,6 @@
</span><span class="cx"> <ClInclude Include="..\wtf\OwnPtrCommon.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\PackedIntVector.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\PageAllocation.h" />
</span><del>- <ClInclude Include="..\wtf\PageAllocationAligned.h" />
</del><span class="cx"> <ClInclude Include="..\wtf\PageBlock.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\PageReservation.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\ParallelJobs.h" />
</span><span class="lines">@@ -775,4 +773,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFvcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters (181757 => 181758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters 2015-03-19 21:17:53 UTC (rev 181757)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters 2015-03-19 21:19:32 UTC (rev 181758)
</span><span class="lines">@@ -168,9 +168,6 @@
</span><span class="cx"> <ClCompile Include="..\wtf\OSRandomSource.cpp">
</span><span class="cx"> <Filter>wtf</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\wtf\PageAllocationAligned.cpp">
- <Filter>wtf</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\wtf\PageBlock.cpp">
</span><span class="cx"> <Filter>wtf</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -540,9 +537,6 @@
</span><span class="cx"> <ClInclude Include="..\wtf\PageAllocation.h">
</span><span class="cx"> <Filter>wtf</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\wtf\PageAllocationAligned.h">
- <Filter>wtf</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\wtf\PageBlock.h">
</span><span class="cx"> <Filter>wtf</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -730,4 +724,4 @@
</span><span class="cx"> <None Include="WTFPostBuild.cmd" />
</span><span class="cx"> <None Include="WTFPreBuild.cmd" />
</span><span class="cx"> </ItemGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="trunkSourceWTFWTFxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (181757 => 181758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2015-03-19 21:17:53 UTC (rev 181757)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2015-03-19 21:19:32 UTC (rev 181758)
</span><span class="lines">@@ -189,8 +189,6 @@
</span><span class="cx"> A8A473FD151A825B004123FF /* OwnPtrCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472DE151A825B004123FF /* OwnPtrCommon.h */; };
</span><span class="cx"> A8A473FE151A825B004123FF /* PackedIntVector.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472DF151A825B004123FF /* PackedIntVector.h */; };
</span><span class="cx"> A8A473FF151A825B004123FF /* PageAllocation.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472E0151A825B004123FF /* PageAllocation.h */; };
</span><del>- A8A47400151A825B004123FF /* PageAllocationAligned.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A472E1151A825B004123FF /* PageAllocationAligned.cpp */; };
- A8A47401151A825B004123FF /* PageAllocationAligned.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472E2151A825B004123FF /* PageAllocationAligned.h */; };
</del><span class="cx"> A8A47402151A825B004123FF /* PageBlock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A472E3151A825B004123FF /* PageBlock.cpp */; };
</span><span class="cx"> A8A47403151A825B004123FF /* PageBlock.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472E4151A825B004123FF /* PageBlock.h */; };
</span><span class="cx"> A8A47404151A825B004123FF /* PageReservation.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472E5151A825B004123FF /* PageReservation.h */; };
</span><span class="lines">@@ -482,8 +480,6 @@
</span><span class="cx"> A8A472DE151A825B004123FF /* OwnPtrCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OwnPtrCommon.h; sourceTree = "<group>"; };
</span><span class="cx"> A8A472DF151A825B004123FF /* PackedIntVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PackedIntVector.h; sourceTree = "<group>"; };
</span><span class="cx"> A8A472E0151A825B004123FF /* PageAllocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageAllocation.h; sourceTree = "<group>"; };
</span><del>- A8A472E1151A825B004123FF /* PageAllocationAligned.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageAllocationAligned.cpp; sourceTree = "<group>"; };
- A8A472E2151A825B004123FF /* PageAllocationAligned.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageAllocationAligned.h; sourceTree = "<group>"; };
</del><span class="cx"> A8A472E3151A825B004123FF /* PageBlock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageBlock.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A8A472E4151A825B004123FF /* PageBlock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageBlock.h; sourceTree = "<group>"; };
</span><span class="cx"> A8A472E5151A825B004123FF /* PageReservation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageReservation.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -804,8 +800,6 @@
</span><span class="cx"> A8A472DE151A825B004123FF /* OwnPtrCommon.h */,
</span><span class="cx"> A8A472DF151A825B004123FF /* PackedIntVector.h */,
</span><span class="cx"> A8A472E0151A825B004123FF /* PageAllocation.h */,
</span><del>- A8A472E1151A825B004123FF /* PageAllocationAligned.cpp */,
- A8A472E2151A825B004123FF /* PageAllocationAligned.h */,
</del><span class="cx"> A8A472E3151A825B004123FF /* PageBlock.cpp */,
</span><span class="cx"> A8A472E4151A825B004123FF /* PageBlock.h */,
</span><span class="cx"> A8A472E5151A825B004123FF /* PageReservation.h */,
</span><span class="lines">@@ -1143,7 +1137,6 @@
</span><span class="cx"> 0FB14E1B1810E1DC009B6B4D /* BagToHashMap.h in Headers */,
</span><span class="cx"> A8A473FE151A825B004123FF /* PackedIntVector.h in Headers */,
</span><span class="cx"> A8A473FF151A825B004123FF /* PageAllocation.h in Headers */,
</span><del>- A8A47401151A825B004123FF /* PageAllocationAligned.h in Headers */,
</del><span class="cx"> A8A47403151A825B004123FF /* PageBlock.h in Headers */,
</span><span class="cx"> A8A47404151A825B004123FF /* PageReservation.h in Headers */,
</span><span class="cx"> A8A47405151A825B004123FF /* ParallelJobs.h in Headers */,
</span><span class="lines">@@ -1364,7 +1357,6 @@
</span><span class="cx"> A8A473F7151A825B004123FF /* OSAllocatorPosix.cpp in Sources */,
</span><span class="cx"> 93F1993E19D7958D00C2390B /* StringView.cpp in Sources */,
</span><span class="cx"> A8A473F9151A825B004123FF /* OSRandomSource.cpp in Sources */,
</span><del>- A8A47400151A825B004123FF /* PageAllocationAligned.cpp in Sources */,
</del><span class="cx"> A8A47402151A825B004123FF /* PageBlock.cpp in Sources */,
</span><span class="cx"> 0F9D3362165DBA73005AD387 /* PrintStream.cpp in Sources */,
</span><span class="cx"> 143F611F1565F0F900DB514A /* RAMSize.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWTFwtfCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/CMakeLists.txt (181757 => 181758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/CMakeLists.txt 2015-03-19 21:17:53 UTC (rev 181757)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2015-03-19 21:19:32 UTC (rev 181758)
</span><span class="lines">@@ -59,7 +59,6 @@
</span><span class="cx"> OwnPtr.h
</span><span class="cx"> OwnPtrCommon.h
</span><span class="cx"> PageAllocation.h
</span><del>- PageAllocationAligned.h
</del><span class="cx"> PageBlock.h
</span><span class="cx"> PageReservation.h
</span><span class="cx"> ParallelJobs.h
</span><span class="lines">@@ -165,7 +164,6 @@
</span><span class="cx"> MetaAllocator.cpp
</span><span class="cx"> NumberOfCores.cpp
</span><span class="cx"> OSRandomSource.cpp
</span><del>- PageAllocationAligned.cpp
</del><span class="cx"> PageBlock.cpp
</span><span class="cx"> ParallelJobsGeneric.cpp
</span><span class="cx"> PrintStream.cpp
</span></span></pre></div>
<a id="trunkSourceWTFwtfPageAllocationAlignedcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WTF/wtf/PageAllocationAligned.cpp (181757 => 181758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PageAllocationAligned.cpp 2015-03-19 21:17:53 UTC (rev 181757)
+++ trunk/Source/WTF/wtf/PageAllocationAligned.cpp 2015-03-19 21:19:32 UTC (rev 181758)
</span><span class="lines">@@ -1,85 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * 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"
-#include "PageAllocationAligned.h"
-
-namespace WTF {
-
-PageAllocationAligned PageAllocationAligned::allocate(size_t size, size_t alignment, OSAllocator::Usage usage, bool writable)
-{
- ASSERT(isPageAligned(size));
- ASSERT(isPageAligned(alignment));
- ASSERT(isPowerOfTwo(alignment));
- ASSERT(size >= alignment);
- size_t alignmentMask = alignment - 1;
-
-#if OS(DARWIN)
- int flags = VM_FLAGS_ANYWHERE;
- if (usage != OSAllocator::UnknownUsage)
- flags |= usage;
- int protection = PROT_READ;
- if (writable)
- protection |= PROT_WRITE;
-
- vm_address_t address = 0;
- vm_map(current_task(), &address, size, alignmentMask, flags, MEMORY_OBJECT_NULL, 0, FALSE, protection, PROT_READ | PROT_WRITE, VM_INHERIT_DEFAULT);
- return PageAllocationAligned(reinterpret_cast<void*>(address), size);
-#else
- size_t alignmentDelta = alignment - pageSize();
-
- // Resererve with suffcient additional VM to correctly align.
- size_t reservationSize = size + alignmentDelta;
- void* reservationBase = OSAllocator::reserveUncommitted(reservationSize, usage, writable, false);
-
- // Select an aligned region within the reservation and commit.
- void* alignedBase = reinterpret_cast<uintptr_t>(reservationBase) & alignmentMask
- ? reinterpret_cast<void*>((reinterpret_cast<uintptr_t>(reservationBase) & ~alignmentMask) + alignment)
- : reservationBase;
- OSAllocator::commit(alignedBase, size, writable, false);
-
- return PageAllocationAligned(alignedBase, size, reservationBase, reservationSize);
-#endif
-}
-
-void PageAllocationAligned::deallocate()
-{
- // Clear base & size before calling release; if this is *inside* allocation
- // then we won't be able to clear then after deallocating the memory.
- PageAllocationAligned tmp;
- std::swap(tmp, *this);
-
- ASSERT(tmp);
- ASSERT(!*this);
-
-#if OS(DARWIN)
- vm_deallocate(current_task(), reinterpret_cast<vm_address_t>(tmp.base()), tmp.size());
-#else
- ASSERT(tmp.m_reservation.contains(tmp.base(), tmp.size()));
- OSAllocator::decommitAndRelease(tmp.m_reservation.base(), tmp.m_reservation.size());
-#endif
-}
-
-} // namespace WTF
</del></span></pre></div>
<a id="trunkSourceWTFwtfPageAllocationAlignedh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WTF/wtf/PageAllocationAligned.h (181757 => 181758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PageAllocationAligned.h 2015-03-19 21:17:53 UTC (rev 181757)
+++ trunk/Source/WTF/wtf/PageAllocationAligned.h 2015-03-19 21:19:32 UTC (rev 181758)
</span><span class="lines">@@ -1,70 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * 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.
- */
-
-#ifndef PageAllocationAligned_h
-#define PageAllocationAligned_h
-
-#include <wtf/OSAllocator.h>
-#include <wtf/PageReservation.h>
-
-namespace WTF {
-
-class PageAllocationAligned : private PageBlock {
-public:
- PageAllocationAligned()
- {
- }
-
- using PageBlock::operator bool;
- using PageBlock::size;
- using PageBlock::base;
-
- WTF_EXPORT_PRIVATE static PageAllocationAligned allocate(size_t size, size_t alignment, OSAllocator::Usage usage = OSAllocator::UnknownUsage, bool writable = true);
-
- WTF_EXPORT_PRIVATE void deallocate();
-
-private:
-#if OS(DARWIN)
- PageAllocationAligned(void* base, size_t size)
- : PageBlock(base, size, false)
- {
- }
-#else
- PageAllocationAligned(void* base, size_t size, void* reservationBase, size_t reservationSize)
- : PageBlock(base, size, false)
- , m_reservation(reservationBase, reservationSize, false)
- {
- }
-
- PageBlock m_reservation;
-#endif
-};
-
-
-} // namespace WTF
-
-using WTF::PageAllocationAligned;
-
-#endif // PageAllocationAligned_h
</del></span></pre>
</div>
</div>
</body>
</html>