Changeset 158890 in webkit

Timestamp:

Nov 7, 2013 5:54:28 PM (10 years ago)

Author:

andersca@apple.com

Message:

Get rid of the out-of-line memory attachment type
​https://bugs.webkit.org/show_bug.cgi?id=124023

Reviewed by Andreas Kling.

We're only using out-of-line memory for when the message body is too big, so
isolate that code in Connection and get rid of the out of line attachment type.

• Platform/CoreIPC/Attachment.cpp:

(CoreIPC::Attachment::Attachment):

• Platform/CoreIPC/Attachment.h:

(CoreIPC::Attachment::port):
(CoreIPC::Attachment::disposition):

• Platform/CoreIPC/mac/ConnectionMac.cpp:

(CoreIPC::Connection::sendOutgoingMessage):
(CoreIPC::createMessageDecoder):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/CoreIPC/Attachment.cpp (modified) (1 diff)
• Platform/CoreIPC/Attachment.h (modified) (4 diffs)
• Platform/CoreIPC/mac/ConnectionMac.cpp (modified) (7 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-11-07  Anders Carlsson  <andersca@apple.com>
+
+        Get rid of the out-of-line memory attachment type
+        https://bugs.webkit.org/show_bug.cgi?id=124023
+
+        Reviewed by Andreas Kling.
+
+        We're only using out-of-line memory for when the message body is too big, so
+        isolate that code in Connection and get rid of the out of line attachment type.
+
+        * Platform/CoreIPC/Attachment.cpp:
+        (CoreIPC::Attachment::Attachment):
+        * Platform/CoreIPC/Attachment.h:
+        (CoreIPC::Attachment::port):
+        (CoreIPC::Attachment::disposition):
+        * Platform/CoreIPC/mac/ConnectionMac.cpp:
+        (CoreIPC::Connection::sendOutgoingMessage):
+        (CoreIPC::createMessageDecoder):
+
 2013-11-07  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit2/Platform/CoreIPC/Attachment.cpp

@@ -40 +40 @@
 Attachment::Attachment(mach_port_name_t port, mach_msg_type_name_t disposition)
     : m_type(MachPortType)
+    , m_port(port)
+    , m_disposition(disposition)
 {
-    m_port.port = port;
-    m_port.disposition = disposition;
-}
-
-Attachment::Attachment(void* address, mach_msg_size_t size, mach_msg_copy_options_t copyOptions, bool deallocate)
-    : m_type(MachOOLMemoryType)
-{
-    m_oolMemory.address = address;
-    m_oolMemory.size = size;
-    m_oolMemory.copyOptions = copyOptions;
-    m_oolMemory.deallocate = deallocate;
 }
 

trunk/Source/WebKit2/Platform/CoreIPC/Attachment.h

@@ -45 +45 @@
 #if OS(DARWIN)
         MachPortType,
-        MachOOLMemoryType,
 #elif USE(UNIX_DOMAIN_SOCKETS)
         SocketType,
@@ -54 +53 @@
 #if OS(DARWIN)
     Attachment(mach_port_name_t port, mach_msg_type_name_t disposition);
-    Attachment(void* address, mach_msg_size_t size, mach_msg_copy_options_t copyOptions, bool deallocate);
 #elif USE(UNIX_DOMAIN_SOCKETS)
     Attachment(int fileDescriptor, size_t);
@@ -66 +64 @@
 
     // MachPortType
-    mach_port_name_t port() const { ASSERT(m_type == MachPortType); return m_port.port; }
-    mach_msg_type_name_t disposition() const { ASSERT(m_type == MachPortType); return m_port.disposition; }
+    mach_port_name_t port() const { return m_port; }
+    mach_msg_type_name_t disposition() const { return m_disposition; }
 
-    // MachOOLMemoryType
-    void* address() const { ASSERT(m_type == MachOOLMemoryType); return m_oolMemory.address; }
-    mach_msg_size_t size() const { ASSERT(m_type == MachOOLMemoryType); return m_oolMemory.size; }
-    mach_msg_copy_options_t copyOptions() const { ASSERT(m_type == MachOOLMemoryType); return m_oolMemory.copyOptions; }
-    bool deallocate() const { ASSERT(m_type == MachOOLMemoryType); return m_oolMemory.deallocate; }
 #elif USE(UNIX_DOMAIN_SOCKETS)
     size_t size() const { return m_size; }
@@ -90 +83 @@
 
 #if OS(DARWIN)
-    union {
-        struct {
-            mach_port_name_t port;
-            mach_msg_type_name_t disposition;
-        } m_port;
-        struct {
-            void* address;
-            mach_msg_size_t size;
-            mach_msg_copy_options_t copyOptions;
-            bool deallocate;
-        } m_oolMemory;
-    };
+    mach_port_name_t m_port;
+    mach_msg_type_name_t m_disposition;
 #elif USE(UNIX_DOMAIN_SOCKETS)
     int m_fileDescriptor;

trunk/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp

@@ -202 +202 @@
         if (type == Attachment::MachPortType)
             numberOfPortDescriptors++;
-        else if (type == Attachment::MachOOLMemoryType)
-            numberOfOOLMemoryDescriptors++;
     }
     
