Changeset 141482 in webkit

Timestamp:

Jan 31, 2013 2:00:22 PM (11 years ago)

Author:

andersca@apple.com

Message:

Use a Vector for IPC attachments
​https://bugs.webkit.org/show_bug.cgi?id=108517

Reviewed by Sam Weinig.

• Platform/CoreIPC/ArgumentDecoder.cpp:

(CoreIPC::ArgumentDecoder::create):
(CoreIPC::ArgumentDecoder::ArgumentDecoder):
(CoreIPC::ArgumentDecoder::removeAttachment):

• Platform/CoreIPC/ArgumentDecoder.h:

(ArgumentDecoder):

• Platform/CoreIPC/Connection.h:
• Platform/CoreIPC/MessageDecoder.cpp:

(CoreIPC::MessageDecoder::create):
(CoreIPC::MessageDecoder::MessageDecoder):

• Platform/CoreIPC/MessageDecoder.h:

(MessageDecoder):

• Platform/CoreIPC/mac/ConnectionMac.cpp:

(CoreIPC::createMessageDecoder):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/CoreIPC/ArgumentDecoder.cpp (modified) (2 diffs)
• Platform/CoreIPC/ArgumentDecoder.h (modified) (3 diffs)
• Platform/CoreIPC/Connection.h (modified) (1 diff)
• Platform/CoreIPC/MessageDecoder.cpp (modified) (2 diffs)
• Platform/CoreIPC/MessageDecoder.h (modified) (2 diffs)
• Platform/CoreIPC/mac/ConnectionMac.cpp (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-01-31  Anders Carlsson  <andersca@apple.com>
+
+        Use a Vector for IPC attachments
+        https://bugs.webkit.org/show_bug.cgi?id=108517
+
+        Reviewed by Sam Weinig.
+
+        * Platform/CoreIPC/ArgumentDecoder.cpp:
+        (CoreIPC::ArgumentDecoder::create):
+        (CoreIPC::ArgumentDecoder::ArgumentDecoder):
+        (CoreIPC::ArgumentDecoder::removeAttachment):
+        * Platform/CoreIPC/ArgumentDecoder.h:
+        (ArgumentDecoder):
+        * Platform/CoreIPC/Connection.h:
+        * Platform/CoreIPC/MessageDecoder.cpp:
+        (CoreIPC::MessageDecoder::create):
+        (CoreIPC::MessageDecoder::MessageDecoder):
+        * Platform/CoreIPC/MessageDecoder.h:
+        (MessageDecoder):
+        * Platform/CoreIPC/mac/ConnectionMac.cpp:
+        (CoreIPC::createMessageDecoder):
+
 2013-01-31  Joseph Pecoraro  <pecoraro@apple.com>
 

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

@@ -34 +34 @@
 PassOwnPtr<ArgumentDecoder> ArgumentDecoder::create(const uint8_t* buffer, size_t bufferSize)
 {
-    Deque<Attachment> attachments;
+    Vector<Attachment> attachments;
     return adoptPtr(new ArgumentDecoder(buffer, bufferSize, attachments));
 }
 
-ArgumentDecoder::ArgumentDecoder(const uint8_t* buffer, size_t bufferSize, Deque<Attachment>& attachments)
+ArgumentDecoder::ArgumentDecoder(const uint8_t* buffer, size_t bufferSize, Vector<Attachment>& attachments)
 {
     initialize(buffer, bufferSize);
@@ -225 +225 @@
         return false;
 
-    attachment = m_attachments.takeFirst();
-    return true;
-}
-
-#ifndef NDEBUG
-void ArgumentDecoder::debug()
-{
-    printf("ArgumentDecoder::debug()\n");
-    printf("Number of Attachments: %d\n", (int)m_attachments.size());
-    printf("Size of buffer: %d\n", (int)(m_bufferEnd - m_buffer));
-}
-#endif
+    attachment = m_attachments.last();
+    m_attachments.removeLast();
+    return true;
+}
 
 } // namespace CoreIPC

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

