Changeset 286132 in webkit

Timestamp:

Nov 23, 2021, 5:20:27 AM (5 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Many network process crashes when running WPT tests
​https://bugs.webkit.org/show_bug.cgi?id=232629

Reviewed by Martin Robinson.

For some reason there's a runtime critical warning coming from GLib under flatpak when trying to inherit the
current thread scheduler settings in newly created ones. As a workaround we don't use QOS::Background for
network cache background IO queue when running under flatpak.

• NetworkProcess/cache/NetworkCacheStorage.cpp:

(WebKit::NetworkCache::qosForBackgroundIOQueue):
(WebKit::NetworkCache::Storage::Storage):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheStorage.cpp (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-11-23  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Many network process crashes when running WPT tests
+        https://bugs.webkit.org/show_bug.cgi?id=232629
+
+        Reviewed by Martin Robinson.
+
+        For some reason there's a runtime critical warning coming from GLib under flatpak when trying to inherit the
+        current thread scheduler settings in newly created ones. As a workaround we don't use QOS::Background for
+        network cache background IO queue when running under flatpak.
+
+        * NetworkProcess/cache/NetworkCacheStorage.cpp:
+        (WebKit::NetworkCache::qosForBackgroundIOQueue):
+        (WebKit::NetworkCache::Storage::Storage):
+
 2021-11-23  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.cpp

@@ -43 +43 @@
 #include <wtf/text/StringToIntegerConversion.h>
 
+#if USE(GLIB)
+#include <wtf/glib/Sandbox.h>
+#endif
+
 namespace WebKit {
 namespace NetworkCache {
@@ -262 +266 @@
 }
 
+static WorkQueue::QOS qosForBackgroundIOQueue()
+{
+#if USE(GLIB)
+    // FIXME: for some reason there's a runtime critical warning coming from GLib under flatpak when trying to
+    // inherit the current thread scheduler settings in newly created ones. See https://bugs.webkit.org/show_bug.cgi?id=232629.
+    if (isInsideFlatpak())
+        return WorkQueue::QOS::Default;
+#endif
+    return WorkQueue::QOS::Background;
+}
+
 Storage::Storage(const String& baseDirectoryPath, Mode mode, Salt salt, size_t capacity)
     : m_basePath(baseDirectoryPath)
@@ -271 +286 @@
     , m_writeOperationDispatchTimer(*this, &Storage::dispatchPendingWriteOperations)
     , m_ioQueue(ConcurrentWorkQueue::create("com.apple.WebKit.Cache.Storage"))
-    , m_backgroundIOQueue(ConcurrentWorkQueue::create("com.apple.WebKit.Cache.Storage.background", WorkQueue::QOS::Background))
+    , m_backgroundIOQueue(ConcurrentWorkQueue::create("com.apple.WebKit.Cache.Storage.background", qosForBackgroundIOQueue()))
     , m_serialBackgroundIOQueue(WorkQueue::create("com.apple.WebKit.Cache.Storage.serialBackground", WorkQueue::QOS::Background))
     , m_blobStorage(makeBlobDirectoryPath(baseDirectoryPath), m_salt)