Changeset 245517 in webkit

Timestamp:

May 20, 2019 10:14:33 AM (5 years ago)

Author:

sihui_liu@apple.com

Message:

[ Mac WK2 iOS Sim] Layout Test http/tests/resourceLoadStatistics/website-data-removal-for-site-navigated-to-with-link-decoration.html is a flaky failure
​https://bugs.webkit.org/show_bug.cgi?id=196307
<rdar://problem/49345360>

Reviewed by Alex Christensen.

Source/WebKit:

Delay dumping statistics if there is data being removed.

• NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp:

(WebKit::ResourceLoadStatisticsStore::removeDataRecords):

• NetworkProcess/Classifier/ResourceLoadStatisticsStore.h:

(WebKit::ResourceLoadStatisticsStore::dataRecordsBeingRemoved const):

• NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:

(WebKit::WebResourceLoadStatisticsStore::dumpResourceLoadStatistics):
(WebKit::WebResourceLoadStatisticsStore::tryDumpResourceLoadStatistics):

• NetworkProcess/Classifier/WebResourceLoadStatisticsStore.h:

LayoutTests:

• platform/ios-simulator-wk2/TestExpectations:
• platform/mac-wk2/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/ios-simulator-wk2/TestExpectations (modified) (1 diff)
• LayoutTests/platform/mac-wk2/TestExpectations (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp (modified) (1 diff)
• Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.h (modified) (1 diff)
• Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp (modified) (1 diff)
• Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-05-20  Sihui Liu  <sihui_liu@apple.com>
+
+        [ Mac WK2 iOS Sim] Layout Test http/tests/resourceLoadStatistics/website-data-removal-for-site-navigated-to-with-link-decoration.html is a flaky failure
+        https://bugs.webkit.org/show_bug.cgi?id=196307
+        <rdar://problem/49345360>
+
+        Reviewed by Alex Christensen.
+
+        * platform/ios-simulator-wk2/TestExpectations:
+        * platform/mac-wk2/TestExpectations:
+
 2019-05-19  Brent Fulgham  <bfulgham@apple.com>
 

trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations

@@ -70 +70 @@
 webkit.org/b/162975 http/tests/cache/disk-cache/memory-cache-revalidation-updates-disk-cache.html [ Pass Failure ]
 
-webkit.org/b/196307 http/tests/resourceLoadStatistics/website-data-removal-for-site-navigated-to-with-link-decoration.html [ Pass Failure ]
-
 webkit.org/b/196112 imported/w3c/web-platform-tests/mathml/relations/css-styling/mathvariant-bold.html [ Pass ImageOnlyFailure ]
 webkit.org/b/196112 imported/w3c/web-platform-tests/mathml/relations/css-styling/mathvariant-double-struck.html [ Pass ImageOnlyFailure ]

trunk/LayoutTests/platform/mac-wk2/TestExpectations

@@ -910 +910 @@
 webkit.org/b/194916 fast/mediastream/MediaStream-video-element.html [ Pass Failure ]
 
-webkit.org/b/196307 http/tests/resourceLoadStatistics/website-data-removal-for-site-navigated-to-with-link-decoration.html [ Pass Failure ]
-
 webkit.org/b/196376 storage/domstorage/localstorage/private-browsing-affects-storage.html [ Pass Failure ]
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-20  Sihui Liu  <sihui_liu@apple.com>
+
+        [ Mac WK2 iOS Sim] Layout Test http/tests/resourceLoadStatistics/website-data-removal-for-site-navigated-to-with-link-decoration.html is a flaky failure
+        https://bugs.webkit.org/show_bug.cgi?id=196307
+        <rdar://problem/49345360>
+
+        Reviewed by Alex Christensen.
+
+        Delay dumping statistics if there is data being removed.
+
+        * NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp:
+        (WebKit::ResourceLoadStatisticsStore::removeDataRecords):
+        * NetworkProcess/Classifier/ResourceLoadStatisticsStore.h:
+        (WebKit::ResourceLoadStatisticsStore::dataRecordsBeingRemoved const):
+        * NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:
+        (WebKit::WebResourceLoadStatisticsStore::dumpResourceLoadStatistics):
+        (WebKit::WebResourceLoadStatisticsStore::tryDumpResourceLoadStatistics):
+        * NetworkProcess/Classifier/WebResourceLoadStatisticsStore.h:
+
 2019-05-20  Ludovico de Nittis  <ludovico.denittis@collabora.com>
 

trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp

@@ -222 +222 @@
                 weakThis->incrementRecordsDeletedCountForDomains(WTFMove(domainsWithDeletedWebsiteData));
                 weakThis->setDataRecordsBeingRemoved(false);
+                weakThis->m_store.tryDumpResourceLoadStatistics();
                 completionHandler();
 #if !RELEASE_LOG_DISABLED

trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.h

@@ -186 +186 @@
     virtual bool isDatabaseStore()const { return false; }
 
+    bool dataRecordsBeingRemoved() const { return m_dataRecordsBeingRemoved; }
+
 protected:
     static unsigned computeImportance(const WebCore::ResourceLoadStatistics&);

trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp

@@ -616 +616 @@
 
     postTask([this, completionHandler = WTFMove(completionHandler)]() mutable {
-        String result = m_statisticsStore ? m_statisticsStore->dumpResourceLoadStatistics() : emptyString();
-        postTaskReply([result = result.isolatedCopy(), completionHandler = WTFMove(completionHandler)]() mutable {
-            completionHandler(result);
-        });
+        ASSERT(!m_dumpResourceLoadStatisticsCompletionHandler);
+        m_dumpResourceLoadStatisticsCompletionHandler = WTFMove(completionHandler);
+        if (m_statisticsStore && m_statisticsStore->dataRecordsBeingRemoved())
+            return;
+        tryDumpResourceLoadStatistics();
+    });
+}
+
+void WebResourceLoadStatisticsStore::tryDumpResourceLoadStatistics()
+{
+    ASSERT(!RunLoop::isMain());
+
+    if (!m_dumpResourceLoadStatisticsCompletionHandler)
+        return;
+
+    String result = m_statisticsStore ? m_statisticsStore->dumpResourceLoadStatistics() : emptyString();
+    postTaskReply([result = result.isolatedCopy(), completionHandler = WTFMove(m_dumpResourceLoadStatisticsCompletionHandler)]() mutable {
+        completionHandler(result);
     });
 }

trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.h

@@ -128 +128 @@
     void setVeryPrevalentResource(const RegistrableDomain&, CompletionHandler<void()>&&);
     void dumpResourceLoadStatistics(CompletionHandler<void(String)>&&);
+    void tryDumpResourceLoadStatistics();
     void isPrevalentResource(const RegistrableDomain&, CompletionHandler<void(bool)>&&);
     void isVeryPrevalentResource(const RegistrableDomain&, CompletionHandler<void(bool)>&&);
@@ -206 +207 @@
 
     bool m_firstNetworkProcessCreated { false };
+    
+    CompletionHandler<void(String)> m_dumpResourceLoadStatisticsCompletionHandler;
 };