@@ -29 +29 @@
 #include "ArgumentCoder.h"
 #include "Attachment.h"
-#include <wtf/Deque.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/TypeTraits.h>
@@ -94 +93 @@
     bool removeAttachment(Attachment&);
 
-#ifndef NDEBUG
-    void debug();
-#endif
-
 protected:
-    ArgumentDecoder(const uint8_t* buffer, size_t bufferSize, Deque<Attachment>&);
+    ArgumentDecoder(const uint8_t* buffer, size_t bufferSize, Vector<Attachment>&);
 
     void initialize(const uint8_t* buffer, size_t bufferSize);
@@ -116 +111 @@
     uint8_t* m_bufferEnd;
 
-    Deque<Attachment> m_attachments;
+    Vector<Attachment> m_attachments;
 };
 

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

@@ -34 +34 @@
 #include "MessageReceiver.h"
 #include "WorkQueue.h"
+#include <wtf/Deque.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/OwnPtr.h>

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

@@ -36 +36 @@
 PassOwnPtr<MessageDecoder> MessageDecoder::create(const DataReference& buffer)
 {
-    Deque<Attachment> attachments;
+    Vector<Attachment> attachments;
     return adoptPtr(new MessageDecoder(buffer, attachments));
 }
 
-PassOwnPtr<MessageDecoder> MessageDecoder::create(const DataReference& buffer, Deque<Attachment>& attachments)
+PassOwnPtr<MessageDecoder> MessageDecoder::create(const DataReference& buffer, Vector<Attachment>& attachments)
 {
     return adoptPtr(new MessageDecoder(buffer, attachments));
@@ -49 +49 @@
 }
 
-MessageDecoder::MessageDecoder(const DataReference& buffer, Deque<Attachment>& attachments)
+MessageDecoder::MessageDecoder(const DataReference& buffer, Vector<Attachment>& attachments)
     : ArgumentDecoder(buffer.data(), buffer.size(), attachments)
 {

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

@@ -37 +37 @@
 public:
     static PassOwnPtr<MessageDecoder> create(const DataReference& buffer);
-    static PassOwnPtr<MessageDecoder> create(const DataReference& buffer, Deque<Attachment>&);
+    static PassOwnPtr<MessageDecoder> create(const DataReference& buffer, Vector<Attachment>&);
     virtual ~MessageDecoder();
 
@@ -47 +47 @@
 
 private:
-    MessageDecoder(const DataReference& buffer, Deque<Attachment>&);
+    MessageDecoder(const DataReference& buffer, Vector<Attachment>&);
 
     uint8_t m_messageFlags;

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

@@ -300 +300 @@
     ASSERT(numDescriptors);
 
-    // Build attachment list
-    Deque<Attachment> attachments;
     uint8_t* descriptorData = reinterpret_cast<uint8_t*>(body + 1);
 
@@ -309 +307 @@
         --numDescriptors;
 
+    // Build attachment list
+    Vector<Attachment> attachments(numDescriptors);
+
     for (mach_msg_size_t i = 0; i < numDescriptors; ++i) {
         mach_msg_descriptor_t* descriptor = reinterpret_cast<mach_msg_descriptor_t*>(descriptorData);
@@ -314 +315 @@
         switch (descriptor->type.type) {
         case MACH_MSG_PORT_DESCRIPTOR:
-            attachments.append(Attachment(descriptor->port.name, descriptor->port.disposition));
+            attachments[numDescriptors - i - 1] = Attachment(descriptor->port.name, descriptor->port.disposition);
             descriptorData += sizeof(mach_msg_port_descriptor_t);
             break;
         case MACH_MSG_OOL_DESCRIPTOR:
-            attachments.append(Attachment(descriptor->out_of_line.address, descriptor->out_of_line.size,
-                                          descriptor->out_of_line.copy, descriptor->out_of_line.deallocate));
+            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;