Changeset 275553 in webkit

Timestamp:

Apr 6, 2021 2:27:06 PM (3 years ago)

Author:

Fujii Hironori

Message:

Add IPC::Semaphore stub for Unix ports
​https://bugs.webkit.org/show_bug.cgi?id=224223

Reviewed by Don Olmstead.

PlayStation, GTK and WPE ports don't use it yet. Just add stubs
instead of scattering #if everywhere using Semaphore.

• GPUProcess/graphics/RemoteRenderingBackend.cpp:

(WebKit::RemoteRenderingBackend::nextDestinationImageBufferAfterApplyingDisplayLists):
(WebKit::RemoteRenderingBackend::populateGetImageDataSharedMemory):

• Platform/IPC/StreamClientConnection.cpp:

(IPC::StreamClientConnection::setWakeUpSemaphore):
(IPC::StreamClientConnection::wakeUpServer):

• Platform/IPC/StreamClientConnection.h:

(IPC::StreamClientConnection::tryAcquire):
(IPC::StreamClientConnection::tryAcquireAll):

• Platform/IPC/StreamConnectionWorkQueue.cpp:

(IPC::StreamConnectionWorkQueue::StreamConnectionWorkQueue):
(IPC::StreamConnectionWorkQueue::removeStreamConnection):
(IPC::StreamConnectionWorkQueue::stop):
(IPC::StreamConnectionWorkQueue::wakeUp):
(IPC::StreamConnectionWorkQueue::wakeUpProcessingThread):

• Platform/IPC/StreamConnectionWorkQueue.h:
• Platform/IPC/StreamServerConnection.cpp:

(IPC::StreamServerConnectionBase::release):
(IPC::StreamServerConnectionBase::releaseAll):

• Platform/IPC/unix/IPCSemaphoreUnix.cpp: Added.

(IPC::Semaphore::Semaphore):
(IPC::Semaphore::signal):
(IPC::Semaphore::wait):
(IPC::Semaphore::waitFor):
(IPC::Semaphore::encode const):
(IPC::Semaphore::decode):
(IPC::Semaphore::destroy):

• PlatformPlayStation.cmake:
• Sources.txt:
• SourcesGTK.txt:
• SourcesWPE.txt:
• WebKit.xcodeproj/project.pbxproj:
• WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp:

(WebKit::RemoteRenderingBackendProxy::waitForGetImageDataToComplete):
(WebKit::RemoteRenderingBackendProxy::didAppendData):

• WebProcess/GPU/media/RemoteAudioDestinationProxy.cpp:

