Attachment 359682 Details for Bug 193569 – Patch

[patch] Patch

wk-remote-inspector-deadlock.diff (text/plain), 2.30 KB, created by Carlos Garcia Campos on 2019-01-21 02:56:47 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2019-01-21 02:56:47 PST

Size: 2.30 KB

patch

obsolete

>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index dbc7d46ad18..7b4fc5d3c1b 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-01-21  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>+        [GLIB] Remote Inspector: no data displayed
>+        https://bugs.webkit.org/show_bug.cgi?id=193569
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Release the remote inspector mutex before using RemoteConnectionToTarget in RemoteInspector::setup() to avoid a
>+        deadlock.
>+
>+        * inspector/remote/glib/RemoteInspectorGlib.cpp:
>+        (Inspector::RemoteInspector::receivedSetupMessage):
>+        (Inspector::RemoteInspector::setup):
>+
> 2019-01-20  Saam Barati  <sbarati@apple.com>
> 
>         DFG: When inlining DataView set* intrinsics we need to set undefined as our result
>diff --git a/Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorGlib.cpp b/Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorGlib.cpp
>index 1d00a304503..b73455a40cc 100644
>--- a/Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorGlib.cpp
>+++ b/Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorGlib.cpp
>@@ -293,7 +293,6 @@ void RemoteInspector::receivedGetTargetListMessage()
> 
> void RemoteInspector::receivedSetupMessage(unsigned targetIdentifier)
> {
>-    std::lock_guard<Lock> lock(m_mutex);
>     setup(targetIdentifier);
> }
> 
>@@ -328,9 +327,13 @@ void RemoteInspector::receivedCloseMessage(unsigned targetIdentifier)
> 
> void RemoteInspector::setup(unsigned targetIdentifier)
> {
>-    RemoteControllableTarget* target = m_targetMap.get(targetIdentifier);
>-    if (!target)
>-        return;
>+    RemoteControllableTarget* target;
>+    {
>+        std::lock_guard<Lock> lock(m_mutex);
>+        target = m_targetMap.get(targetIdentifier);
>+        if (!target)
>+            return;
>+    }
> 
>     auto connectionToTarget = adoptRef(*new RemoteConnectionToTarget(*target));
>     ASSERT(is<RemoteInspectionTarget>(target) || is<RemoteAutomationTarget>(target));
>@@ -338,6 +341,8 @@ void RemoteInspector::setup(unsigned targetIdentifier)
>         connectionToTarget->close();
>         return;
>     }
>+
>+    std::lock_guard<Lock> lock(m_mutex);
>     m_targetConnectionMap.set(targetIdentifier, WTFMove(connectionToTarget));
> 
>     updateHasActiveDebugSession();

Flags:

mcatanzaro: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 193569: 359682