Changeset 224790 in webkit

Timestamp:

Nov 13, 2017 3:25:00 PM (6 years ago)

Author:

achristensen@apple.com

Message:

Add logs to debug content extension test failures
​https://bugs.webkit.org/show_bug.cgi?id=179624

Reviewed by Chris Dumez.

• UIProcess/API/APIContentRuleListStore.cpp:

(API::compiledToFile):
Right now I'm seeing this log:
"Rule list compilation failed: Unspecified error during compile."
I need more information to debug what is failing on the bots.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/APIContentRuleListStore.cpp (modified) (4 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-11-13  Alex Christensen  <achristensen@webkit.org>
+
+        Add logs to debug content extension test failures
+        https://bugs.webkit.org/show_bug.cgi?id=179624
+
+        Reviewed by Chris Dumez.
+
+        * UIProcess/API/APIContentRuleListStore.cpp:
+        (API::compiledToFile):
+        Right now I'm seeing this log:
+        "Rule list compilation failed: Unspecified error during compile."
+        I need more information to debug what is failing on the bots.
+
 2017-11-07  Brian Burg  <bburg@apple.com>
 

trunk/Source/WebKit/UIProcess/API/APIContentRuleListStore.cpp

@@ -324 +324 @@
     auto temporaryFileHandle = invalidPlatformFileHandle;
     String temporaryFilePath = openTemporaryFile("ContentRuleList", temporaryFileHandle);
-    if (temporaryFileHandle == invalidPlatformFileHandle)
+    if (temporaryFileHandle == invalidPlatformFileHandle) {
+        WTFLogAlways("Content Rule List compiling failed: Opening temporary file failed.");
         return ContentRuleListStore::Error::CompileFailed;
+    }
     
     char invalidHeader[ContentRuleListFileHeaderSize];
@@ -331 +333 @@
     // This header will be rewritten in CompilationClient::finalize.
     if (writeToFile(temporaryFileHandle, invalidHeader, sizeof(invalidHeader)) == -1) {
+        WTFLogAlways("Content Rule List compiling failed: Writing header to file failed.");
         closeFile(temporaryFileHandle);
         return ContentRuleListStore::Error::CompileFailed;
@@ -338 +341 @@
     
     if (auto compilerError = compileRuleList(compilationClient, WTFMove(json))) {
+        WTFLogAlways("Content Rule List compiling failed: Compiling failed.");
         closeFile(temporaryFileHandle);
         return compilerError;
     }
     if (compilationClient.hadErrorWhileWritingToFile()) {
+        WTFLogAlways("Content Rule List compiling failed: Writing to file failed.");
         closeFile(temporaryFileHandle);
         return ContentRuleListStore::Error::CompileFailed;
@@ -347 +352 @@
     
     mappedData = adoptAndMapFile(temporaryFileHandle, 0, metaData.fileSize());
-    if (mappedData.isNull())
+    if (mappedData.isNull()) {
+        WTFLogAlways("Content Rule List compiling failed: Mapping file failed.");
         return ContentRuleListStore::Error::CompileFailed;
-
-    if (!moveFile(temporaryFilePath, finalFilePath))
+    }
+
+    if (!moveFile(temporaryFilePath, finalFilePath)) {
+        WTFLogAlways("Content Rule List compiling failed: Moving file failed.");
         return ContentRuleListStore::Error::CompileFailed;
+    }
 
     return { };