<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[20020] trunk/JavaScriptCore</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/20020">20020</a></dd>
<dt>Author</dt> <dd>ggaren</dd>
<dt>Date</dt> <dd>2007-03-07 08:34:56 -0800 (Wed, 07 Mar 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre> Reviewed by Darin Adler.
Fixed ASSERT failure I just introduced.
Made the fastMalloc isForbidden flag per thread. (Oops!) We expect that
other threads will malloc while we're marking -- we just want to prevent
our own marking from malloc'ing.
* wtf/FastMalloc.cpp:
(WTF::initializeIsForbiddenKey):
(WTF::isForbidden):
(WTF::fastMallocForbid):
(WTF::fastMallocAllow):
(WTF::fastMalloc):
(WTF::fastCalloc):
(WTF::fastFree):
(WTF::fastRealloc):
(WTF::do_malloc):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJavaScriptCoreChangeLog">trunk/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkJavaScriptCorewtfFastMalloccpp">trunk/JavaScriptCore/wtf/FastMalloc.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/ChangeLog (20019 => 20020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/ChangeLog 2007-03-07 15:37:06 UTC (rev 20019)
+++ trunk/JavaScriptCore/ChangeLog 2007-03-07 16:34:56 UTC (rev 20020)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2007-03-07 Geoffrey Garen <ggaren@apple.com>
+
+ Reviewed by Darin Adler.
+
+ Fixed ASSERT failure I just introduced.
+
+ Made the fastMalloc isForbidden flag per thread. (Oops!) We expect that
+ other threads will malloc while we're marking -- we just want to prevent
+ our own marking from malloc'ing.
+
+ * wtf/FastMalloc.cpp:
+ (WTF::initializeIsForbiddenKey):
+ (WTF::isForbidden):
+ (WTF::fastMallocForbid):
+ (WTF::fastMallocAllow):
+ (WTF::fastMalloc):
+ (WTF::fastCalloc):
+ (WTF::fastFree):
+ (WTF::fastRealloc):
+ (WTF::do_malloc):
+
</ins><span class="cx"> 2007-03-07 Shrikant Gangoda <shrikant.gangoda@celunite.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Maciej.
</span></span></pre></div>
<a id="trunkJavaScriptCorewtfFastMalloccpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/wtf/FastMalloc.cpp (20019 => 20020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/wtf/FastMalloc.cpp 2007-03-07 15:37:06 UTC (rev 20019)
+++ trunk/JavaScriptCore/wtf/FastMalloc.cpp 2007-03-07 16:34:56 UTC (rev 20020)
</span><span class="lines">@@ -78,15 +78,29 @@
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><del>-static bool isForbidden = false;
</del><ins>+static pthread_key_t isForbiddenKey;
+static pthread_once_t isForbiddenKeyOnce = PTHREAD_ONCE_INIT;
+static void initializeIsForbiddenKey()
+{
+ pthread_key_create(&isForbiddenKey, 0);
+}
+
+static bool isForbidden()
+{
+ pthread_once(&isForbiddenKeyOnce, initializeIsForbiddenKey);
+ return !!pthread_getspecific(isForbiddenKey);
+}
+
</ins><span class="cx"> void fastMallocForbid()
</span><span class="cx"> {
</span><del>- isForbidden = true;
</del><ins>+ pthread_once(&isForbiddenKeyOnce, initializeIsForbiddenKey);
+ pthread_setspecific(isForbiddenKey, &isForbiddenKey);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void fastMallocAllow()
</span><span class="cx"> {
</span><del>- isForbidden = false;
</del><ins>+ pthread_once(&isForbiddenKeyOnce, initializeIsForbiddenKey);
+ pthread_setspecific(isForbiddenKey, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WTF
</span><span class="lines">@@ -103,25 +117,25 @@
</span><span class="cx">
</span><span class="cx"> void *fastMalloc(size_t n)
</span><span class="cx"> {
</span><del>- ASSERT(!isForbidden);
</del><ins>+ ASSERT(!isForbidden());
</ins><span class="cx"> return malloc(n);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void *fastCalloc(size_t n_elements, size_t element_size)
</span><span class="cx"> {
</span><del>- ASSERT(!isForbidden);
</del><ins>+ ASSERT(!isForbidden());
</ins><span class="cx"> return calloc(n_elements, element_size);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void fastFree(void* p)
</span><span class="cx"> {
</span><del>- ASSERT(!isForbidden);
</del><ins>+ ASSERT(!isForbidden());
</ins><span class="cx"> free(p);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void *fastRealloc(void* p, size_t n)
</span><span class="cx"> {
</span><del>- ASSERT(!isForbidden);
</del><ins>+ ASSERT(!isForbidden());
</ins><span class="cx"> return realloc(p, n);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1903,7 +1917,7 @@
</span><span class="cx">
</span><span class="cx"> #ifdef WTF_CHANGES
</span><span class="cx"> ASSERT(isMultiThreaded || pthread_main_np());
</span><del>- ASSERT(!isForbidden);
</del><ins>+ ASSERT(!isForbidden());
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifndef WTF_CHANGES
</span></span></pre>
</div>
</div>
</body>
</html>