diff options
author | Greg Munn <gregm@microsoft.com> | 2020-01-23 18:15:33 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-23 18:15:33 +0300 |
commit | e0c8fcff60a773b903e471a08cca4c27c9c0893b (patch) | |
tree | 46d1ad6e9c492cce4a5667574b88204edb21ad74 | |
parent | b6246867e382026f5b17cc3658b2dfdb51916eac (diff) | |
parent | 872072f26b71307b8c648fd8f2e65c17bf45d376 (diff) |
Merge pull request #9552 from mono/jstedfast-debugger-session-step-avoid-threadpool-queue
[Debugger] Update VSCodeDebuggerSession Step methods to send requests…
m--------- | main/external/debugger-libs | 0 | ||||
-rw-r--r-- | main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/VSCodeDebuggerSession.cs | 36 |
2 files changed, 13 insertions, 23 deletions
diff --git a/main/external/debugger-libs b/main/external/debugger-libs -Subproject 44a15150f60d1500edc6dca1983056ed747ebee +Subproject 938be96415a9a2725d6d10df2130e9715cd85c7 diff --git a/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/VSCodeDebuggerSession.cs b/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/VSCodeDebuggerSession.cs index 46ea91dd9f..b1bbbbf03c 100644 --- a/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/VSCodeDebuggerSession.cs +++ b/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/VSCodeDebuggerSession.cs @@ -101,11 +101,9 @@ namespace MonoDevelop.Debugger.VsCodeDebugProtocol protected override void OnFinish () { - try { - protocolClient.SendRequestSync (new StepOutRequest (currentThreadId)); - } catch (Exception ex) { + protocolClient.SendRequest (new StepOutRequest (currentThreadId), null, (args, ex) => { DebuggerLoggingService.LogError ("[VSCodeDebugger] StepOut request failed", ex); - } + }); } List<ProcessInfo> processInfo = new List<ProcessInfo>(); @@ -229,20 +227,16 @@ namespace MonoDevelop.Debugger.VsCodeDebugProtocol protected override void OnNextInstruction () { - try { - protocolClient.SendRequestSync (new NextRequest (currentThreadId)); - } catch (Exception ex) { + protocolClient.SendRequest (new NextRequest (currentThreadId), null, (args, ex) => { DebuggerLoggingService.LogError ("[VSCodeDebugger] NextInstruction request failed", ex); - } + }); } protected override void OnNextLine () { - try { - protocolClient.SendRequestSync (new NextRequest (currentThreadId)); - } catch (Exception ex) { + protocolClient.SendRequest (new NextRequest (currentThreadId), null, (args, ex) => { DebuggerLoggingService.LogError ("[VSCodeDebugger] StepOver request failed", ex); - } + }); } protected override void OnRemoveBreakEvent (BreakEventInfo eventInfo) @@ -606,8 +600,7 @@ namespace MonoDevelop.Debugger.VsCodeDebugProtocol breakpoints.Select (b => b.Key).OfType<MonoFunctionBreakpoint> () .Where (b => b.Enabled) .Select (b => new VsCodeFunctionBreakpoint (b.FunctionName)) - .ToList ()), - (obj) => { }); + .ToList ()), null); } protected InitializeResponse Capabilities; @@ -619,20 +612,16 @@ namespace MonoDevelop.Debugger.VsCodeDebugProtocol protected override void OnStepInstruction () { - try { - protocolClient.SendRequestSync (new StepInRequest (currentThreadId)); - } catch (Exception ex) { + protocolClient.SendRequest (new StepInRequest (currentThreadId), null, (args, ex) => { DebuggerLoggingService.LogError ("[VSCodeDebugger] StepInstruction request failed", ex); - } + }); } protected override void OnStepLine () { - try { - protocolClient.SendRequestSync (new StepInRequest (currentThreadId)); - } catch (Exception ex) { + protocolClient.SendRequest (new StepInRequest (currentThreadId), null, (args, ex) => { DebuggerLoggingService.LogError ("[VSCodeDebugger] StepIn request failed", ex); - } + }); } protected override void OnStop () @@ -656,7 +645,8 @@ namespace MonoDevelop.Debugger.VsCodeDebugProtocol try { protocolClient.SendRequestSync (new DisconnectRequest ()); protocolClient.Stop (); - } catch { + } catch (Exception ex) { + DebuggerLoggingService.LogError ("[VSCodeDebugger] Disconnect request failed", ex); } protocolClient = null; } |