<!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>[163450] trunk/Source/JavaScriptCore</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/163450">163450</a></dd>
<dt>Author</dt> <dd>mhahnenberg@apple.com</dd>
<dt>Date</dt> <dd>2014-02-05 09:31:47 -0800 (Wed, 05 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Malloc called beneath MachineThreads::gatherFromOtherThread(), while forbidden
https://bugs.webkit.org/show_bug.cgi?id=128202
Reviewed by Geoffrey Garen.
This patch uses the new GCSegmentedArray to replace the Vector that was used
to record the set of currently executing CodeBlocks during the conservative
stack scan. This is primarily to avoid the possibility of the Vector resizing
while FastMalloc is forbidden.
* heap/BlockAllocator.h:
* heap/CodeBlockSet.cpp:
(JSC::CodeBlockSet::CodeBlockSet):
(JSC::CodeBlockSet::rememberCurrentlyExecutingCodeBlocks):
* heap/CodeBlockSet.h:
* heap/GCSegmentedArray.h:
(JSC::GCSegmentedArray::begin):
(JSC::GCSegmentedArray::end):
(JSC::GCSegmentedArrayIterator::GCSegmentedArrayIterator):
(JSC::GCSegmentedArrayIterator::get):
(JSC::GCSegmentedArrayIterator::operator*):
(JSC::GCSegmentedArrayIterator::operator->):
(JSC::GCSegmentedArrayIterator::operator==):
(JSC::GCSegmentedArrayIterator::operator!=):
(JSC::GCSegmentedArrayIterator::operator++):
* heap/Heap.cpp:
(JSC::Heap::Heap):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapBlockAllocatorh">trunk/Source/JavaScriptCore/heap/BlockAllocator.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCodeBlockSetcpp">trunk/Source/JavaScriptCore/heap/CodeBlockSet.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCodeBlockSeth">trunk/Source/JavaScriptCore/heap/CodeBlockSet.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapGCSegmentedArrayh">trunk/Source/JavaScriptCore/heap/GCSegmentedArray.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapcpp">trunk/Source/JavaScriptCore/heap/Heap.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (163449 => 163450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-05 17:13:57 UTC (rev 163449)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-05 17:31:47 UTC (rev 163450)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-02-05 Mark Hahnenberg <mhahnenberg@apple.com>
+
+ Malloc called beneath MachineThreads::gatherFromOtherThread(), while forbidden
+ https://bugs.webkit.org/show_bug.cgi?id=128202
+
+ Reviewed by Geoffrey Garen.
+
+ This patch uses the new GCSegmentedArray to replace the Vector that was used
+ to record the set of currently executing CodeBlocks during the conservative
+ stack scan. This is primarily to avoid the possibility of the Vector resizing
+ while FastMalloc is forbidden.
+
+ * heap/BlockAllocator.h:
+ * heap/CodeBlockSet.cpp:
+ (JSC::CodeBlockSet::CodeBlockSet):
+ (JSC::CodeBlockSet::rememberCurrentlyExecutingCodeBlocks):
+ * heap/CodeBlockSet.h:
+ * heap/GCSegmentedArray.h:
+ (JSC::GCSegmentedArray::begin):
+ (JSC::GCSegmentedArray::end):
+ (JSC::GCSegmentedArrayIterator::GCSegmentedArrayIterator):
+ (JSC::GCSegmentedArrayIterator::get):
+ (JSC::GCSegmentedArrayIterator::operator*):
+ (JSC::GCSegmentedArrayIterator::operator->):
+ (JSC::GCSegmentedArrayIterator::operator==):
+ (JSC::GCSegmentedArrayIterator::operator!=):
+ (JSC::GCSegmentedArrayIterator::operator++):
+ * heap/Heap.cpp:
+ (JSC::Heap::Heap):
+
</ins><span class="cx"> 2014-02-05 Wojciech Bielawski <w.bielawski@samsung.com>
</span><span class="cx">
</span><span class="cx"> XMLHttpRequest performs too many copies for ArrayBuffer results
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapBlockAllocatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/BlockAllocator.h (163449 => 163450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/BlockAllocator.h 2014-02-05 17:13:57 UTC (rev 163449)
+++ trunk/Source/JavaScriptCore/heap/BlockAllocator.h 2014-02-05 17:31:47 UTC (rev 163450)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> class BlockAllocator;
</span><ins>+class CodeBlock;
</ins><span class="cx"> class CopiedBlock;
</span><span class="cx"> class CopyWorkListSegment;
</span><span class="cx"> template <typename T> class GCArraySegment;
</span><span class="lines">@@ -233,6 +234,7 @@
</span><span class="cx"> REGION_SET_FOR(CopiedBlock, m_copiedRegionSet);
</span><span class="cx"> REGION_SET_FOR(WeakBlock, m_fourKBBlockRegionSet);
</span><span class="cx"> REGION_SET_FOR(GCArraySegment<const JSCell*>, m_fourKBBlockRegionSet);
</span><ins>+REGION_SET_FOR(GCArraySegment<CodeBlock*>, m_fourKBBlockRegionSet);
</ins><span class="cx"> REGION_SET_FOR(CopyWorkListSegment, m_workListRegionSet);
</span><span class="cx"> REGION_SET_FOR(HandleBlock, m_fourKBBlockRegionSet);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCodeBlockSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CodeBlockSet.cpp (163449 => 163450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CodeBlockSet.cpp 2014-02-05 17:13:57 UTC (rev 163449)
+++ trunk/Source/JavaScriptCore/heap/CodeBlockSet.cpp 2014-02-05 17:31:47 UTC (rev 163450)
</span><span class="lines">@@ -33,7 +33,10 @@
</span><span class="cx">
</span><span class="cx"> static const bool verbose = false;
</span><span class="cx">
</span><del>-CodeBlockSet::CodeBlockSet() { }
</del><ins>+CodeBlockSet::CodeBlockSet(BlockAllocator& blockAllocator)
+ : m_currentlyExecuting(blockAllocator)
+{
+}
</ins><span class="cx">
</span><span class="cx"> CodeBlockSet::~CodeBlockSet()
</span><span class="cx"> {
</span><span class="lines">@@ -109,8 +112,8 @@
</span><span class="cx"> void CodeBlockSet::rememberCurrentlyExecutingCodeBlocks(Heap* heap)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(GGC)
</span><del>- for (size_t i = 0; i < m_currentlyExecuting.size(); ++i)
- heap->addToRememberedSet(m_currentlyExecuting[i]->ownerExecutable());
</del><ins>+ for (CodeBlock* codeBlock : m_currentlyExecuting)
+ heap->addToRememberedSet(codeBlock->ownerExecutable());
</ins><span class="cx"> m_currentlyExecuting.clear();
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(heap);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCodeBlockSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CodeBlockSet.h (163449 => 163450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CodeBlockSet.h 2014-02-05 17:13:57 UTC (rev 163449)
+++ trunk/Source/JavaScriptCore/heap/CodeBlockSet.h 2014-02-05 17:31:47 UTC (rev 163450)
</span><span class="lines">@@ -26,14 +26,15 @@
</span><span class="cx"> #ifndef CodeBlockSet_h
</span><span class="cx"> #define CodeBlockSet_h
</span><span class="cx">
</span><ins>+#include "GCSegmentedArray.h"
</ins><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><del>-#include <wtf/Vector.h>
</del><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><ins>+class BlockAllocator;
</ins><span class="cx"> class CodeBlock;
</span><span class="cx"> class Heap;
</span><span class="cx"> class SlotVisitor;
</span><span class="lines">@@ -46,7 +47,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(CodeBlockSet);
</span><span class="cx">
</span><span class="cx"> public:
</span><del>- CodeBlockSet();
</del><ins>+ CodeBlockSet(BlockAllocator&);
</ins><span class="cx"> ~CodeBlockSet();
</span><span class="cx">
</span><span class="cx"> // Add a CodeBlock. This is only called by CodeBlock constructors.
</span><span class="lines">@@ -88,7 +89,7 @@
</span><span class="cx"> // arbitrary bogus pointers. I could have written a thingy that had peek types
</span><span class="cx"> // and all, but that seemed like overkill.
</span><span class="cx"> HashSet<CodeBlock* > m_set;
</span><del>- Vector<CodeBlock*> m_currentlyExecuting;
</del><ins>+ GCSegmentedArray<CodeBlock*> m_currentlyExecuting;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapGCSegmentedArrayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/GCSegmentedArray.h (163449 => 163450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/GCSegmentedArray.h 2014-02-05 17:13:57 UTC (rev 163449)
+++ trunk/Source/JavaScriptCore/heap/GCSegmentedArray.h 2014-02-05 17:31:47 UTC (rev 163450)
</span><span class="lines">@@ -59,8 +59,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template <typename T> class GCSegmentedArrayIterator;
+
</ins><span class="cx"> template <typename T>
</span><span class="cx"> class GCSegmentedArray {
</span><ins>+ friend class GCSegmentedArrayIterator<T>;
</ins><span class="cx"> public:
</span><span class="cx"> GCSegmentedArray(BlockAllocator&);
</span><span class="cx"> ~GCSegmentedArray();
</span><span class="lines">@@ -77,6 +80,10 @@
</span><span class="cx"> void fillVector(Vector<T>&);
</span><span class="cx"> void clear();
</span><span class="cx">
</span><ins>+ typedef GCSegmentedArrayIterator<T> iterator;
+ iterator begin() { return GCSegmentedArrayIterator<T>(m_segments.head(), m_top); }
+ iterator end() { return GCSegmentedArrayIterator<T>(); }
+
</ins><span class="cx"> protected:
</span><span class="cx"> template <size_t size> struct CapacityFromSize {
</span><span class="cx"> static const size_t value = (size - sizeof(GCArraySegment<T>)) / sizeof(T);
</span><span class="lines">@@ -100,6 +107,60 @@
</span><span class="cx"> size_t m_numberOfSegments;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template <typename T>
+class GCSegmentedArrayIterator {
+ friend class GCSegmentedArray<T>;
+public:
+ GCSegmentedArrayIterator()
+ : m_currentSegment(0)
+ , m_currentOffset(0)
+ {
+ }
+
+ T& get() { return m_currentSegment->data()[m_currentOffset]; }
+ T& operator*() { return get(); }
+ T& operator->() { return get(); }
+
+ bool operator==(const GCSegmentedArrayIterator& other)
+ {
+ return m_currentSegment == other.m_currentSegment && m_currentOffset == other.m_currentOffset;
+ }
+
+ bool operator!=(const GCSegmentedArrayIterator& other)
+ {
+ return !(*this == other);
+ }
+
+ GCSegmentedArrayIterator& operator++()
+ {
+ ASSERT(m_currentSegment);
+
+ m_currentOffset++;
+
+ if (m_currentOffset >= m_offsetLimit) {
+ m_currentSegment = m_currentSegment->next();
+ m_currentOffset = 0;
+ m_offsetLimit = GCSegmentedArray<T>::s_segmentCapacity;
+ }
+
+ return *this;
+ }
+
+private:
+ GCSegmentedArrayIterator(GCArraySegment<T>* start, size_t top)
+ : m_currentSegment(start)
+ , m_currentOffset(0)
+ , m_offsetLimit(top)
+ {
+ if (!m_offsetLimit)
+ m_currentSegment = nullptr;
+ }
+
+ GCArraySegment<T>* m_currentSegment;
+ size_t m_currentOffset;
+ size_t m_offsetLimit;
+};
+
</ins><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><span class="cx"> #endif // GCSegmentedArray_h
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.cpp (163449 => 163450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.cpp 2014-02-05 17:13:57 UTC (rev 163449)
+++ trunk/Source/JavaScriptCore/heap/Heap.cpp 2014-02-05 17:31:47 UTC (rev 163450)
</span><span class="lines">@@ -270,6 +270,7 @@
</span><span class="cx"> , m_slotVisitor(m_sharedData)
</span><span class="cx"> , m_copyVisitor(m_sharedData)
</span><span class="cx"> , m_handleSet(vm)
</span><ins>+ , m_codeBlocks(m_blockAllocator)
</ins><span class="cx"> , m_isSafeToCollect(false)
</span><span class="cx"> , m_writeBarrierBuffer(256)
</span><span class="cx"> , m_vm(vm)
</span></span></pre>
</div>
</div>
</body>
</html>