<!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>[172608] 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/172608">172608</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2014-08-14 14:39:47 -0700 (Thu, 14 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixed a bmalloc crash seen on the EWS bot
https://bugs.webkit.org/show_bug.cgi?id=135955
Reviewed by Andreas Kling.
* bmalloc/Syscall.h: Some CG APIs vm_copy their input buffers. If the
input buffer is a malloc region, that region will get marked Copy-On-Write
by the kernel. Calls to madvise() for COW regions fail and return EINVAL
on older OS X's. In 10.10, they still fail, but they do not return
EINVAL.
So, we can only ASSERT that our syscalls succeed starting with 10.10.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourcebmallocChangeLog">trunk/Source/bmalloc/ChangeLog</a></li>
<li><a href="#trunkSourcebmallocbmallocSyscallh">trunk/Source/bmalloc/bmalloc/Syscall.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (172607 => 172608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog 2014-08-14 21:36:40 UTC (rev 172607)
+++ trunk/Source/bmalloc/ChangeLog 2014-08-14 21:39:47 UTC (rev 172608)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2014-08-14 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><ins>+ Fixed a bmalloc crash seen on the EWS bot
+ https://bugs.webkit.org/show_bug.cgi?id=135955
+
+ Reviewed by Andreas Kling.
+
+ * bmalloc/Syscall.h: Some CG APIs vm_copy their input buffers. If the
+ input buffer is a malloc region, that region will get marked Copy-On-Write
+ by the kernel. Calls to madvise() for COW regions fail and return EINVAL
+ on older OS X's. In 10.10, they still fail, but they do not return
+ EINVAL.
+
+ So, we can only ASSERT that our syscalls succeed starting with 10.10.
+
+2014-08-14 Geoffrey Garen <ggaren@apple.com>
+
</ins><span class="cx"> Fixed the bmalloc build
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=135953
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocSyscallh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Syscall.h (172607 => 172608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Syscall.h 2014-08-14 21:36:40 UTC (rev 172607)
+++ trunk/Source/bmalloc/bmalloc/Syscall.h 2014-08-14 21:39:47 UTC (rev 172608)
</span><span class="lines">@@ -28,9 +28,21 @@
</span><span class="cx">
</span><span class="cx"> #include <errno.h>
</span><span class="cx">
</span><ins>+#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
+
</ins><span class="cx"> #define SYSCALL(x) do { \
</span><span class="cx"> while ((x) == -1) \
</span><span class="cx"> RELEASE_BASSERT(errno == EAGAIN); \
</span><span class="cx"> } while (0);
</span><span class="cx">
</span><ins>+#else
+
+// Older versions of OS X return EINVAL when trying to madvise COW pages. So, we
+// can't ASSERT that we'll only see EAGAIN.
+#define SYSCALL(x) do { \
+ while ((x) == -1 && errno == EAGAIN) { } \
+} while (0);
+
+#endif
+
</ins><span class="cx"> #endif // Syscall_h
</span></span></pre>
</div>
</div>
</body>
</html>