Поддержка признака terminateDebuggee

Author: EvilBeaver

src/OneScript.DebugProtocol/IDebuggerService.cs

@@ -98,14 +98,15 @@ public interface IDebuggerService
         [OperationContract(IsOneWay = true)]
 #endif
         void StepOut(int threadId);
-        
+
         /// <summary>
         /// Отключение сеанса отладки по инициативе IDE
         /// </summary>
+        /// <param name="terminate"></param>
 #if NETFRAMEWORK
         [OperationContract(IsOneWay = true)]
 #endif
-        void Disconnect();
+        void Disconnect(bool terminate);
 
 #if NETFRAMEWORK
         [OperationContract]

src/OneScript.DebugServices/DefaultDebugService.cs

@@ -21,7 +21,7 @@ public class DefaultDebugService : IDebuggerService
     {
         private readonly IBreakpointManager _breakpointManager;
         private readonly IVariableVisualizer _visualizer;
-        private ThreadManager _threadManager { get; }
+        private readonly ThreadManager _threadManager;
 
         public DefaultDebugService(IBreakpointManager breakpointManager, ThreadManager threads, IVariableVisualizer visualizer)
         {
@@ -49,7 +49,7 @@ public void Execute(int threadId)
             }
         }
 
-        public virtual Breakpoint[] SetMachineBreakpoints(Breakpoint[] breaksToSet)
+        public Breakpoint[] SetMachineBreakpoints(Breakpoint[] breaksToSet)
         {
             var confirmedBreakpoints = new List<Breakpoint>();
 
@@ -82,7 +82,7 @@ public virtual Breakpoint[] SetMachineBreakpoints(Breakpoint[] breaksToSet)
             return confirmedBreakpoints.ToArray();
         }
 
-        public virtual StackFrame[] GetStackFrames(int threadId)
+        public StackFrame[] GetStackFrames(int threadId)
         {
             var machine = _threadManager.GetTokenForThread(threadId).Machine;
             var frames = machine.GetExecutionFrames();
@@ -107,7 +107,7 @@ private MachineInstance GetMachine(int threadId)
             return _threadManager.GetTokenForThread(threadId).Machine;
         }
 
-        public virtual Variable[] GetVariables(int threadId, int frameIndex, int[] path)
+        public Variable[] GetVariables(int threadId, int frameIndex, int[] path)
         {
             var machine = _threadManager.GetTokenForThread(threadId).Machine;
             var locals = machine.GetFrameLocals(frameIndex);
@@ -121,7 +121,7 @@ public virtual Variable[] GetVariables(int threadId, int frameIndex, int[] path)
             return GetDebugVariables(locals);
         }
 
-        public virtual Variable[] GetEvaluatedVariables(string expression, int threadId, int frameIndex, int[] path)
+        public Variable[] GetEvaluatedVariables(string expression, int threadId, int frameIndex, int[] path)
         {
             IValue value;
 
@@ -145,7 +145,7 @@ public virtual Variable[] GetEvaluatedVariables(string expression, int threadId,
             return GetDebugVariables(locals);
         }
 
-        public virtual Variable Evaluate(int threadId, int contextFrame, string expression)
+        public Variable Evaluate(int threadId, int contextFrame, string expression)
         {
             try
             {
@@ -163,34 +163,34 @@ public virtual Variable Evaluate(int threadId, int contextFrame, string expressi
             }
         }
 
-        public virtual void Next(int threadId)
+        public void Next(int threadId)
         {
             var t = _threadManager.GetTokenForThread(threadId);
             t.Machine.StepOver();
             t.Set();
         }
 
-        public virtual void StepIn(int threadId)
+        public void StepIn(int threadId)
         {
             var t = _threadManager.GetTokenForThread(threadId);
             t.Machine.StepIn();
             t.Set();
         }
 
-        public virtual void StepOut(int threadId)
+        public void StepOut(int threadId)
         {
             var t = _threadManager.GetTokenForThread(threadId);
             t.Machine.StepOut();
             t.Set();
         }
 
-        public void Disconnect()
+        public void Disconnect(bool terminate)
         {
             _breakpointManager.Clear();
             _threadManager.ReleaseAllThreads();
         }
 
-        public virtual int[] GetThreads()
+        public int[] GetThreads()
         {
             return _threadManager.GetAllThreadIds();
         }

src/OneScript.DebugServices/MachineWaitToken.cs

@@ -26,6 +26,7 @@ public class MachineWaitToken: IDisposable
         public void Dispose()
         {
             Machine.UnsetDebugMode();
+            _threadEvent.Set();
             _threadEvent.Dispose();
         }
     }

src/VSCode.DebugAdapter/DebugSession.cs

@@ -180,6 +180,7 @@ public class Capabilities : ResponseBody {
 		public bool supportsConditionalBreakpoints;
 		public bool supportsEvaluateForHovers;
 		public dynamic[] exceptionBreakpointFilters;
+		public bool supportTerminateDebuggee;
 	}
 
 	public class ErrorResponseBody : ResponseBody {

src/VSCode.DebugAdapter/DebugeeProcess.cs

@@ -147,13 +147,16 @@ private void Terminate()
             }
         }
 
