Changeset 201612 in webkit

Timestamp:

Jun 2, 2016, 12:57:41 PM (10 years ago)

Author:

Chris Dumez

Message:

Crash under WebProcess::registerWithStateDumper()
​https://bugs.webkit.org/show_bug.cgi?id=158304
<rdar://problem/25329276>

Reviewed by Anders Carlsson.

The issue is that the block in registerWithStateDumper() was executed in
a background thread and is iterating over m_pageMap HashMap. The crash
occurs when a page gets removed from the m_pageMap HashMap while the
block is iterating over this same HashMap in another thread.

The solution proposed is to execute the registerWithStateDumper()'s
block in the main thread.

• WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::WebProcess::registerWithStateDumper):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/cocoa/WebProcessCocoa.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-06-02  Chris Dumez  <cdumez@apple.com>
+
+        Crash under WebProcess::registerWithStateDumper()
+        https://bugs.webkit.org/show_bug.cgi?id=158304
+        <rdar://problem/25329276>
+
+        Reviewed by Anders Carlsson.
+
+        The issue is that the block in registerWithStateDumper() was executed in
+        a background thread and is iterating over m_pageMap HashMap. The crash
+        occurs when a page gets removed from the m_pageMap HashMap while the
+        block is iterating over this same HashMap in another thread.
+
+        The solution proposed is to execute the registerWithStateDumper()'s
+        block in the main thread.
+
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::registerWithStateDumper):
+
 2016-06-02  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm

@@ -218 +218 @@
 void WebProcess::registerWithStateDumper()
 {
-    dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
-    os_state_add_handler(queue, ^(os_state_hints_t hints) {
+    os_state_add_handler(dispatch_get_main_queue(), ^(os_state_hints_t hints) {
 
         @autoreleasepool {