Changeset 86560 in webkit

Timestamp:

May 16, 2011 5:40:59 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-05-16 Siddharth Mathur <​siddharth.mathur@nokia.com>

Reviewed by Laszlo Gombos.

[Qt][WK2][Symbian] Shared memory implementation for Symbian
​https://bugs.webkit.org/show_bug.cgi?id=55875

• wtf/Platform.h: Exclude Symbian OS from USE(UNIX_DOMAIN_SOCKETS) users

2011-05-16 Siddharth Mathur <​siddharth.mathur@nokia.com>

Reviewed by Laszlo Gombos.

[Qt][WK2][Symbian] Shared memory implementation for Symbian
​https://bugs.webkit.org/show_bug.cgi?id=55875

Use global chunks for sharing data between processes.
This is an initial implementation. An outstanding issue
is the correct way to close() the chunk in the SharedMemory d'tor
without triggering a delete by the kernel when the ref-count
temporarily goes to zero.

• Platform/SharedMemory.h: platform specific handle and chunk name
• Platform/qt/SharedMemorySymbian.cpp: Added. Native Symbian OS implementation using RChunk.CreateGlobal() for named chunks. The chunk name is serialized and sent over the IPC channel and opened by the remote process using RChunk.OpenGlobal().

(WebKit::SharedMemory::Handle::Handle):
(WebKit::SharedMemory::Handle::~Handle):
(WebKit::SharedMemory::Handle::isNull):
(WebKit::SharedMemory::Handle::encode):
(WebKit::SharedMemory::Handle::decode):
(WebKit::SharedMemory::create):
(WebKit::SharedMemory::~SharedMemory):
(WebKit::SharedMemory::createHandle):
(WebKit::SharedMemory::systemPageSize):

• Platform/unix/SharedMemoryUnix.cpp: Exclude Qt-Symbian using HAVE(UNIX_DOMAIN_SOCKETS)
• WebKit2.pro: Add SharedMemorySymbian.cpp

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/wtf/Platform.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Platform/SharedMemory.h (modified) (2 diffs)
• WebKit2/Platform/qt/SharedMemorySymbian.cpp (added)
• WebKit2/Platform/unix/SharedMemoryUnix.cpp (modified) (2 diffs)
• WebKit2/WebKit2.pro (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-05-16  Siddharth Mathur  <siddharth.mathur@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt][WK2][Symbian] Shared memory implementation for Symbian
+        https://bugs.webkit.org/show_bug.cgi?id=55875
+
+        * wtf/Platform.h: Exclude Symbian OS from USE(UNIX_DOMAIN_SOCKETS) users
+
 2011-05-16  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/JavaScriptCore/wtf/Platform.h

@@ -1211 +1211 @@
 #define WTF_USE_EXPORT_MACROS 0
 
-#if PLATFORM(QT) || PLATFORM(GTK)
+#if (PLATFORM(QT) && !OS(SYMBIAN)) || PLATFORM(GTK)
 #define WTF_USE_UNIX_DOMAIN_SOCKETS 1
 #endif

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-16  Siddharth Mathur  <siddharth.mathur@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt][WK2][Symbian] Shared memory implementation for Symbian
+        https://bugs.webkit.org/show_bug.cgi?id=55875
+
+        Use global chunks for sharing data between processes.
+        This is an initial implementation. An outstanding issue
+        is the correct way to close() the chunk in the SharedMemory d'tor
+        without triggering a delete by the kernel when the ref-count
+        temporarily goes to zero.
+
+        * Platform/SharedMemory.h: platform specific handle and chunk name
+        * Platform/qt/SharedMemorySymbian.cpp: Added. Native Symbian OS implementation
+        using RChunk.CreateGlobal() for named chunks. The chunk name is serialized
+        and sent over the IPC channel and opened by the remote process using
+        RChunk.OpenGlobal().
+
+        (WebKit::SharedMemory::Handle::Handle):
+        (WebKit::SharedMemory::Handle::~Handle):
+        (WebKit::SharedMemory::Handle::isNull):
+        (WebKit::SharedMemory::Handle::encode):
+        (WebKit::SharedMemory::Handle::decode):
+        (WebKit::SharedMemory::create):
+        (WebKit::SharedMemory::~SharedMemory):
+        (WebKit::SharedMemory::createHandle):
+        (WebKit::SharedMemory::systemPageSize):
+        * Platform/unix/SharedMemoryUnix.cpp: Exclude Qt-Symbian using HAVE(UNIX_DOMAIN_SOCKETS)
+        * WebKit2.pro: Add SharedMemorySymbian.cpp
+
 2011-05-16  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/Platform/SharedMemory.h

@@ -73 +73 @@
 #elif USE(UNIX_DOMAIN_SOCKETS)
         mutable int m_fileDescriptor;
+#elif OS(SYMBIAN)
+        mutable uint32_t m_chunkID;
 #endif
         size_t m_size;
@@ -109 +111 @@
 #elif USE(UNIX_DOMAIN_SOCKETS)
     int m_fileDescriptor;
+#elif OS(SYMBIAN)
+    int m_handle;
 #endif
 };

trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp

@@ -27 +27 @@
 
 #include "config.h"
+#if USE(UNIX_DOMAIN_SOCKETS)
 #include "SharedMemory.h"
 
@@ -237 +238 @@
 
 } // namespace WebKit
+
+#endif
+

trunk/Source/WebKit2/WebKit2.pro

@@ -322 +322 @@
     Platform/qt/RunLoopQt.cpp \
     Platform/qt/WorkQueueQt.cpp \
+    Platform/qt/SharedMemorySymbian.cpp \
     Platform/unix/SharedMemoryUnix.cpp \
     PluginProcess/PluginControllerProxy.cpp \