<!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>[178609] trunk/Source/bmalloc</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/178609">178609</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2015-01-16 16:01:22 -0800 (Fri, 16 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>bmalloc: added some infrastructure for aligned allocation
https://bugs.webkit.org/show_bug.cgi?id=140572
Reviewed by Andreas Kling.
* bmalloc/Algorithm.h:
(bmalloc::isPowerOfTwo):
(bmalloc::roundUpToMultipleOf):
(bmalloc::roundDownToMultipleOf): Refactored some duplicate code to use our
isPowerOfTwo helper function.
* bmalloc/Allocator.cpp:
(bmalloc::Allocator::allocate):
* bmalloc/Allocator.h: Stubbed out an implementation of aligned allocation.
Doesn't do anything yet, but does correctly forward to system malloc
when bmalloc is disabled.
* bmalloc/Cache.cpp:
(bmalloc::Cache::allocateSlowCaseNullCache):
* bmalloc/Cache.h:
(bmalloc::Cache::allocate):
* bmalloc/bmalloc.h:
(bmalloc::api::memalign):
* bmalloc/mbmalloc.cpp: Stubbed out an API for aligned allocation.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourcebmallocChangeLog">trunk/Source/bmalloc/ChangeLog</a></li>
<li><a href="#trunkSourcebmallocbmallocAlgorithmh">trunk/Source/bmalloc/bmalloc/Algorithm.h</a></li>
<li><a href="#trunkSourcebmallocbmallocAllocatorcpp">trunk/Source/bmalloc/bmalloc/Allocator.cpp</a></li>
<li><a href="#trunkSourcebmallocbmallocAllocatorh">trunk/Source/bmalloc/bmalloc/Allocator.h</a></li>
<li><a href="#trunkSourcebmallocbmallocCachecpp">trunk/Source/bmalloc/bmalloc/Cache.cpp</a></li>
<li><a href="#trunkSourcebmallocbmallocCacheh">trunk/Source/bmalloc/bmalloc/Cache.h</a></li>
<li><a href="#trunkSourcebmallocbmallocbmalloch">trunk/Source/bmalloc/bmalloc/bmalloc.h</a></li>
<li><a href="#trunkSourcebmallocbmallocmbmalloccpp">trunk/Source/bmalloc/bmalloc/mbmalloc.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (178608 => 178609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog 2015-01-16 23:41:39 UTC (rev 178608)
+++ trunk/Source/bmalloc/ChangeLog 2015-01-17 00:01:22 UTC (rev 178609)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-01-16 Geoffrey Garen <ggaren@apple.com>
+
+ bmalloc: added some infrastructure for aligned allocation
+ https://bugs.webkit.org/show_bug.cgi?id=140572
+
+ Reviewed by Andreas Kling.
+
+ * bmalloc/Algorithm.h:
+ (bmalloc::isPowerOfTwo):
+ (bmalloc::roundUpToMultipleOf):
+ (bmalloc::roundDownToMultipleOf): Refactored some duplicate code to use our
+ isPowerOfTwo helper function.
+
+ * bmalloc/Allocator.cpp:
+ (bmalloc::Allocator::allocate):
+ * bmalloc/Allocator.h: Stubbed out an implementation of aligned allocation.
+ Doesn't do anything yet, but does correctly forward to system malloc
+ when bmalloc is disabled.
+
+ * bmalloc/Cache.cpp:
+ (bmalloc::Cache::allocateSlowCaseNullCache):
+ * bmalloc/Cache.h:
+ (bmalloc::Cache::allocate):
+ * bmalloc/bmalloc.h:
+ (bmalloc::api::memalign):
+ * bmalloc/mbmalloc.cpp: Stubbed out an API for aligned allocation.
+
</ins><span class="cx"> 2015-01-13 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> Consider alignment when allocating from a SegregatedFreeList
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocAlgorithmh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Algorithm.h (178608 => 178609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Algorithm.h 2015-01-16 23:41:39 UTC (rev 178608)
+++ trunk/Source/bmalloc/bmalloc/Algorithm.h 2015-01-17 00:01:22 UTC (rev 178609)
</span><span class="lines">@@ -62,21 +62,26 @@
</span><span class="cx"> return !!(reinterpret_cast<uintptr_t>(value) & mask);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline constexpr bool isPowerOfTwo(size_t size)
+{
+ return !(size & (size - 1));
+}
+
</ins><span class="cx"> template<typename T> inline T roundUpToMultipleOf(size_t divisor, T x)
</span><span class="cx"> {
</span><del>- BASSERT(divisor && !(divisor & (divisor - 1)));
</del><ins>+ BASSERT(isPowerOfTwo(divisor));
</ins><span class="cx"> return reinterpret_cast<T>((reinterpret_cast<uintptr_t>(x) + (divisor - 1ul)) & ~(divisor - 1ul));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<size_t divisor, typename T> inline constexpr T roundUpToMultipleOf(T x)
</span><span class="cx"> {
</span><del>- static_assert(divisor && !(divisor & (divisor - 1)), "'divisor' must be a power of two.");
</del><ins>+ static_assert(isPowerOfTwo(divisor), "'divisor' must be a power of two.");
</ins><span class="cx"> return roundUpToMultipleOf(divisor, x);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<size_t divisor, typename T> inline constexpr T roundDownToMultipleOf(T x)
</span><span class="cx"> {
</span><del>- static_assert(divisor && !(divisor & (divisor - 1)), "'divisor' must be a power of two.");
</del><ins>+ static_assert(isPowerOfTwo(divisor), "'divisor' must be a power of two.");
</ins><span class="cx"> return reinterpret_cast<T>(mask(reinterpret_cast<uintptr_t>(x), ~(divisor - 1ul)));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -101,11 +106,6 @@
</span><span class="cx"> return sizeof(T) * 8;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline constexpr bool isPowerOfTwo(size_t size)
-{
- return !(size & (size - 1));
-}
-
</del><span class="cx"> } // namespace bmalloc
</span><span class="cx">
</span><span class="cx"> #endif // Algorithm_h
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocAllocatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Allocator.cpp (178608 => 178609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Allocator.cpp 2015-01-16 23:41:39 UTC (rev 178608)
+++ trunk/Source/bmalloc/bmalloc/Allocator.cpp 2015-01-17 00:01:22 UTC (rev 178609)
</span><span class="lines">@@ -51,6 +51,18 @@
</span><span class="cx"> scavenge();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void* Allocator::allocate(size_t alignment, size_t size)
+{
+ if (!m_isBmallocEnabled) {
+ void* result = nullptr;
+ posix_memalign(&result, alignment, size);
+ return result;
+ }
+
+ BASSERT(isPowerOfTwo(alignment));
+ return nullptr;
+}
+
</ins><span class="cx"> void* Allocator::reallocate(void* object, size_t newSize)
</span><span class="cx"> {
</span><span class="cx"> if (!m_isBmallocEnabled)
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocAllocatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Allocator.h (178608 => 178609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Allocator.h 2015-01-16 23:41:39 UTC (rev 178608)
+++ trunk/Source/bmalloc/bmalloc/Allocator.h 2015-01-17 00:01:22 UTC (rev 178609)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> ~Allocator();
</span><span class="cx">
</span><span class="cx"> void* allocate(size_t);
</span><ins>+ void* allocate(size_t alignment, size_t);
</ins><span class="cx"> void* reallocate(void*, size_t);
</span><span class="cx">
</span><span class="cx"> void scavenge();
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Cache.cpp (178608 => 178609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Cache.cpp 2015-01-16 23:41:39 UTC (rev 178608)
+++ trunk/Source/bmalloc/bmalloc/Cache.cpp 2015-01-17 00:01:22 UTC (rev 178609)
</span><span class="lines">@@ -64,6 +64,11 @@
</span><span class="cx"> return PerThread<Cache>::getSlowCase()->allocator().allocate(size);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+NO_INLINE void* Cache::allocateSlowCaseNullCache(size_t alignment, size_t size)
+{
+ return PerThread<Cache>::getSlowCase()->allocator().allocate(alignment, size);
+}
+
</ins><span class="cx"> NO_INLINE void Cache::deallocateSlowCaseNullCache(void* object)
</span><span class="cx"> {
</span><span class="cx"> PerThread<Cache>::getSlowCase()->deallocator().deallocate(object);
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Cache.h (178608 => 178609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Cache.h 2015-01-16 23:41:39 UTC (rev 178608)
+++ trunk/Source/bmalloc/bmalloc/Cache.h 2015-01-17 00:01:22 UTC (rev 178609)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> void operator delete(void*, size_t);
</span><span class="cx">
</span><span class="cx"> static void* allocate(size_t);
</span><ins>+ static void* allocate(size_t alignment, size_t);
</ins><span class="cx"> static void deallocate(void*);
</span><span class="cx"> static void* reallocate(void*, size_t);
</span><span class="cx"> static void scavenge();
</span><span class="lines">@@ -51,6 +52,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> static void* allocateSlowCaseNullCache(size_t);
</span><ins>+ static void* allocateSlowCaseNullCache(size_t alignment, size_t);
</ins><span class="cx"> static void deallocateSlowCaseNullCache(void*);
</span><span class="cx"> static void* reallocateSlowCaseNullCache(void*, size_t);
</span><span class="cx">
</span><span class="lines">@@ -66,6 +68,14 @@
</span><span class="cx"> return cache->allocator().allocate(size);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline void* Cache::allocate(size_t alignment, size_t size)
+{
+ Cache* cache = PerThread<Cache>::getFastCase();
+ if (!cache)
+ return allocateSlowCaseNullCache(alignment, size);
+ return cache->allocator().allocate(alignment, size);
+}
+
</ins><span class="cx"> inline void Cache::deallocate(void* object)
</span><span class="cx"> {
</span><span class="cx"> Cache* cache = PerThread<Cache>::getFastCase();
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocbmalloch"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/bmalloc.h (178608 => 178609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/bmalloc.h 2015-01-16 23:41:39 UTC (rev 178608)
+++ trunk/Source/bmalloc/bmalloc/bmalloc.h 2015-01-17 00:01:22 UTC (rev 178609)
</span><span class="lines">@@ -33,6 +33,11 @@
</span><span class="cx"> return Cache::allocate(size);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline void* memalign(size_t alignment, size_t size)
+{
+ return Cache::allocate(alignment, size);
+}
+
</ins><span class="cx"> inline void free(void* object)
</span><span class="cx"> {
</span><span class="cx"> Cache::deallocate(object);
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocmbmalloccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/mbmalloc.cpp (178608 => 178609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/mbmalloc.cpp 2015-01-16 23:41:39 UTC (rev 178608)
+++ trunk/Source/bmalloc/bmalloc/mbmalloc.cpp 2015-01-17 00:01:22 UTC (rev 178609)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> extern "C" {
</span><span class="cx">
</span><span class="cx"> EXPORT void* mbmalloc(size_t);
</span><ins>+EXPORT void* mbmemalign(size_t, size_t);
</ins><span class="cx"> EXPORT void mbfree(void*, size_t);
</span><span class="cx"> EXPORT void* mbrealloc(void*, size_t, size_t);
</span><span class="cx"> EXPORT void mbscavenge();
</span><span class="lines">@@ -39,6 +40,11 @@
</span><span class="cx"> return bmalloc::api::malloc(size);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void* mbmemalign(size_t alignment, size_t size)
+{
+ return bmalloc::api::memalign(alignment, size);
+}
+
</ins><span class="cx"> void mbfree(void* p, size_t)
</span><span class="cx"> {
</span><span class="cx"> bmalloc::api::free(p);
</span></span></pre>
</div>
</div>
</body>
</html>