(WebKit::RemoteAudioDestinationProxy::startRenderingThread):
(WebKit::RemoteAudioDestinationProxy::stopRenderingThread):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• GPUProcess/graphics/RemoteRenderingBackend.cpp (modified) (2 diffs)
• Platform/IPC/StreamClientConnection.cpp (modified) (2 diffs)
• Platform/IPC/StreamClientConnection.h (modified) (4 diffs)
• Platform/IPC/StreamConnectionWorkQueue.cpp (modified) (6 diffs)
• Platform/IPC/StreamConnectionWorkQueue.h (modified) (1 diff)
• Platform/IPC/StreamServerConnection.cpp (modified) (4 diffs)
• Platform/IPC/unix/IPCSemaphoreUnix.cpp (moved) (moved from trunk/Source/WebKit/Platform/IPC/IPCSemaphore.cpp) (3 diffs)
• PlatformPlayStation.cmake (modified) (1 diff)
• Sources.txt (modified) (1 diff)
• SourcesGTK.txt (modified) (1 diff)
• SourcesWPE.txt (modified) (1 diff)
• WebKit.xcodeproj/project.pbxproj (modified) (4 diffs)
• WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp (modified) (3 diffs)
• WebProcess/GPU/media/RemoteAudioDestinationProxy.cpp (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-04-06  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        Add IPC::Semaphore stub for Unix ports
+        https://bugs.webkit.org/show_bug.cgi?id=224223
+
+        Reviewed by Don Olmstead.
+
+        PlayStation, GTK and WPE ports don't use it yet. Just add stubs
+        instead of scattering #if everywhere using Semaphore.
+
+        * GPUProcess/graphics/RemoteRenderingBackend.cpp:
+        (WebKit::RemoteRenderingBackend::nextDestinationImageBufferAfterApplyingDisplayLists):
+        (WebKit::RemoteRenderingBackend::populateGetImageDataSharedMemory):
+        * Platform/IPC/StreamClientConnection.cpp:
+        (IPC::StreamClientConnection::setWakeUpSemaphore):
+        (IPC::StreamClientConnection::wakeUpServer):
+        * Platform/IPC/StreamClientConnection.h:
+        (IPC::StreamClientConnection::tryAcquire):
+        (IPC::StreamClientConnection::tryAcquireAll):
+        * Platform/IPC/StreamConnectionWorkQueue.cpp:
+        (IPC::StreamConnectionWorkQueue::StreamConnectionWorkQueue):
+        (IPC::StreamConnectionWorkQueue::removeStreamConnection):
+        (IPC::StreamConnectionWorkQueue::stop):
+        (IPC::StreamConnectionWorkQueue::wakeUp):
+        (IPC::StreamConnectionWorkQueue::wakeUpProcessingThread):
+        * Platform/IPC/StreamConnectionWorkQueue.h:
+        * Platform/IPC/StreamServerConnection.cpp:
+        (IPC::StreamServerConnectionBase::release):
+        (IPC::StreamServerConnectionBase::releaseAll):
+        * Platform/IPC/unix/IPCSemaphoreUnix.cpp: Added.
+        (IPC::Semaphore::Semaphore):
+        (IPC::Semaphore::signal):
+        (IPC::Semaphore::wait):
+        (IPC::Semaphore::waitFor):
+        (IPC::Semaphore::encode const):
+        (IPC::Semaphore::decode):
+        (IPC::Semaphore::destroy):
+        * PlatformPlayStation.cmake:
+        * Sources.txt:
+        * SourcesGTK.txt:
+        * SourcesWPE.txt:
+        * WebKit.xcodeproj/project.pbxproj:
+        * WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp:
+        (WebKit::RemoteRenderingBackendProxy::waitForGetImageDataToComplete):
+        (WebKit::RemoteRenderingBackendProxy::didAppendData):
+        * WebProcess/GPU/media/RemoteAudioDestinationProxy.cpp:
+        (WebKit::RemoteAudioDestinationProxy::startRenderingThread):
+        (WebKit::RemoteAudioDestinationProxy::stopRenderingThread):
+
 2021-04-06  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp

@@ -248 +248 @@
 
             handle.startWaiting();
-#if PLATFORM(COCOA)
             m_resumeDisplayListSemaphore.waitFor(30_us);
-#else
-            sleep(30_us);
-#endif
 
             auto resumeReadingInfo = handle.stopWaiting();
@@ -377 +373 @@
         memset(m_getImageDataSharedMemory->data(), 0, m_getImageDataSharedMemory->size());
 
-#if OS(DARWIN)
     m_getImageDataSemaphore.signal();
-#endif
 }
 

trunk/Source/WebKit/Platform/IPC/StreamClientConnection.cpp

@@ -41 +41 @@
 void StreamClientConnection::setWakeUpSemaphore(IPC::Semaphore&& semaphore)
 {
-#if PLATFORM(COCOA) || PLATFORM(WIN)
     m_wakeUpSemaphore = WTFMove(semaphore);
-#endif
     wakeUpServer();
 }
@@ -49 +47 @@
 void StreamClientConnection::wakeUpServer()
 {
-#if PLATFORM(COCOA) || PLATFORM(WIN)
     if (m_wakeUpSemaphore)
         m_wakeUpSemaphore->signal();
-#endif
 }
 

trunk/Source/WebKit/Platform/IPC/StreamClientConnection.h

@@ -103 +103 @@
     size_t m_clientOffset { 0 };
     StreamConnectionBuffer m_buffer;
-#if PLATFORM(COCOA) || PLATFORM(WIN)
     Optional<Semaphore> m_wakeUpSemaphore;
-#endif
 };
 
@@ -241 +239 @@
         if (timeout.didTimeOut())
             break;
