<!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>[166957] trunk/Source/WTF</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/166957">166957</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2014-04-08 13:36:17 -0700 (Tue, 08 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Added a bmalloc back-end for FastMalloc
https://bugs.webkit.org/show_bug.cgi?id=131387
Reviewed by Andreas Kling.
We'll need to rethink some things if we adopt this back-end. For example,
fastMallocSize() and fastMallocGoodSize() are no longer real things. But,
this is enough to test for now.
* wtf/FastMalloc.cpp:
(WTF::fastMalloc):
(WTF::fastCalloc):
(WTF::fastRealloc):
(WTF::fastFree):
(WTF::fastMallocSize):
(WTF::fastMallocGoodSize):
(WTF::tryFastMalloc):
(WTF::tryFastRealloc):
(WTF::tryFastCalloc):
(WTF::releaseFastMallocFreeMemory):
(WTF::fastMallocStatistics):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFastMalloccpp">trunk/Source/WTF/wtf/FastMalloc.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (166956 => 166957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-04-08 20:36:07 UTC (rev 166956)
+++ trunk/Source/WTF/ChangeLog 2014-04-08 20:36:17 UTC (rev 166957)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-04-08 Geoffrey Garen <ggaren@apple.com>
+
+ Added a bmalloc back-end for FastMalloc
+ https://bugs.webkit.org/show_bug.cgi?id=131387
+
+ Reviewed by Andreas Kling.
+
+ We'll need to rethink some things if we adopt this back-end. For example,
+ fastMallocSize() and fastMallocGoodSize() are no longer real things. But,
+ this is enough to test for now.
+
+ * wtf/FastMalloc.cpp:
+ (WTF::fastMalloc):
+ (WTF::fastCalloc):
+ (WTF::fastRealloc):
+ (WTF::fastFree):
+ (WTF::fastMallocSize):
+ (WTF::fastMallocGoodSize):
+ (WTF::tryFastMalloc):
+ (WTF::tryFastRealloc):
+ (WTF::tryFastCalloc):
+ (WTF::releaseFastMallocFreeMemory):
+ (WTF::fastMallocStatistics):
+
</ins><span class="cx"> 2014-04-08 Andres Gomez <agomez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] [EFL] Build fails with GCC < 4.8.x
</span></span></pre></div>
<a id="trunkSourceWTFwtfFastMalloccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FastMalloc.cpp (166956 => 166957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FastMalloc.cpp 2014-04-08 20:36:07 UTC (rev 166956)
+++ trunk/Source/WTF/wtf/FastMalloc.cpp 2014-04-08 20:36:17 UTC (rev 166957)
</span><span class="lines">@@ -423,6 +423,68 @@
</span><span class="cx"> extern "C" WTF_EXPORT_PRIVATE const int jscore_fastmalloc_introspection = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#elif defined(USE_BMALLOC) && USE_BMALLOC // FORCE_SYSTEM_MALLOC
+
+#include "bmalloc.h"
+
+namespace WTF {
+
+void* fastMalloc(size_t size)
+{
+ ASSERT(!isForbidden());
+ return bmalloc::api::malloc(size);
+}
+
+void* fastCalloc(size_t numElements, size_t elementSize)
+{
+ return fastZeroedMalloc(numElements * elementSize);
+}
+
+void* fastRealloc(void* object, size_t size)
+{
+ return bmalloc::api::realloc(object, size);
+}
+
+void fastFree(void* object)
+{
+ bmalloc::api::free(object);
+}
+
+size_t fastMallocSize(const void*)
+{
+ return 1;
+}
+
+size_t fastMallocGoodSize(size_t size)
+{
+ return size;
+}
+
+TryMallocReturnValue tryFastMalloc(size_t size)
+{
+ return fastMalloc(size);
+}
+
+TryMallocReturnValue tryFastRealloc(void* p, size_t n)
+{
+ return fastRealloc(p, n);
+}
+
+TryMallocReturnValue tryFastCalloc(size_t numElements, size_t elementSize)
+{
+ return fastCalloc(numElements, elementSize);
+}
+
+void releaseFastMallocFreeMemory() { }
+
+FastMallocStatistics fastMallocStatistics()
+{
+ FastMallocStatistics statistics = { 0, 0, 0 };
+ return statistics;
+}
+
+} // namespace WTF
+
</ins><span class="cx"> #else // FORCE_SYSTEM_MALLOC
</span><span class="cx">
</span><span class="cx"> #include "TCPackedCache.h"
</span></span></pre>
</div>
</div>
</body>
</html>