[CorDebug] Invocations rewritten to .Net Task API

Author: nerzhulart

main/src/addins/MonoDevelop.Debugger.Win32/Mono.Debugging.Win32/CorDebuggerSession.cs

@@ -109,6 +109,13 @@ public static int EvaluationTimestamp {
 			get { return evaluationTimestamp; }
 		}
 
+		internal CorProcess Process
+		{
+			get
+			{
+				return process;
+			}
+		}
 
 		public override void Dispose ( )
 		{
@@ -1340,49 +1347,16 @@ public CorValue RuntimeInvoke (CorEvaluationContext ctx, CorFunction function, C
 				arguments.CopyTo (args, 1);
 			}
 
-			CorMethodCall mc = new CorMethodCall ();
-			CorValue exception = null;
-			CorEval eval = ctx.Eval;
-
-			DebugEventHandler<CorEvalEventArgs> completeHandler = delegate (object o, CorEvalEventArgs eargs) {
-				OnEndEvaluating ();
-				mc.DoneEvent.Set ();
-				eargs.Continue = false;
-			};
-
-			DebugEventHandler<CorEvalEventArgs> exceptionHandler = delegate(object o, CorEvalEventArgs eargs) {
-				OnEndEvaluating ();
-				exception = eargs.Eval.Result;
-				mc.DoneEvent.Set ();
-				eargs.Continue = false;
-			};
-
-			process.OnEvalComplete += completeHandler;
-			process.OnEvalException += exceptionHandler;
-
-			mc.OnInvoke = delegate {
-				if (function.GetMethodInfo (this).Name == ".ctor")
-					eval.NewParameterizedObject (function, typeArgs, args);
-				else
-					eval.CallParameterizedFunction (function, typeArgs, args);
-				process.SetAllThreadsDebugState (CorDebugThreadState.THREAD_SUSPEND, ctx.Thread);
-				ClearEvalStatus ();
-				OnStartEvaluating ();
-				process.Continue (false);
-			};
-			mc.OnAbort = delegate {
-				eval.Abort ();
-			};
-			mc.OnGetDescription = delegate {
-				MethodInfo met = function.GetMethodInfo (ctx.Session);
-				if (met != null)
-					return met.DeclaringType.FullName + "." + met.Name;
-				else
-					return "<Unknown>";
-			};
-
+			var methodCall = new CorMethodCall (ctx, function, typeArgs, args);
 			try {
-				ObjectAdapter.AsyncExecute (mc, ctx.Options.EvaluationTimeout);
+				var result = ObjectAdapter.InvokeSync (methodCall, ctx.Options.EvaluationTimeout);
+				if (result.ResultIsException) {
+					var vref = new CorValRef (result.Result);
+					throw new EvaluatorExceptionThrownException (vref, ObjectAdapter.GetValueTypeName (ctx, vref));
+				}
+
+				WaitUntilStopped ();
+				return result.Result;
 			}
 			catch (COMException ex) {
 				// eval exception is a 'good' exception that should be shown in value box
@@ -1392,35 +1366,16 @@ public CorValue RuntimeInvoke (CorEvaluationContext ctx, CorFunction function, C
 					throw evalException;
 				throw;
 			}
-			finally {
-				process.OnEvalComplete -= completeHandler;
-				process.OnEvalException -= exceptionHandler;
-			}
-
-			WaitUntilStopped ();
-			if (exception != null) {
-/*				ValueReference<CorValue, CorType> msg = ctx.Adapter.GetMember (ctx, val, "Message");
-				if (msg != null) {
-					string s = msg.ObjectValue as string;
-					mc.ExceptionMessage = s;
-				}
-				else
-					mc.ExceptionMessage = "Evaluation failed.";*/
-				CorValRef vref = new CorValRef (exception);
-				throw new EvaluatorException ("Evaluation failed: " + ObjectAdapter.GetValueTypeName (ctx, vref));
-			}
-
-			return eval.Result;
 		}
 
-		void OnStartEvaluating ( )
+		internal void OnStartEvaluating ( )
 		{
 			lock (debugLock) {
 				evaluating = true;
 			}
 		}
 
-		void OnEndEvaluating ( )
+		internal void OnEndEvaluating ( )
 		{
 			lock (debugLock) {
 				evaluating = false;
@@ -1526,7 +1481,7 @@ public void WaitUntilStopped ()
 			}
 		}
 
-		void ClearEvalStatus ( )
+		internal void ClearEvalStatus ( )
 		{
 			foreach (CorProcess p in dbg.Processes) {
 				if (p.Id == processId) {

main/src/addins/MonoDevelop.Debugger.Win32/Mono.Debugging.Win32/CorMethodCall.cs

@@ -1,47 +1,113 @@
 using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Samples.Debugging.CorDebug;
+using Microsoft.Samples.Debugging.CorDebug.NativeApi;
 using Mono.Debugging.Evaluation;
 
 namespace Mono.Debugging.Win32
 {
-	class CorMethodCall: AsyncOperation
+	class CorMethodCall: AsyncOperationBase<CorValue>
 	{
-		public delegate void CallCallback ( );
-		public delegate string DescriptionCallback ( );
+		readonly CorEvaluationContext context;
+		readonly CorFunction function;
+		readonly CorType[] typeArgs;
+		readonly CorValue[] args;
 
-		public CallCallback OnInvoke;
-		public CallCallback OnAbort;
-		public DescriptionCallback OnGetDescription;
+		readonly CorEval eval;
 
-		public ManualResetEvent DoneEvent = new ManualResetEvent (false);
+		public CorMethodCall (CorEvaluationContext context, CorFunction function, CorType[] typeArgs, CorValue[] args)
+		{
+			this.context = context;
+			this.function = function;
+			this.typeArgs = typeArgs;
+			this.args = args;
+			eval = context.Eval;
+		}
 
-		public override string Description
+		void ProcessOnEvalComplete (object sender, CorEvalEventArgs evalArgs)
+		{
+			DoProcessEvalFinished (evalArgs, false);
+		}
+
+		void ProcessOnEvalException (object sender, CorEvalEventArgs evalArgs)
 		{
-			get { return OnGetDescription (); }
+			DoProcessEvalFinished (evalArgs, true);
 		}
 
-		public override void Invoke ( )
+		void DoProcessEvalFinished (CorEvalEventArgs evalArgs, bool isException)
 		{
-			OnInvoke ();
+			if (evalArgs.Eval != eval)
+				return;
+			context.Session.OnEndEvaluating ();
+			evalArgs.Continue = false;
+			tcs.TrySetResult(new OperationResult<CorValue> (evalArgs.Eval.Result, isException));
 		}
 
-		public override void Abort ( )
+		void SubscribeOnEvals ()
 		{
-			OnAbort ();
+			context.Session.Process.OnEvalComplete += ProcessOnEvalComplete;
+			context.Session.Process.OnEvalException += ProcessOnEvalException;
 		}
 
-		public override void Shutdown ( )
+		void UnSubcribeOnEvals ()
+		{
+			context.Session.Process.OnEvalComplete -= ProcessOnEvalComplete;
+			context.Session.Process.OnEvalException -= ProcessOnEvalException;
+		}
+
+		public override string Description
 		{
-			try {
-				Abort ();
+			get
+			{
+				var met = function.GetMethodInfo (context.Session);
+				if (met == null)
+					return "<Unknown>";
+				if (met.DeclaringType == null)
+					return met.Name;
+				return met.DeclaringType.FullName + "." + met.Name;
 			}
-			catch {
+		}
+
+		readonly TaskCompletionSource<OperationResult<CorValue>> tcs = new TaskCompletionSource<OperationResult<CorValue>> ();
+		const int DelayAfterAbort = 500;
+
+		protected override void AfterCancelledImpl (int elapsedAfterCancelMs)
+		{
+			if (tcs.TrySetCanceled ()) {
+				// really cancelled for the first time not before. so we should check that we awaited necessary amout of time after Abort() call
+				// else if we return too earle after Abort() the process may be PROCESS_NOT_SYNCHRONIZED
+				if (elapsedAfterCancelMs < DelayAfterAbort) {
+					Thread.Sleep (DelayAfterAbort - elapsedAfterCancelMs);
+				}
 			}
-			DoneEvent.Set ();
+			context.Session.OnEndEvaluating ();
 		}
 
-		public override bool WaitForCompleted (int timeout)
+		protected override Task<OperationResult<CorValue>> InvokeAsyncImpl (CancellationToken token)
+		{
+			SubscribeOnEvals ();
+
+			if (function.GetMethodInfo (context.Session).Name == ".ctor")
+				eval.NewParameterizedObject (function, typeArgs, args);
+			else
+				eval.CallParameterizedFunction (function, typeArgs, args);
+			context.Session.Process.SetAllThreadsDebugState (CorDebugThreadState.THREAD_SUSPEND, context.Thread);
+			context.Session.ClearEvalStatus ();
+			context.Session.OnStartEvaluating ();
+			context.Session.Process.Continue (false);
+			Task = tcs.Task;
+			// Don't pass token here, because it causes immediately task cancellation which must be performed by debugger event or real timeout 
+			// ReSharper disable once MethodSupportsCancellation
+			return Task.ContinueWith (task => {
+				UnSubcribeOnEvals ();
+				return task.Result;
+			});
+		}
+
+
+		protected override void CancelImpl ( )
 		{
-			return DoneEvent.WaitOne (timeout, false);
+			eval.Abort ();
 		}
 	}
 }