-        public void HandleDisconnect()
+        public void HandleDisconnect(bool terminate)
         {
-            _debugger.Disconnect();
+            _debugger.Disconnect(terminate);
+
+            var mustKill = terminate || !_attachMode;
 
-            if (!_attachMode && _process != null && !_process.HasExited)
+            if (mustKill && _process != null && !_process.HasExited)
             {
-                _process.Kill();
+                if (!_process.WaitForExit(2000))
+                    _process.Kill();
             }
         }
 

src/VSCode.DebugAdapter/OscriptDebugSession.cs

@@ -35,13 +35,14 @@ public override void Initialize(Response response, dynamic args)
 
             _process = DebugeeFactory.CreateProcess(AdapterID, PathStrategy);
 
-            SendResponse(response, new Capabilities()
+            SendResponse(response, new Capabilities
             {
                 supportsConditionalBreakpoints = false,
                 supportsFunctionBreakpoints = false,
                 supportsConfigurationDoneRequest = true,
                 exceptionBreakpointFilters = new dynamic[0],
-                supportsEvaluateForHovers = true
+                supportsEvaluateForHovers = true,
+                supportTerminateDebuggee = true
             });
 
             SendEvent(new InitializedEvent());
@@ -105,7 +106,7 @@ public override void Launch(Response response, dynamic args)
             }
             catch (Exception e)
             {
-                _process.HandleDisconnect();
+                _process.HandleDisconnect(true);
                 _process = null;
                 SessionLog.WriteLine(e.ToString());
                 SendErrorResponse(response, 4550, "Can't connect: " + e.ToString());
@@ -149,7 +150,14 @@ public override void Attach(Response response, dynamic arguments)
 
         public override void Disconnect(Response response, dynamic arguments)
         {
-            _process.HandleDisconnect();
+            bool terminateDebuggee = arguments.terminateDebuggee == true;
+            
+            _process.HandleDisconnect(terminateDebuggee);
+            if (terminateDebuggee)
+            {
+                // Для более быстрого прерывания сессии
+                SendEvent(new TerminatedEvent());
+            }
             SendResponse(response);
         }
 

src/VSCode.DebugAdapter/OscriptProtocols/Tcp/TcpDebugConnector.cs

@@ -180,9 +180,9 @@ public void StepOut(int threadId)
             WriteCommand(threadId);
         }
 
-        public void Disconnect()
+        public void Disconnect(bool terminate)
         {
-            WriteCommand(null);
+            WriteCommand(terminate);
         }
 
         public int[] GetThreads()

src/VSCode.DebugAdapter/OscriptProtocols/Wcf/WcfDebuggerConnection.cs

@@ -79,9 +79,9 @@ public void StepOut(int threadId)
             _serviceProxy.Instance.StepOut(threadId);
         }
 
-        public void Disconnect()
+        public void Disconnect(bool terminate)
         {
-            _serviceProxy.Instance.Disconnect();
+            _serviceProxy.Instance.Disconnect(terminate);
         }
 
         public int[] GetThreads()

src/oscript/DebugServer/DebugServiceImpl.cs

@@ -185,7 +185,7 @@ public virtual void StepOut(int threadId)
             t.ThreadEvent.Set();
         }
 
-        public void Disconnect()
+        public void Disconnect(bool terminate)
         {
             Controller.BreakpointManager.Clear();
             Controller.GetAllThreadIds().ForEach(threadId =>

src/oscript/DebugServer/WCFDebugService.cs

@@ -82,9 +82,9 @@ public void StepOut(int threadId)
             _debugServiceImpl.StepOut(threadId);
         }
 
-        public void Disconnect()
+        public void Disconnect(bool terminate)
         {
-            _debugServiceImpl.Disconnect();
+            _debugServiceImpl.Disconnect(terminate);
         }
 
         public int[] GetThreads()