Changeset 256426 in webkit

Timestamp:

Feb 11, 2020 10:15:24 PM (4 years ago)

Author:

youenn@apple.com

Message:

[ Mac Debug wk2 ] ASSERTION FAILED: m_wasConstructedOnMainThread == isMainThread()
​https://bugs.webkit.org/show_bug.cgi?id=207509
<rdar://problem/59325466>

Reviewed by Chris Dumez.

Covered by existing tests.

• NetworkProcess/cache/CacheStorageEngine.cpp:

(WebKit::CacheStorage::Engine::writeSizeFile):
Make sure completion handler is always called on the main thread.
Minor refactoring to make things more efficient.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/CacheStorageEngine.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-02-11  Youenn Fablet  <youenn@apple.com>
+
+        [ Mac Debug wk2 ] ASSERTION FAILED: m_wasConstructedOnMainThread == isMainThread()
+        https://bugs.webkit.org/show_bug.cgi?id=207509
+        <rdar://problem/59325466>
+
+        Reviewed by Chris Dumez.
+
+        Covered by existing tests.
+
+        * NetworkProcess/cache/CacheStorageEngine.cpp:
+        (WebKit::CacheStorage::Engine::writeSizeFile):
+        Make sure completion handler is always called on the main thread.
+        Minor refactoring to make things more efficient.
+
 2020-02-11  Fujii Hironori  <Hironori.Fujii@sony.com>
 

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

@@ -531 +531 @@
 void Engine::writeSizeFile(const String& path, uint64_t size, CompletionHandler<void()>&& completionHandler)
 {
-    CompletionHandlerCallingScope completionHandlerCaller(WTFMove(completionHandler));
+    ASSERT(RunLoop::isMain());
+
     if (!shouldPersist())
-        return;
-
-    m_ioQueue->dispatch([path = path.isolatedCopy(), size, completionHandlerCaller = WTFMove(completionHandlerCaller)]() mutable {
+        return completionHandler();
+
+    m_ioQueue->dispatch([path = path.isolatedCopy(), size, completionHandler = WTFMove(completionHandler)]() mutable {
         LockHolder locker(globalSizeFileLock);
         auto fileHandle = FileSystem::openFile(path, FileSystem::FileOpenMode::Write);
-        auto closeFileHandler = makeScopeExit([&] {
+
+        if (FileSystem::isHandleValid(fileHandle)) {
+            FileSystem::truncateFile(fileHandle, 0);
+
+            auto value = String::number(size).utf8();
+            FileSystem::writeToFile(fileHandle, value.data(), value.length());
+
             FileSystem::closeFile(fileHandle);
-        });
-        if (!FileSystem::isHandleValid(fileHandle))
-            return;
-
-        FileSystem::truncateFile(fileHandle, 0);
-        FileSystem::writeToFile(fileHandle, String::number(size).utf8().data(), String::number(size).utf8().length());
-
-        RunLoop::main().dispatch([completionHandlerCaller = WTFMove(completionHandlerCaller)]() mutable { });
+        }
+
+        RunLoop::main().dispatch(WTFMove(completionHandler));
     });
 }