-#if PLATFORM(COCOA) || PLATFORM(WIN)
         ClientLimit oldClientLimit = sharedClientLimit().compareExchangeStrong(clientLimit, ClientLimit::clientIsWaitingTag, std::memory_order_acq_rel, std::memory_order_acq_rel);
         if (clientLimit == oldClientLimit) {
@@ -248 +245 @@
         } else
             clientLimit = oldClientLimit;
-#else
-        Thread::yield();
-        clientLimit = sharedClientLimit().load(std::memory_order_acquire);
-#endif
         // The alignedSpan uses the minimumMessageSize to calculate the next beginning position in the buffer,
         // and not the size. The size might be more or less what is needed, depending on where the reader is.
@@ -274 +267 @@
 
     for (;;) {
-#if PLATFORM(COCOA) || PLATFORM(WIN)
         ClientLimit clientLimit = sharedClientLimit().exchange(ClientLimit::clientIsWaitingTag, std::memory_order_acq_rel);
         ClientOffset clientOffset = sharedClientOffset().load(std::memory_order_acquire);
-#else
-        ClientLimit clientLimit = sharedClientLimit().load(std::memory_order_acquire);
-        ClientOffset clientOffset = sharedClientOffset().load(std::memory_order_acquire);
-#endif
         if (!clientLimit && (clientOffset == ClientOffset::serverIsSleepingTag || !clientOffset))
             break;
 
-#if PLATFORM(COCOA) || PLATFORM(WIN)
         m_buffer.clientWaitSemaphore().waitFor(timeout);
-#else
-        Thread::yield();
-#endif
         if (timeout.didTimeOut())
             return WTF::nullopt;
     }
-#if PLATFORM(COCOA) || PLATFORM(WIN)
     // In case the transaction was cancelled, undo the transaction marker.
     sharedClientLimit().store(static_cast<ClientLimit>(0), std::memory_order_release);
-#endif
     m_clientOffset = 0;
     return alignedSpan(m_clientOffset, 0);

trunk/Source/WebKit/Platform/IPC/StreamConnectionWorkQueue.cpp

@@ -30 +30 @@
 
 StreamConnectionWorkQueue::StreamConnectionWorkQueue(const char* name)
-#if PLATFORM(COCOA) || PLATFORM(WIN)
     : m_name(name)
-#endif
 {
 }
@@ -64 +62 @@
         ASSERT(!m_shouldQuit); // Re-entering during shutdown not supported.
     }
-#if PLATFORM(COCOA) || PLATFORM(WIN)
     m_wakeUpSemaphore.signal();
-#endif
 }
 
@@ -72 +68 @@
 {
     m_shouldQuit = true;
-#if PLATFORM(COCOA) || PLATFORM(WIN)
     if (!m_processingThread)
         return;
@@ -78 +73 @@
     m_processingThread->waitForCompletion();
     m_processingThread = nullptr;
-#endif
 }
 
 void StreamConnectionWorkQueue::wakeUp()
 {
-#if PLATFORM(COCOA) || PLATFORM(WIN)
     m_wakeUpSemaphore.signal();
-#endif
 }
 
@@ -95 +87 @@
 void StreamConnectionWorkQueue::wakeUpProcessingThread()
 {
-#if PLATFORM(COCOA) || PLATFORM(WIN)
     if (m_processingThread) {
         m_wakeUpSemaphore.signal();
@@ -112 +103 @@
     };
     m_processingThread = Thread::create(m_name, WTFMove(task), ThreadType::Graphics, Thread::QOS::UserInteractive);
-#endif
 }
 

trunk/Source/WebKit/Platform/IPC/StreamConnectionWorkQueue.h

@@ -54 +54 @@
     void processStreams();
 
-#if PLATFORM(COCOA) || PLATFORM(WIN)
     const char* const m_name;
-#endif
 
     Semaphore m_wakeUpSemaphore;

trunk/Source/WebKit/Platform/IPC/StreamServerConnection.cpp

@@ -89 +89 @@
     ServerOffset serverOffset = static_cast<ServerOffset>(wrapOffset(alignOffset(m_serverOffset) + readSize));
 
-#if PLATFORM(COCOA) || PLATFORM(WIN)
     ServerOffset oldServerOffset = sharedServerOffset().exchange(serverOffset, std::memory_order_acq_rel);
     // If the client wrote over serverOffset, it means the client is waiting.
