<!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>[177931] 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/177931">177931</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2015-01-05 15:33:54 -0800 (Mon, 05 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix up bmalloc's PerThread for use on Linux
https://bugs.webkit.org/show_bug.cgi?id=139804
Reviewed by Anders Carlsson.
The previous implementation was a bit slow.
* bmalloc/PerThread.h:
(bmalloc::PerThreadStorage<Cache>::get):
(bmalloc::PerThreadStorage::get):
(bmalloc::PerThreadStorage::init): Added a catch-all cross-platform Unix
way to do fast per-thread access without taking a lock every time. This
probably works on all the platforms we care about, and it matches other
techniques we use elsewhere in WebKit.
(bmalloc::PerThread<T>::getFastCase): Removed the conditional from
this class because PerThreadStorage now encapsulates everything that
needs to be conditional.
(bmalloc::PerThreadStorage::initSharedKeyIfNeeded): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourcebmallocChangeLog">trunk/Source/bmalloc/ChangeLog</a></li>
<li><a href="#trunkSourcebmallocbmallocPerThreadh">trunk/Source/bmalloc/bmalloc/PerThread.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (177930 => 177931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog 2015-01-05 22:37:46 UTC (rev 177930)
+++ trunk/Source/bmalloc/ChangeLog 2015-01-05 23:33:54 UTC (rev 177931)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-01-05 Geoffrey Garen <ggaren@apple.com>
+
+ Fix up bmalloc's PerThread for use on Linux
+ https://bugs.webkit.org/show_bug.cgi?id=139804
+
+ Reviewed by Anders Carlsson.
+
+ The previous implementation was a bit slow.
+
+ * bmalloc/PerThread.h:
+ (bmalloc::PerThreadStorage<Cache>::get):
+ (bmalloc::PerThreadStorage::get):
+ (bmalloc::PerThreadStorage::init): Added a catch-all cross-platform Unix
+ way to do fast per-thread access without taking a lock every time. This
+ probably works on all the platforms we care about, and it matches other
+ techniques we use elsewhere in WebKit.
+
+ (bmalloc::PerThread<T>::getFastCase): Removed the conditional from
+ this class because PerThreadStorage now encapsulates everything that
+ needs to be conditional.
+
+ (bmalloc::PerThreadStorage::initSharedKeyIfNeeded): Deleted.
+
</ins><span class="cx"> 2014-12-26 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> <rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocPerThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/PerThread.h (177930 => 177931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/PerThread.h 2015-01-05 22:37:46 UTC (rev 177930)
+++ trunk/Source/bmalloc/bmalloc/PerThread.h 2015-01-05 23:33:54 UTC (rev 177931)
</span><span class="lines">@@ -50,17 +50,21 @@
</span><span class="cx"> static void destructor(void*);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class Cache;
</del><ins>+#if defined(__has_include) && __has_include(<System/pthread_machdep.h>)
</ins><span class="cx">
</span><ins>+class Cache;
</ins><span class="cx"> template<typename T> struct PerThreadStorage;
</span><span class="cx">
</span><del>-#if defined(__has_include) && __has_include(<System/pthread_machdep.h>)
</del><span class="cx"> // For now, we only support PerThread<Cache>. We can expand to other types by
</span><span class="cx"> // using more keys.
</span><del>-
</del><span class="cx"> template<> struct PerThreadStorage<Cache> {
</span><span class="cx"> static const pthread_key_t key = __PTK_FRAMEWORK_JAVASCRIPTCORE_KEY0;
</span><del>- static void* get() { return _pthread_getspecific_direct(key); }
</del><ins>+
+ static void* get()
+ {
+ return _pthread_getspecific_direct(key);
+ }
+
</ins><span class="cx"> static void init(void* object, void (*destructor)(void*))
</span><span class="cx"> {
</span><span class="cx"> _pthread_setspecific_direct(key, object);
</span><span class="lines">@@ -71,52 +75,36 @@
</span><span class="cx"> #else
</span><span class="cx">
</span><span class="cx"> template<typename T> struct PerThreadStorage {
</span><del>-#if BCOMPILER_SUPPORTS(CXX_THREAD_LOCAL)
- static __thread void* object;
-#endif
- static pthread_key_t key;
- static std::once_flag onceFlag;
-
</del><ins>+ static bool s_didInitialize;
+ static pthread_key_t s_key;
+ static std::once_flag s_onceFlag;
+
</ins><span class="cx"> static void* get()
</span><span class="cx"> {
</span><del>-#if BCOMPILER_SUPPORTS(CXX_THREAD_LOCAL)
- return object;
-#else
- return pthread_getspecific(key);
-#endif
</del><ins>+ if (!s_didInitialize)
+ return nullptr;
+ return pthread_getspecific(s_key);
</ins><span class="cx"> }
</span><del>-
- static void initSharedKeyIfNeeded(void (*destructor)(void*))
</del><ins>+
+ static void init(void* object, void (*destructor)(void*))
</ins><span class="cx"> {
</span><del>- std::call_once(onceFlag, [destructor]() {
- pthread_key_create(&key, destructor);
</del><ins>+ std::call_once(s_onceFlag, [destructor]() {
+ pthread_key_create(&s_key, destructor);
+ s_didInitialize = true;
</ins><span class="cx"> });
</span><ins>+ pthread_setspecific(s_key, object);
</ins><span class="cx"> }
</span><del>-
- static void init(void* object, void (*destructor)(void*))
- {
- initSharedKeyIfNeeded(destructor);
- pthread_setspecific(key, object);
-#if BCOMPILER_SUPPORTS(CXX_THREAD_LOCAL)
- PerThreadStorage<Cache>::object = object;
-#endif
- }
</del><span class="cx"> };
</span><span class="cx">
</span><del>-#if BCOMPILER_SUPPORTS(CXX_THREAD_LOCAL)
-template<typename T> __thread void* PerThreadStorage<T>::object;
-#endif
-template<typename T> pthread_key_t PerThreadStorage<T>::key;
-template<typename T> std::once_flag PerThreadStorage<T>::onceFlag;
</del><ins>+template<typename T> bool PerThreadStorage<T>::s_didInitialize;
+template<typename T> pthread_key_t PerThreadStorage<T>::s_key;
+template<typename T> std::once_flag PerThreadStorage<T>::s_onceFlag;
</ins><span class="cx">
</span><span class="cx"> #endif // defined(__has_include) && __has_include(<System/pthread_machdep.h>)
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span><span class="cx"> INLINE T* PerThread<T>::getFastCase()
</span><span class="cx"> {
</span><del>-#if (!defined(__has_include) || !__has_include(<System/pthread_machdep.h>)) && !BCOMPILER_SUPPORTS(CXX_THREAD_LOCAL)
- PerThreadStorage<T>::initSharedKeyIfNeeded(destructor);
-#endif
</del><span class="cx"> return static_cast<T*>(PerThreadStorage<T>::get());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>