using Task

shiena · shiena · commit 9b880b2d883e · 2023-04-16T01:17:42.000+09:00
diff --git a/Assets/Scripts/PlotRandom.cs b/Assets/Scripts/PlotRandom.cs
@@ -1,5 +1,7 @@
 using Python.Runtime;
 using System;
+using System.Threading;
+using System.Threading.Tasks;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -10,18 +12,48 @@ public class PlotRandom : MonoBehaviour
     {
         [SerializeField] private RawImage _rawImage;
         [SerializeField] private Button _button;
+        private CancellationTokenSource cts;
+        private bool _executingPython = false;
 
         private void OnEnable()
         {
+            cts = new CancellationTokenSource();
             _button.onClick.AddListener(PlotFig);
         }
 
         private void OnDisable()
         {
             _button.onClick.RemoveListener(PlotFig);
+            cts.Cancel();
+            cts.Dispose();
         }
 
-        private void PlotFig()
+        private async void PlotFig()
+        {
+            if (_executingPython)
+            {
+                return;
+            }
+
+            _executingPython = true;
+            var state = PythonEngine.BeginAllowThreads();
+            try
+            {
+                var (bytes, w, h) = await Task.Run(Plot, cts.Token);
+                LoadImage(bytes, w, h);
+            }
+            catch (OperationCanceledException e) when (e.CancellationToken != cts.Token)
+            {
+                throw;
+            }
+            finally
+            {
+                PythonEngine.EndAllowThreads(state);
+                _executingPython = false;
+            }
+        }
+
+        private (byte[], int, int) Plot()
         {
             using (Py.GIL())
             {
@@ -37,7 +69,7 @@ private void PlotFig()
                     {
                         span = new ReadOnlySpan<byte>(ptr.ToPointer(), w*h*s);
                     }
-                    LoadImage(span, w, h);
+                    return (span.ToArray(), w, h);
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`using Python.Runtime;`
`2`	`2`	`using System;`
	`3`	`+using System.Threading;`
	`4`	`+using System.Threading.Tasks;`
`3`	`5`	`using UnityEngine;`
`4`	`6`	`using UnityEngine.UI;`
`5`	`7`
`@@ -10,18 +12,48 @@ public class PlotRandom : MonoBehaviour`
`10`	`12`	`{`
`11`	`13`	`[SerializeField] private RawImage _rawImage;`
`12`	`14`	`[SerializeField] private Button _button;`
	`15`	`+ private CancellationTokenSource cts;`
	`16`	`+ private bool _executingPython = false;`
`13`	`17`
`14`	`18`	`private void OnEnable()`
`15`	`19`	`{`
	`20`	`+ cts = new CancellationTokenSource();`
`16`	`21`	`_button.onClick.AddListener(PlotFig);`
`17`	`22`	`}`
`18`	`23`
`19`	`24`	`private void OnDisable()`
`20`	`25`	`{`
`21`	`26`	`_button.onClick.RemoveListener(PlotFig);`
	`27`	`+ cts.Cancel();`
	`28`	`+ cts.Dispose();`
`22`	`29`	`}`
`23`	`30`
`24`		`- private void PlotFig()`
	`31`	`+ private async void PlotFig()`
	`32`	`+ {`
	`33`	`+ if (_executingPython)`
	`34`	`+ {`
	`35`	`+ return;`
	`36`	`+ }`
	`37`	`+`
	`38`	`+ _executingPython = true;`
	`39`	`+ var state = PythonEngine.BeginAllowThreads();`
	`40`	`+ try`
	`41`	`+ {`
	`42`	`+ var (bytes, w, h) = await Task.Run(Plot, cts.Token);`
	`43`	`+ LoadImage(bytes, w, h);`
	`44`	`+ }`
	`45`	`+ catch (OperationCanceledException e) when (e.CancellationToken != cts.Token)`
	`46`	`+ {`
	`47`	`+ throw;`
	`48`	`+ }`
	`49`	`+ finally`
	`50`	`+ {`
	`51`	`+ PythonEngine.EndAllowThreads(state);`
	`52`	`+ _executingPython = false;`
	`53`	`+ }`
	`54`	`+ }`
	`55`	`+`
	`56`	`+ private (byte[], int, int) Plot()`
`25`	`57`	`{`
`26`	`58`	`using (Py.GIL())`
`27`	`59`	`{`
`@@ -37,7 +69,7 @@ private void PlotFig()`
`37`	`69`	`{`
`38`	`70`	`span = new ReadOnlySpan<byte>(ptr.ToPointer(), whs);`
`39`	`71`	`}`
`40`		`- LoadImage(span, w, h);`
	`72`	`+ return (span.ToArray(), w, h);`
`41`	`73`	`}`
`42`	`74`	`}`
`43`	`75`	`}`