@@ -96 +95 @@
     else
         ASSERT(!(oldServerOffset & ServerOffset::clientIsWaitingTag));
-#else
-    sharedServerOffset().store(serverOffset, std::memory_order_release);
-    // IPC::Semaphore not implemented for the platform. Client will poll and yield.
-#endif
 
     m_serverOffset = serverOffset;
@@ -107 +102 @@
 {
     sharedServerLimit().store(static_cast<ServerLimit>(0), std::memory_order_release);
-#if PLATFORM(COCOA) || PLATFORM(WIN)
     ServerOffset oldServerOffset = sharedServerOffset().exchange(static_cast<ServerOffset>(0), std::memory_order_acq_rel);
     // If the client wrote over serverOffset, it means the client is waiting.
@@ -114 +108 @@
     else
         ASSERT(!(oldServerOffset & ServerOffset::clientIsWaitingTag));
-#else
-    sharedServerOffset().store(static_cast<ServerOffset>(0), std::memory_order_release);
-    // IPC::Semaphore not implemented for the platform. Client will poll and yield.
-#endif
     m_serverOffset = 0;
 }

trunk/Source/WebKit/Platform/IPC/unix/IPCSemaphoreUnix.cpp

@@ -27 +27 @@
 #include "IPCSemaphore.h"
 
-#if !OS(DARWIN) && !OS(WINDOWS)
-
 namespace IPC {
 
-Semaphore::Semaphore() = default;
+Semaphore::Semaphore()
+{
+    ASSERT_NOT_REACHED();
+}
 
-Semaphore::Semaphore(Semaphore&&) = default;
+Semaphore::Semaphore(Semaphore&&)
+{
+    ASSERT_NOT_REACHED();
+}
 
 Semaphore::~Semaphore() = default;
@@ -39 +43 @@
 Semaphore& Semaphore::operator=(Semaphore&&) = default;
 
-void Semaphore::encode(Encoder&) const { }
+void Semaphore::signal()
+{
+}
+
+void Semaphore::wait()
+{
+}
+
+bool Semaphore::waitFor(Timeout)
+{
+    return false;
+}
+
+void Semaphore::encode(Encoder&) const
+{
+}
 
 Optional<Semaphore> Semaphore::decode(Decoder&)
@@ -46 +65 @@
 }
 
+void Semaphore::destroy()
+{
 }
 
-#endif
+} // namespace IPC

trunk/Source/WebKit/PlatformPlayStation.cmake

@@ -53 +53 @@
     Platform/IPC/unix/AttachmentUnix.cpp
     Platform/IPC/unix/ConnectionUnix.cpp
+    Platform/IPC/unix/IPCSemaphoreUnix.cpp
 
     Platform/classifier/ResourceLoadStatisticsClassifier.cpp

trunk/Source/WebKit/Sources.txt

@@ -147 +147 @@
 Platform/IPC/Decoder.cpp @no-unify
 Platform/IPC/Encoder.cpp @no-unify
-Platform/IPC/IPCSemaphore.cpp @no-unify
 Platform/IPC/JSIPCBinding.cpp @no-unify
 Platform/IPC/MessageReceiveQueueMap.cpp @no-unify

trunk/Source/WebKit/SourcesGTK.txt

@@ -53 +53 @@
 Platform/IPC/unix/AttachmentUnix.cpp
 Platform/IPC/unix/ConnectionUnix.cpp
+Platform/IPC/unix/IPCSemaphoreUnix.cpp
 
 Platform/classifier/ResourceLoadStatisticsClassifier.cpp

trunk/Source/WebKit/SourcesWPE.txt

@@ -53 +53 @@
 Platform/IPC/unix/AttachmentUnix.cpp
 Platform/IPC/unix/ConnectionUnix.cpp
+Platform/IPC/unix/IPCSemaphoreUnix.cpp
 
 Platform/classifier/ResourceLoadStatisticsClassifier.cpp

trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

