[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [74802] trunk/JavaScriptCore
From: paroga () webkit ! org
Date: 2010-12-30 19:34:11
Message-ID: 20101230193411.53AD3616E71C () beta ! macosforge ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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>[74802] trunk/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/74802">74802</a></dd> \
<dt>Author</dt> <dd>paroga@webkit.org</dd> <dt>Date</dt> <dd>2010-12-30 11:34:03 \
-0800 (Thu, 30 Dec 2010)</dd> </dl>
<h3>Log Message</h3>
<pre>2010-12-30 Patrick Gansterer <paroga@webkit.org>
Reviewed by Darin Adler.
Use OS(WINDOWS) instead of COMPILER(MSVC) in FastMalloc.cpp
https://bugs.webkit.org/show_bug.cgi?id=51743
Most of the ifdefs belong to windows and not to the MSVC compiler.
* wtf/FastMalloc.cpp:</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 (74801 => \
74802)</h4> <pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/ChangeLog 2010-12-30 19:31:00 UTC (rev \
74801)
+++ trunk/JavaScriptCore/ChangeLog 2010-12-30 19:34:03 UTC (rev 74802)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2010-12-30 Patrick Gansterer <paroga@webkit.org>
+
+ Reviewed by Darin Adler.
+
+ Use OS(WINDOWS) instead of COMPILER(MSVC) in FastMalloc.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=51743
+
+ Most of the ifdefs belong to windows and not to the MSVC compiler.
+
+ * wtf/FastMalloc.cpp:
+
</ins><span class="cx"> 2010-12-29 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Sam Weinig.
</span></span></pre></div>
<a id="trunkJavaScriptCorewtfFastMalloccpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/wtf/FastMalloc.cpp (74801 => \
74802)</h4> <pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/wtf/FastMalloc.cpp 2010-12-30 19:31:00 \
UTC (rev 74801)
+++ trunk/JavaScriptCore/wtf/FastMalloc.cpp 2010-12-30 19:34:03 UTC (rev 74802)
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx">
</span><span class="cx"> #if OS(DARWIN)
</span><span class="cx"> #include <malloc/malloc.h>
</span><del>-#elif COMPILER(MSVC)
</del><ins>+#elif OS(WINDOWS)
</ins><span class="cx"> #include <malloc.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if OS(DARWIN)
</span><span class="cx"> return malloc_size(p);
</span><del>-#elif COMPILER(MSVC) && !PLATFORM(BREWMP)
</del><ins>+#elif OS(WINDOWS) && !PLATFORM(BREWMP)
</ins><span class="cx"> // Brew MP uses its own memory allocator, so _msize does \
not work on the Brew MP simulator. </span><span class="cx"> return \
_msize(const_cast<void*>(p)); </span><span class="cx"> #else
</span><span class="lines">@@ -2151,7 +2151,7 @@
</span><span class="cx"> class TCMalloc_ThreadCache {
</span><span class="cx"> private:
</span><span class="cx"> typedef TCMalloc_ThreadCache_FreeList FreeList;
</span><del>-#if COMPILER(MSVC)
</del><ins>+#if OS(WINDOWS)
</ins><span class="cx"> typedef DWORD ThreadIdentifier;
</span><span class="cx"> #else
</span><span class="cx"> typedef pthread_t ThreadIdentifier;
</span><span class="lines">@@ -2442,7 +2442,7 @@
</span><span class="cx"> // Until then, we use a slow path to get the heap object.
</span><span class="cx"> static bool tsd_inited = false;
</span><span class="cx"> static pthread_key_t heap_key;
</span><del>-#if COMPILER(MSVC)
</del><ins>+#if OS(WINDOWS)
</ins><span class="cx"> DWORD tlsIndex = TLS_OUT_OF_INDEXES;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -2451,7 +2451,7 @@
</span><span class="cx"> // still do pthread_setspecific when using MSVC fast TLS \
to </span><span class="cx"> // benefit from the delete callback.
</span><span class="cx"> pthread_setspecific(heap_key, heap);
</span><del>-#if COMPILER(MSVC)
</del><ins>+#if OS(WINDOWS)
</ins><span class="cx"> TlsSetValue(tlsIndex, heap);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -2962,7 +2962,7 @@
</span><span class="cx"> // __thread is faster, but only when the kernel supports \
it </span><span class="cx"> if (KernelSupportsTLS())
</span><span class="cx"> return threadlocal_heap;
</span><del>-#elif COMPILER(MSVC)
</del><ins>+#elif OS(WINDOWS)
</ins><span class="cx"> return \
static_cast<TCMalloc_ThreadCache*>(TlsGetValue(tlsIndex)); </span><span \
class="cx"> #else </span><span class="cx"> return \
static_cast<TCMalloc_ThreadCache*>(pthread_getspecific(heap_key)); </span><span \
class="lines">@@ -2992,12 +2992,12 @@ </span><span class="cx"> void \
TCMalloc_ThreadCache::InitTSD() { </span><span class="cx"> ASSERT(!tsd_inited);
</span><span class="cx"> pthread_key_create(&heap_key, DestroyThreadCache);
</span><del>-#if COMPILER(MSVC)
</del><ins>+#if OS(WINDOWS)
</ins><span class="cx"> tlsIndex = TlsAlloc();
</span><span class="cx"> #endif
</span><span class="cx"> tsd_inited = true;
</span><span class="cx">
</span><del>-#if !COMPILER(MSVC)
</del><ins>+#if !OS(WINDOWS)
</ins><span class="cx"> // We may have used a fake pthread_t for the main thread. \
Fix it. </span><span class="cx"> pthread_t zero;
</span><span class="cx"> memset(&zero, 0, sizeof(zero));
</span><span class="lines">@@ -3008,7 +3008,7 @@
</span><span class="cx"> ASSERT(pageheap_lock.IsHeld());
</span><span class="cx"> #endif
</span><span class="cx"> for (TCMalloc_ThreadCache* h = thread_heaps; h != NULL; h \
= h->next_) { </span><del>-#if COMPILER(MSVC)
</del><ins>+#if OS(WINDOWS)
</ins><span class="cx"> if (h->tid_ == 0) {
</span><span class="cx"> h->tid_ = GetCurrentThreadId();
</span><span class="cx"> }
</span><span class="lines">@@ -3026,7 +3026,7 @@
</span><span class="cx"> {
</span><span class="cx"> SpinLockHolder h(&pageheap_lock);
</span><span class="cx">
</span><del>-#if COMPILER(MSVC)
</del><ins>+#if OS(WINDOWS)
</ins><span class="cx"> DWORD me;
</span><span class="cx"> if (!tsd_inited) {
</span><span class="cx"> me = 0;
</span><span class="lines">@@ -3047,7 +3047,7 @@
</span><span class="cx"> // In that case, the heap for this thread has already \
been created </span><span class="cx"> // and added to the linked list. So we \
search for that first. </span><span class="cx"> for (TCMalloc_ThreadCache* h = \
thread_heaps; h != NULL; h = h->next_) { </span><del>-#if COMPILER(MSVC)
</del><ins>+#if OS(WINDOWS)
</ins><span class="cx"> if (h->tid_ == me) {
</span><span class="cx"> #else
</span><span class="cx"> if (pthread_equal(h->tid_, me)) {
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic