Changeset 227828 in webkit

Timestamp:

Jan 30, 2018, 10:51:27 AM (9 years ago)

Author:

jmarcell@apple.com

Message:

Cherry-pick r227745. rdar://problem/37019493

Location:

branches/safari-605-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• workers/service/server/SWServer.cpp (modified) (3 diffs)
• workers/service/server/SWServer.h (modified) (4 diffs)

branches/safari-605-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2018-01-30  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r227745. rdar://problem/37019493
+
+    2018-01-29  Chris Dumez  <cdumez@apple.com>
+
+            Drop unnecessary "ServiceWorker Task Thread" in SWServer
+            https://bugs.webkit.org/show_bug.cgi?id=182253
+
+            Reviewed by Youenn Fablet.
+
+            Drop unnecessary "ServiceWorker Task Thread" in SWServer. We're spinning a thread for
+            each SWServer that is never used.
+
+            * workers/service/server/SWServer.cpp:
+            (WebCore::SWServer::~SWServer):
+            (WebCore::SWServer::SWServer):
+            (WebCore::SWServer::taskThreadEntryPoint): Deleted.
+            (WebCore::SWServer::postTask): Deleted.
+            (WebCore::SWServer::postTaskReply): Deleted.
+            (WebCore::SWServer::handleTaskRepliesOnMainThread): Deleted.
+            * workers/service/server/SWServer.h:
+
 2018-01-30  Jason Marcell  <jmarcell@apple.com>
 

branches/safari-605-branch/Source/WebCore/workers/service/server/SWServer.cpp

@@ -74 +74 @@
     RELEASE_ASSERT(m_registrations.isEmpty());
     RELEASE_ASSERT(m_jobQueues.isEmpty());
-
-    ASSERT(m_taskQueue.isEmpty());
-    ASSERT(m_taskReplyQueue.isEmpty());
-
-    // For a SWServer to be cleanly shut down its thread must have finished and gone away.
-    // At this stage in development of the feature that actually never happens.
-    // But once it does start happening, this ASSERT will catch us doing it wrong.
-    Locker<Lock> locker(m_taskThreadLock);
-    ASSERT(!m_taskThread);
     
     allServers().remove(this);
@@ -272 +263 @@
     UNUSED_PARAM(registrationDatabaseDirectory);
     allServers().add(this);
-    m_taskThread = Thread::create(ASCIILiteral("ServiceWorker Task Thread"), [this] {
-        taskThreadEntryPoint();
-    });
 }
 
@@ -667 +655 @@
 
     connection->fireActivateEvent(worker.identifier());
-}
-
-void SWServer::taskThreadEntryPoint()
-{
-    ASSERT(!isMainThread());
-
-    while (!m_taskQueue.isKilled())
-        m_taskQueue.waitForMessage().performTask();
-
-    Locker<Lock> locker(m_taskThreadLock);
-    m_taskThread = nullptr;
-}
-
-void SWServer::postTask(CrossThreadTask&& task)
-{
-    m_taskQueue.append(WTFMove(task));
-}
-
-void SWServer::postTaskReply(CrossThreadTask&& task)
-{
-    m_taskReplyQueue.append(WTFMove(task));
-
-    Locker<Lock> locker(m_mainThreadReplyLock);
-    if (m_mainThreadReplyScheduled)
-        return;
-
-    m_mainThreadReplyScheduled = true;
-    callOnMainThread([this] {
-        handleTaskRepliesOnMainThread();
-    });
-}
-
-void SWServer::handleTaskRepliesOnMainThread()
-{
-    {
-        Locker<Lock> locker(m_mainThreadReplyLock);
-        m_mainThreadReplyScheduled = false;
-    }
-
-    while (auto task = m_taskReplyQueue.tryGetMessage())
-        task->performTask();
 }
 

branches/safari-605-branch/Source/WebCore/workers/service/server/SWServer.h

@@ -38 +38 @@
 #include "ServiceWorkerRegistrationKey.h"
 #include "ServiceWorkerTypes.h"
-#include <wtf/CrossThreadQueue.h>
-#include <wtf/CrossThreadTask.h>
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
@@ -138 +136 @@
     void startScriptFetch(const ServiceWorkerJobData&, FetchOptions::Cache);
 
-    void postTask(CrossThreadTask&&);
-    void postTaskReply(CrossThreadTask&&);
-
     void updateWorker(Connection&, const ServiceWorkerJobDataIdentifier&, SWServerRegistration&, const URL&, const String& script, const ContentSecurityPolicyResponseHeaders&, WorkerType);
     void terminateWorker(SWServerWorker&);
@@ -187 +182 @@
     void unregisterConnection(Connection&);
 
-    void taskThreadEntryPoint();
-    void handleTaskRepliesOnMainThread();
-
     void scriptFetchFinished(Connection&, const ServiceWorkerFetchResult&);
 
@@ -229 +221 @@
     HashMap<ServiceWorkerClientIdentifier, ServiceWorkerIdentifier> m_clientToControllingWorker;
 
-    RefPtr<Thread> m_taskThread;
-    Lock m_taskThreadLock;
-
-    CrossThreadQueue<CrossThreadTask> m_taskQueue;
-    CrossThreadQueue<CrossThreadTask> m_taskReplyQueue;
-
-    Lock m_mainThreadReplyLock;
-    bool m_mainThreadReplyScheduled { false };
     UniqueRef<SWOriginStore> m_originStore;
     RegistrationStore m_registrationStore;