@@ -213 +211 @@
         messageBodyIsOOL = true;
 
-        attachments.append(Attachment(encoder->buffer(), encoder->bufferSize(), MACH_MSG_VIRTUAL_COPY, false));
         numberOfOOLMemoryDescriptors++;
         messageSize = machMessageSize(0, numberOfPortDescriptors, numberOfOOLMemoryDescriptors);
@@ -221 +218 @@
 
     mach_msg_header_t* header = reinterpret_cast<mach_msg_header_t*>(&buffer);
-    header->msgh_bits = isComplex ? MACH_MSGH_BITS(MACH_MSG_TYPE_COPY_SEND | MACH_MSGH_BITS_COMPLEX, 0) : MACH_MSGH_BITS(MACH_MSG_TYPE_COPY_SEND, 0);
+    header->msgh_bits = MACH_MSGH_BITS(MACH_MSG_TYPE_COPY_SEND, 0);
     header->msgh_size = messageSize;
     header->msgh_remote_port = m_sendPort;
@@ -232 +229 @@
 
     if (isComplex) {
+        header->msgh_bits |= MACH_MSGH_BITS_COMPLEX;
+
         mach_msg_body_t* body = reinterpret_cast<mach_msg_body_t*>(header + 1);
         body->msgh_descriptor_count = numberOfPortDescriptors + numberOfOOLMemoryDescriptors;
-
         uint8_t* descriptorData = reinterpret_cast<uint8_t*>(body + 1);
+
         for (size_t i = 0; i < attachments.size(); ++i) {
             Attachment attachment = attachments[i];
@@ -248 +247 @@
                 descriptorData += sizeof(mach_msg_port_descriptor_t);
                 break;
-            case Attachment::MachOOLMemoryType:
-                descriptor->out_of_line.address = attachment.address();
-                descriptor->out_of_line.size = attachment.size();
-                descriptor->out_of_line.copy = attachment.copyOptions();
-                descriptor->out_of_line.deallocate = attachment.deallocate();
-                descriptor->out_of_line.type = MACH_MSG_OOL_DESCRIPTOR;            
-
-                descriptorData += sizeof(mach_msg_ool_descriptor_t);
-                break;
             default:
                 ASSERT_NOT_REACHED();
             }
+        }
+
+        if (messageBodyIsOOL) {
+            mach_msg_descriptor_t* descriptor = reinterpret_cast<mach_msg_descriptor_t*>(descriptorData);
+
+            descriptor->out_of_line.address = encoder->buffer();
+            descriptor->out_of_line.size = encoder->bufferSize();
+            descriptor->out_of_line.copy = MACH_MSG_VIRTUAL_COPY;
+            descriptor->out_of_line.deallocate = false;
+            descriptor->out_of_line.type = MACH_MSG_OOL_DESCRIPTOR;
+
+            descriptorData += sizeof(mach_msg_ool_descriptor_t);
         }
 
@@ -327 +329 @@
             descriptorData += sizeof(mach_msg_port_descriptor_t);
             break;
-        case MACH_MSG_OOL_DESCRIPTOR:
-            attachments[numDescriptors - i - 1] = Attachment(descriptor->out_of_line.address, descriptor->out_of_line.size, descriptor->out_of_line.copy, descriptor->out_of_line.deallocate);
-            descriptorData += sizeof(mach_msg_ool_descriptor_t);
-            break;
         default:
             ASSERT(false && "Unhandled descriptor type");
@@ -339 +337 @@
         mach_msg_descriptor_t* descriptor = reinterpret_cast<mach_msg_descriptor_t*>(descriptorData);
         ASSERT(descriptor->type.type == MACH_MSG_OOL_DESCRIPTOR);
-        Attachment messageBodyAttachment(descriptor->out_of_line.address, descriptor->out_of_line.size,
-                                         descriptor->out_of_line.copy, descriptor->out_of_line.deallocate);
-
-        uint8_t* messageBody = static_cast<uint8_t*>(messageBodyAttachment.address());
-        size_t messageBodySize = messageBodyAttachment.size();
+
+        uint8_t* messageBody = static_cast<uint8_t*>(descriptor->out_of_line.address);
+        size_t messageBodySize = descriptor->out_of_line.size;
 
         auto decoder = std::make_unique<MessageDecoder>(DataReference(messageBody, messageBodySize), std::move(attachments));
 
-        vm_deallocate(mach_task_self(), reinterpret_cast<vm_address_t>(messageBodyAttachment.address()), messageBodyAttachment.size());
+        vm_deallocate(mach_task_self(), reinterpret_cast<vm_address_t>(descriptor->out_of_line.address), descriptor->out_of_line.size);
 
         return decoder;