Use loopcancellation instead of adding a seperate api.

donandren · Jan 20, 2020 · 9df55b0 · 9df55b0
1 parent c3fb152
commit 9df55b0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 32 deletions.
diff --git a/native/Avalonia.Native/inc/avalonia-native.h b/native/Avalonia.Native/inc/avalonia-native.h
@@ -308,7 +308,6 @@ AVNCOM(IAvnPlatformThreadingInterface, 0b) : IUnknown
     // Can't pass int* to sharpgentools for some reason
     virtual void Signal(int priority) = 0;
     virtual IUnknown* StartTimer(int priority, int ms, IAvnActionCallback* callback) = 0;
-    virtual HRESULT TerminateApp () = 0;
 };
 
 AVNCOM(IAvnSystemDialogEvents, 0c) : IUnknown

diff --git a/native/Avalonia.Native/src/OSX/platformthreading.mm b/native/Avalonia.Native/src/OSX/platformthreading.mm
@@ -138,12 +138,6 @@ virtual void Signal(int priority) override
             return new TimerWrapper(callback, ms);
         }
     }
-
-    virtual HRESULT TerminateApp () override
-    {
-        [NSApp stop:0];
-        return S_OK;
-    }
 };
 
 @implementation Signaler

diff --git a/src/Avalonia.Native/PlatformThreadingInterface.cs b/src/Avalonia.Native/PlatformThreadingInterface.cs
@@ -45,6 +45,7 @@ public void Signaled(int priority, bool priorityContainsMeaningfulValue)
 
         readonly IAvnPlatformThreadingInterface _native;
         private ExceptionDispatchInfo _exceptionDispatchInfo;
+        private IAvnLoopCancellation _loopCancellation;
 
         public PlatformThreadingInterface(IAvnPlatformThreadingInterface native)
         {
@@ -59,36 +60,31 @@ public PlatformThreadingInterface(IAvnPlatformThreadingInterface native)
 
         public void RunLoop(CancellationToken cancellationToken)
         {
-            if (cancellationToken.CanBeCanceled == false)
-                _native.RunLoop(null);
-            else
+            var l = new object();
+            _loopCancellation = _native.CreateLoopCancellation();
+            cancellationToken.Register(() =>
             {
-                var l = new object();
-                var cancellation = _native.CreateLoopCancellation();
-                cancellationToken.Register(() =>
+                lock (l)
                 {
-                    lock (l)
-                    {
-                        cancellation?.Cancel();
-                    }
-                });
-                try
-                {
-                    _native.RunLoop(cancellation);
+                    _loopCancellation?.Cancel();
                 }
-                finally
+            });
+            try
+            {
+                _native.RunLoop(_loopCancellation);
+            }
+            finally
+            {
+                lock (l)
                 {
-                    lock(l)
-                    {
-                        cancellation?.Dispose();
-                        cancellation = null;
-                    }
+                    _loopCancellation?.Dispose();
+                    _loopCancellation = null;
                 }
+            }
 
-                if(_exceptionDispatchInfo != null)
-                {
-                    _exceptionDispatchInfo.Throw();
-                }
+            if (_exceptionDispatchInfo != null)
+            {
+                _exceptionDispatchInfo.Throw();
             }
         }
 
@@ -99,7 +95,7 @@ public void DispatchException (ExceptionDispatchInfo exceptionInfo)
 
         public void TerminateNativeApp()
         {
-            _native.TerminateApp();
+            _loopCancellation?.Cancel();
         }
 
         public void Signal(DispatcherPriority priority)