<!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>[182804] trunk/Source/WebKit2</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/182804">182804</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-04-14 12:15:28 -0700 (Tue, 14 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>More work on making the SharedMemory interface more sane
https://bugs.webkit.org/show_bug.cgi?id=143718
Reviewed by Andreas Kling.
Get rid of m_shouldVMDeallocateData. The idea is that shared memory created by calling
SharedMemory::allocate has a non-null m_data pointer, and a null m_port. Shared memory created
by calling SharedMemory::create with a pointer and a length has a non-null port but a null m_data
since the data can be unmapped by the caller and we don't want to hold on to dangling pointers.
* Platform/SharedMemory.h:
(WebKit::SharedMemory::data):
* Platform/mac/SharedMemoryMac.cpp:
(WebKit::SharedMemory::allocate):
(WebKit::SharedMemory::create):
(WebKit::SharedMemory::map):
(WebKit::SharedMemory::~SharedMemory):
(WebKit::SharedMemory::createHandle):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformSharedMemoryh">trunk/Source/WebKit2/Platform/SharedMemory.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformmacSharedMemoryMaccpp">trunk/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182803 => 182804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-14 18:40:27 UTC (rev 182803)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-14 19:15:28 UTC (rev 182804)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-04-14 Anders Carlsson <andersca@apple.com>
+
+ More work on making the SharedMemory interface more sane
+ https://bugs.webkit.org/show_bug.cgi?id=143718
+
+ Reviewed by Andreas Kling.
+
+ Get rid of m_shouldVMDeallocateData. The idea is that shared memory created by calling
+ SharedMemory::allocate has a non-null m_data pointer, and a null m_port. Shared memory created
+ by calling SharedMemory::create with a pointer and a length has a non-null port but a null m_data
+ since the data can be unmapped by the caller and we don't want to hold on to dangling pointers.
+
+ * Platform/SharedMemory.h:
+ (WebKit::SharedMemory::data):
+ * Platform/mac/SharedMemoryMac.cpp:
+ (WebKit::SharedMemory::allocate):
+ (WebKit::SharedMemory::create):
+ (WebKit::SharedMemory::map):
+ (WebKit::SharedMemory::~SharedMemory):
+ (WebKit::SharedMemory::createHandle):
+
</ins><span class="cx"> 2015-04-14 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Network Cache: Deduplicate body data
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformSharedMemoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/SharedMemory.h (182803 => 182804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/SharedMemory.h 2015-04-14 18:40:27 UTC (rev 182803)
+++ trunk/Source/WebKit2/Platform/SharedMemory.h 2015-04-14 19:15:28 UTC (rev 182804)
</span><span class="lines">@@ -85,7 +85,11 @@
</span><span class="cx"> bool createHandle(Handle&, Protection);
</span><span class="cx">
</span><span class="cx"> size_t size() const { return m_size; }
</span><del>- void* data() const { return m_data; }
</del><ins>+ void* data() const
+ {
+ ASSERT(m_data);
+ return m_data;
+ }
</ins><span class="cx">
</span><span class="cx"> // Return the system page size in bytes.
</span><span class="cx"> static unsigned systemPageSize();
</span><span class="lines">@@ -93,7 +97,6 @@
</span><span class="cx"> private:
</span><span class="cx"> size_t m_size;
</span><span class="cx"> void* m_data;
</span><del>- bool m_shouldVMDeallocateData;
</del><span class="cx"> Protection m_protection;
</span><span class="cx">
</span><span class="cx"> #if OS(DARWIN)
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformmacSharedMemoryMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp (182803 => 182804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp 2015-04-14 18:40:27 UTC (rev 182803)
+++ trunk/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp 2015-04-14 19:15:28 UTC (rev 182804)
</span><span class="lines">@@ -106,17 +106,16 @@
</span><span class="cx"> kern_return_t kr = mach_vm_allocate(mach_task_self(), &address, round_page(size), VM_FLAGS_ANYWHERE);
</span><span class="cx"> if (kr != KERN_SUCCESS) {
</span><span class="cx"> LOG_ERROR("Failed to allocate mach_vm_allocate shared memory (%zu bytes). %s (%x)", size, mach_error_string(kr), kr);
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<SharedMemory> sharedMemory = create(toPointer(address), size, Protection::ReadWrite);
- if (!sharedMemory) {
- mach_vm_deallocate(mach_task_self(), address, round_page(size));
- return 0;
- }
-
- sharedMemory->m_shouldVMDeallocateData = true;
- return sharedMemory.release();
</del><ins>+ RefPtr<SharedMemory> sharedMemory = adoptRef(*new SharedMemory);
+ sharedMemory->m_size = size;
+ sharedMemory->m_data = toPointer(address);
+ sharedMemory->m_port = MACH_PORT_NULL;
+ sharedMemory->m_protection = Protection::ReadWrite;
+
+ return sharedMemory;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline vm_prot_t machProtection(SharedMemory::Protection protection)
</span><span class="lines">@@ -155,8 +154,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<SharedMemory> sharedMemory(adoptRef(new SharedMemory));
</span><span class="cx"> sharedMemory->m_size = size;
</span><del>- sharedMemory->m_data = data;
- sharedMemory->m_shouldVMDeallocateData = false;
</del><ins>+ sharedMemory->m_data = nullptr;
</ins><span class="cx"> sharedMemory->m_port = port;
</span><span class="cx"> sharedMemory->m_protection = protection;
</span><span class="cx">
</span><span class="lines">@@ -179,7 +177,6 @@
</span><span class="cx"> RefPtr<SharedMemory> sharedMemory(adoptRef(new SharedMemory));
</span><span class="cx"> sharedMemory->m_size = handle.m_size;
</span><span class="cx"> sharedMemory->m_data = toPointer(mappedAddress);
</span><del>- sharedMemory->m_shouldVMDeallocateData = true;
</del><span class="cx"> sharedMemory->m_port = MACH_PORT_NULL;
</span><span class="cx"> sharedMemory->m_protection = protection;
</span><span class="cx">
</span><span class="lines">@@ -188,7 +185,7 @@
</span><span class="cx">
</span><span class="cx"> SharedMemory::~SharedMemory()
</span><span class="cx"> {
</span><del>- if (m_data && m_shouldVMDeallocateData) {
</del><ins>+ if (m_data) {
</ins><span class="cx"> kern_return_t kr = mach_vm_deallocate(mach_task_self(), toVMAddress(m_data), round_page(m_size));
</span><span class="cx"> ASSERT_UNUSED(kr, kr == KERN_SUCCESS);
</span><span class="cx"> }
</span><span class="lines">@@ -206,7 +203,6 @@
</span><span class="cx"> ASSERT(!handle.m_port);
</span><span class="cx"> ASSERT(!handle.m_size);
</span><span class="cx">
</span><del>- mach_vm_address_t address = toVMAddress(m_data);
</del><span class="cx"> memory_object_size_t size = round_page(m_size);
</span><span class="cx">
</span><span class="cx"> mach_port_t port;
</span><span class="lines">@@ -217,6 +213,9 @@
</span><span class="cx"> if (mach_port_mod_refs(mach_task_self(), port, MACH_PORT_RIGHT_SEND, 1) != KERN_SUCCESS)
</span><span class="cx"> return false;
</span><span class="cx"> } else {
</span><ins>+ ASSERT(m_data);
+ mach_vm_address_t address = toVMAddress(m_data);
+
</ins><span class="cx"> // Create a mach port that represents the shared memory.
</span><span class="cx"> kern_return_t kr = mach_make_memory_entry_64(mach_task_self(), &size, address, machProtection(protection), &port, MACH_PORT_NULL);
</span><span class="cx"> if (kr != KERN_SUCCESS)
</span></span></pre>
</div>
</div>
</body>
</html>