Changeset 225486 in webkit

Timestamp:

Dec 4, 2017 12:35:05 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Call "Terminate Service Worker" on all workers when all their clients are gone
​https://bugs.webkit.org/show_bug.cgi?id=179552

Patch by Youenn Fablet <​youenn@apple.com> on 2017-12-04
Reviewed by Chris Dumez.

Tested manually.

When SWServer detects that there is no longer any client for a given client origin,
it iterates through the running workers to terminate them if they have the given client origin.
A timer of 60 seconds is used in case a user closes a tab or a window, and reopens one with the same origin shortly after.

• workers/service/server/SWServer.cpp:

(WebCore::SWServer::findClientByIdentifier):
(WebCore::SWServer::matchAll):
(WebCore::SWServer::registerServiceWorkerClient):
(WebCore::SWServer::unregisterServiceWorkerClient):

• workers/service/server/SWServer.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-12-04  Youenn Fablet  <youenn@apple.com>
+
+        Call "Terminate Service Worker" on all workers when all their clients are gone
+        https://bugs.webkit.org/show_bug.cgi?id=179552
+
+        Reviewed by Chris Dumez.
+
+        Tested manually.
+
+        When SWServer detects that there is no longer any client for a given client origin,
+        it iterates through the running workers to terminate them if they have the given client origin.
+        A timer of 60 seconds is used in case a user closes a tab or a window, and reopens one with the same origin shortly after.
+
+        * workers/service/server/SWServer.cpp:
+        (WebCore::SWServer::findClientByIdentifier):
+        (WebCore::SWServer::matchAll):
+        (WebCore::SWServer::registerServiceWorkerClient):
+        (WebCore::SWServer::unregisterServiceWorkerClient):
+        * workers/service/server/SWServer.h:
+
 2017-12-04  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/workers/service/server/SWServer.cpp

@@ -53 +53 @@
 }
 
+static Seconds terminationDelay { 60_s };
+
 SWServer::Connection::Connection(SWServer& server)
     : m_server(server)
@@ -323 +325 @@
         return std::nullopt;
 
-    auto& clients = iterator->value;
+    auto& clients = iterator->value.clients;
     auto position = clients.findMatching([&] (const auto& client) {
         return clientIdentifier == client.identifier;
@@ -337 +339 @@
     // FIXME: Support WindowClient additional properties.
 
-    auto clients = m_clients.get(worker.origin());
+    auto clients = m_clients.find(worker.origin())->value.clients;
 
     if (!options.includeUncontrolled) {
@@ -616 +618 @@
 void SWServer::registerServiceWorkerClient(ClientOrigin&& clientOrigin, ServiceWorkerClientIdentifier identifier, ServiceWorkerClientData&& data)
 {
-    m_clients.ensure(WTFMove(clientOrigin), [] {
-        return Vector<ServiceWorkerClientInformation> { };
-    }).iterator->value.append(ServiceWorkerClientInformation { identifier, WTFMove(data) });
+    auto& clientsData = m_clients.ensure(WTFMove(clientOrigin), [] {
+        return Clients { };
+    }).iterator->value;
+
+    clientsData.clients.append(ServiceWorkerClientInformation { identifier, WTFMove(data) });
+    if (clientsData.terminateServiceWorkersTimer)
+        clientsData.terminateServiceWorkersTimer = nullptr;
 }
 
@@ -626 +632 @@
     ASSERT(iterator != m_clients.end());
 
-    auto& clients = iterator->value;
+    auto& clients = iterator->value.clients;
     clients.removeFirstMatching([&] (const auto& item) {
         return identifier == item.identifier;
     });
-    if (clients.isEmpty()) {
-        // FIXME: We might want to terminate any clientOrigin related service worker.
-        m_clients.remove(iterator);
-    }
+
+    if (!clients.isEmpty() || m_runningOrTerminatingWorkers.isEmpty())
+        return;
+
+    ASSERT(!iterator->value.terminateServiceWorkersTimer);
+    iterator->value.terminateServiceWorkersTimer = std::make_unique<Timer>([clientOrigin, this] {
+        for (auto& worker : m_runningOrTerminatingWorkers.values()) {
+            if (worker->origin() == clientOrigin)
+                terminateWorker(worker);
+        }
+        m_clients.remove(clientOrigin);
+    });
+    iterator->value.terminateServiceWorkersTimer->startOneShot(terminationDelay);
 }
 

trunk/Source/WebCore/workers/service/server/SWServer.h

@@ -60 +60 @@
 struct ServiceWorkerFetchResult;
 struct ServiceWorkerRegistrationData;
+class Timer;
 
 class SWServer {
@@ -185 +186 @@
     HashMap<ServiceWorkerIdentifier, Ref<SWServerWorker>> m_runningOrTerminatingWorkers;
 
-    HashMap<ClientOrigin, Vector<ServiceWorkerClientInformation>> m_clients;
+    struct Clients {
+        Vector<ServiceWorkerClientInformation> clients;
+        std::unique_ptr<Timer> terminateServiceWorkersTimer;
+    };
+    HashMap<ClientOrigin, Clients> m_clients;
     HashMap<ServiceWorkerClientIdentifier, ServiceWorkerIdentifier> m_clientToControllingWorker;