@@ -1601 +1601 @@
                 A1FB68241F6E518200C43F9F /* WKCrashReporter.h in Headers */ = {isa = PBXBuildFile; fileRef = A1FB68221F6E518200C43F9F /* WKCrashReporter.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 A31F60A425CC7DB900AF14F4 /* IPCSemaphore.h in Headers */ = {isa = PBXBuildFile; fileRef = A31F60A225CC7DB800AF14F4 /* IPCSemaphore.h */; };
-                A31F60A525CC7DB900AF14F4 /* IPCSemaphore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A31F60A325CC7DB800AF14F4 /* IPCSemaphore.cpp */; };
                 A513F5402154A5D700662841 /* WebPageInspectorController.h in Headers */ = {isa = PBXBuildFile; fileRef = A513F53E2154A5CC00662841 /* WebPageInspectorController.h */; };
                 A518B5D21FE1D55B00F9FA28 /* WKInspectorWKWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = A518B5D01FE1D55B00F9FA28 /* WKInspectorWKWebView.h */; };
@@ -5059 +5058 @@
                 A1FB68231F6E518200C43F9F /* WKCrashReporter.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = WKCrashReporter.mm; sourceTree = "<group>"; };
                 A31F60A225CC7DB800AF14F4 /* IPCSemaphore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IPCSemaphore.h; sourceTree = "<group>"; };
-                A31F60A325CC7DB800AF14F4 /* IPCSemaphore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IPCSemaphore.cpp; sourceTree = "<group>"; };
                 A31F60A625CC7DCF00AF14F4 /* IPCSemaphoreDarwin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IPCSemaphoreDarwin.cpp; sourceTree = "<group>"; };
                 A38A12E123C93AC700FABFA9 /* TextChecker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextChecker.cpp; sourceTree = "<group>"; };
@@ -7044 +7042 @@
                                 4151E5C31FBB90A900E47E2D /* FormDataReference.h */,
                                 C0CE72AC1247E78D00BC0EC4 /* HandleMessage.h */,
-                                A31F60A325CC7DB800AF14F4 /* IPCSemaphore.cpp */,
                                 A31F60A225CC7DB800AF14F4 /* IPCSemaphore.h */,
                                 9BF5EC6325410E9900984E77 /* JSIPCBinding.cpp */,
@@ -13916 +13913 @@
                                 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */,
                                 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */,
-                                A31F60A525CC7DB900AF14F4 /* IPCSemaphore.cpp in Sources */,
                                 9BF5EC642541145600984E77 /* JSIPCBinding.cpp in Sources */,
                                 2D913441212CF9F000128AFD /* JSNPMethod.cpp in Sources */,

trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp

@@ -181 +181 @@
 {
     ASSERT(m_getImageDataSemaphore);
-#if OS(DARWIN)
     return m_getImageDataSemaphore->waitFor(timeout);
-#else
-    return true;
-#endif
 }
 
@@ -327 +323 @@
         if (m_deferredWakeupMessageArguments) {
             if (sharedHandle->tryToResume({ m_deferredWakeupMessageArguments->offset, m_deferredWakeupMessageArguments->destinationImageBufferIdentifier.toUInt64() })) {
-#if PLATFORM(COCOA)
                 m_resumeDisplayListSemaphore.signal();
-#endif
                 m_deferredWakeupMessageArguments = WTF::nullopt;
                 m_remainingItemsToAppendBeforeSendingWakeup = 0;
@@ -344 +338 @@
     auto offsetToRead = sharedHandle->writableOffset() - numberOfBytes;
     if (sharedHandle->tryToResume({ offsetToRead, destinationImageBuffer.toUInt64() })) {
-#if PLATFORM(COCOA)
         m_resumeDisplayListSemaphore.signal();
-#endif
         return;
     }

trunk/Source/WebKit/WebProcess/GPU/media/RemoteAudioDestinationProxy.cpp

@@ -75 +75 @@
 void RemoteAudioDestinationProxy::startRenderingThread()
 {
-#if PLATFORM(COCOA)
     ASSERT(!m_renderThread);
 
@@ -88 +87 @@
     };
     m_renderThread = Thread::create("RemoteAudioDestinationProxy render thread", WTFMove(offThreadRendering), ThreadType::Audio, Thread::QOS::UserInteractive);
-#endif
 }
 
 void RemoteAudioDestinationProxy::stopRenderingThread()
 {
-#if PLATFORM(COCOA)
     if (!m_renderThread)
         return;
@@ -101 +98 @@
     m_renderThread->waitForCompletion();
     m_renderThread = nullptr;
-#endif
 }