<!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>[212584] branches/safari-603-branch/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/212584">212584</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-17 15:39:13 -0800 (Fri, 17 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert "rdar://problem/30553220"
This reverts commit d49f396c122789d495a54a97f49787b0cd4308cd.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchSourceJavaScriptCoreChangeLog">branches/safari-603-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceJavaScriptCoreruntimeOptionscpp">branches/safari-603-branch/Source/JavaScriptCore/runtime/Options.cpp</a></li>
<li><a href="#branchessafari603branchSourceJavaScriptCoreruntimeOptionsh">branches/safari-603-branch/Source/JavaScriptCore/runtime/Options.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/ChangeLog (212583 => 212584)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/ChangeLog 2017-02-17 23:36:50 UTC (rev 212583)
+++ branches/safari-603-branch/Source/JavaScriptCore/ChangeLog 2017-02-17 23:39:13 UTC (rev 212584)
</span><span class="lines">@@ -1,23 +1,3 @@
</span><del>-2017-02-16 JF Bastien <jfbastien@apple.com>
-
- A/B test concurrent GC
- https://bugs.webkit.org/show_bug.cgi?id=168453
-
- Reviewed by Filip Pizlo and Alexey Proskuryakov.
-
- Landed by Matthew Hanson.
-
- The concurrent GC may be causing more crashes, but it's hard to
- tell. A/B test this by setting it off for 50% of users, based on
- the UUID which crash tracer generates. From this we can look at
- crashes and figure out whether the concurrent GC was on or off,
- and derive whether fewer crashes occur when it's off.
-
- * runtime/Options.cpp:
- (getUserUUID):
- (JSC::recomputeDependentOptions):
- * runtime/Options.h:
-
</del><span class="cx"> 2017-02-16 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix merge issue with r212085 (rdar://problem/29939864).
</span></span></pre></div>
<a id="branchessafari603branchSourceJavaScriptCoreruntimeOptionscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/runtime/Options.cpp (212583 => 212584)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/runtime/Options.cpp 2017-02-17 23:36:50 UTC (rev 212583)
+++ branches/safari-603-branch/Source/JavaScriptCore/runtime/Options.cpp 2017-02-17 23:39:13 UTC (rev 212584)
</span><span class="lines">@@ -43,40 +43,6 @@
</span><span class="cx"> #include <wtf/StringExtras.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><del>-#if OS(DARWIN) && USE(APPLE_INTERNAL_SDK)
-#include <dlfcn.h>
-#include <CoreFoundation/CFString.h>
-#include <SystemConfiguration/SystemConfiguration.h>
-#include <WebCore/SoftLinking.h>
-SOFT_LINK_PRIVATE_FRAMEWORK(CrashReporterSupport);
-SOFT_LINK(CrashReporterSupport, CRGetUserUUID, CFStringRef, (void), ());
-static const char* getUserUUID()
-{
- static CFStringRef (*softLinkCRGetUserUUID)(void);
- static constexpr const size_t maxBytes = 37;
- static char userUUID[maxBytes] = { '\0' };
- static bool failed = true;
- static std::once_flag once;
- std::call_once(once, [] {
- softLinkCRGetUserUUID = (CFStringRef (*)(void)) dlsym(CrashReporterSupportLibrary(), "CRGetUserUUID");
- if (!softLinkCRGetUserUUID) {
- dataLog("Failed getting user UUID: ", dlerror(), "\n");
- return;
- }
- CFStringRef userUUIDString = CRGetUserUUID();
- CFIndex length = CFStringGetLength(userUUIDString);
- CFRange range = CFRangeMake(0, length);
- CFIndex numConvertedCharacters = CFStringGetBytes(userUUIDString, range, kCFStringEncodingASCII, 0, false, reinterpret_cast<UInt8*>(userUUID), maxBytes - 1, nullptr);
- if (numConvertedCharacters <= 0 || static_cast<size_t>(numConvertedCharacters) >= maxBytes) {
- dataLog("Failed getting user UUID: ", numConvertedCharacters, numConvertedCharacters, maxBytes, "\n");
- return;
- }
- failed = false;
- });
- return failed ? nullptr : userUUID;
-}
-#endif
-
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> #include <crt_externs.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -384,29 +350,6 @@
</span><span class="cx"> #if !CPU(X86_64) && !CPU(ARM64)
</span><span class="cx"> Options::useConcurrentGC() = false;
</span><span class="cx"> #endif
</span><del>-#if OS(DARWIN) && USE(APPLE_INTERNAL_SDK)
- if (Options::enableABTesting() && Options::useConcurrentGC()) {
- // Run an A/B test on concurrent GC: if it was going to be on, turn it
- // off with some probability. Do this deterministically per unique user
- // identifier so that crashes don't skew statistics, and do it in a
- // manner which can be reconstructed from a crash trace.
- uint32_t accumulator = 0;
- const char* userUUID = getUserUUID();
- if (!userUUID) {
- dataLog("A/B test: not setting useConcurrentGC because we failed to obtain the user UUID\n");
- } else {
- for (const char* c = userUUID; *c; ++c)
- accumulator += *c;
- accumulator = (accumulator & 0xFFFFu) ^ (accumulator >> 16);
- accumulator = (accumulator & 0xFF) ^ (accumulator >> 8);
- accumulator = (accumulator & 0xF) ^ (accumulator >> 4);
- accumulator = (accumulator & 0x3) ^ (accumulator >> 2);
- accumulator = (accumulator & 0x1) ^ (accumulator >> 1);
- Options::useConcurrentGC() = accumulator;
- dataLog("A/B test: setting useConcurrentGC to ", Options::useConcurrentGC(), " based on user UUID ", userUUID, "\n");
- }
- }
-#endif
</del><span class="cx">
</span><span class="cx"> #if OS(WINDOWS) && CPU(X86)
</span><span class="cx"> // Disable JIT on Windows if SSE2 is not present
</span></span></pre></div>
<a id="branchessafari603branchSourceJavaScriptCoreruntimeOptionsh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/runtime/Options.h (212583 => 212584)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/runtime/Options.h 2017-02-17 23:36:50 UTC (rev 212583)
+++ branches/safari-603-branch/Source/JavaScriptCore/runtime/Options.h 2017-02-17 23:39:13 UTC (rev 212584)
</span><span class="lines">@@ -417,8 +417,6 @@
</span><span class="cx"> v(bool, useCodeCache, true, Normal, "If false, the unlinked byte code cache will not be used.") \
</span><span class="cx"> \
</span><span class="cx"> v(bool, useWebAssembly, false, Normal, "Expose the WebAssembly global object.") \
</span><del>- \
- v(bool, enableABTesting, true, Normal, "If true, A/B testing will be performed to modify options, if false no A/B testing will be performed.") \
</del><span class="cx">
</span><span class="cx"> enum OptionEquivalence {
</span><span class="cx"> SameOption,
</span></span></pre>
</div>
</div>
</body>
</html>