Merge pull request #9552 from mono/jstedfast-debugger-session-step-av…

…oid-threadpool-queue [Debugger] Update VSCodeDebuggerSession Step methods to send requests…
mono · Jan 23, 2020 · e0c8fcf · e0c8fcf
2 parents b624686 + 872072f
commit e0c8fcf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 24 deletions.
diff --git a/main/external/debugger-libs b/main/external/debugger-libs
diff --git a/...ger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/VSCodeDebuggerSession.cs b/...ger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/VSCodeDebuggerSession.cs
@@ -101,11 +101,9 @@ protected override void OnExit ()
 
 		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 @@ void UpdateExceptions ()
 
 		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 @@ void UpdateBreakpoints ()
 					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 @@ protected override void OnSetActiveThread (long processId, long threadId)
 
 		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 @@ public override void Dispose ()
 				try {
 					protocolClient.SendRequestSync (new DisconnectRequest ());
 					protocolClient.Stop ();
-				} catch {
+				} catch (Exception ex) {
+					DebuggerLoggingService.LogError ("[VSCodeDebugger] Disconnect request failed", ex);
 				}
 				protocolClient = null;
 			}
+2 −0		Mono.Debugger.Soft/Mono.Debugger.Soft/StackFrame.cs
+14 −2		Mono.Debugging.Soft/SoftDebuggerAdaptor.cs
+34 −38		Mono.Debugging.Soft/SoftDebuggerSession.cs
+2 −2		Mono.Debugging.Soft/VariableValueReference.cs
+0 −2		Mono.Debugging/Mono.Debugging.Backend/IRawValue.cs