Changeset 183569 in webkit

Timestamp:

Apr 29, 2015, 12:45:44 PM (10 years ago)

Author:

bshafiei@apple.com

Message:

Merged r183526. rdar://problem/20717863

Location:

tags/Safari-601.1.31/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/remote/RemoteInspector.mm (modified) (1 diff)

tags/Safari-601.1.31/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-04-29  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r183526.
+
+    2015-04-28  Joseph Pecoraro  <pecoraro@apple.com>
+
+            Deadlock on applications using JSContext on non-main thread
+            https://bugs.webkit.org/show_bug.cgi?id=144370
+
+            Reviewed by Timothy Hatcher.
+
+            * inspector/remote/RemoteInspector.mm:
+            (Inspector::RemoteInspector::singleton):
+            Prevent a possible deadlock by assuming we can synchronously
+            run something on the main queue at this time.
+
 2015-04-28  Michael Catanzaro  <mcatanzaro@igalia.com>
 

tags/Safari-601.1.31/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm

@@ -94 +94 @@
             if ([NSThread isMainThread])
                 initialize();
-            else
-                dispatch_sync(dispatch_get_main_queue(), initialize);
+            else {
+                // FIXME: This means that we may miss an auto-attach to a JSContext created on a non-main thread.
+                // The main thread initialization is required for certain WTF values that need to be initialized
+                // on the "real" main thread. We should investigate a better way to handle this.
+                dispatch_async(dispatch_get_main_queue(), initialize);
+            }
         }
     });