Implemented some safety mechanisms

budgetdevv · budgetdevv · commit c9b7a07dce99 · 2024-03-16T19:01:18.000+08:00
diff --git a/ConsoleTest/Program.cs b/ConsoleTest/Program.cs
@@ -17,9 +17,9 @@ public struct Numpy: IPythonModule<Numpy>
         
         private static async Task Main(string[] args)
         {
-            var core = PythonCore<PyVer3_11, DefaultPythonConfig>.INSTANCE;
-            await core.InitializeAsync();
-            await core.InitializeDependentPackages();
+            var pythonCore = PythonCore<PyVer3_11, DefaultPythonConfig>.INSTANCE;
+            await pythonCore.InitializeAsync();
+            await pythonCore.InitializeDependentPackages();
 
             using (new PythonHandle())
             {
diff --git a/PythonNETExtensions/Core/PythonCore.cs b/PythonNETExtensions/Core/PythonCore.cs
@@ -7,6 +7,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Text.Json;
+using System.Threading;
 using System.Threading.Tasks;
 using Python.Runtime;
 using PythonNETExtensions.Helpers;
@@ -16,15 +17,50 @@
 
 namespace PythonNETExtensions.Core
 {
+    internal static class PythonInstance
+    {
+        private static int InstanceCount = 0;
+
+        public static void OnCreate()
+        {
+            if (Interlocked.Increment(ref InstanceCount) == 1)
+            {
+                return;
+            }
+
+            throw new Exception("There may only be 1 PythonCore instance!");
+        }
+    }
+    
     public class PythonCore<PyVersionT, PyConfigT>
         where PyVersionT: struct, IPythonVersion<PyVersionT>
         where PyConfigT: struct, IPythonConfig<PyConfigT>
     {
         public static readonly PythonCore<PyVersionT, PyConfigT> INSTANCE = new PythonCore<PyVersionT, PyConfigT>();
 
+        static PythonCore()
+        {
+            PythonInstance.OnCreate();
+        }
+        
         private PythonCore() { }
         
         private static readonly HttpClient HTTP_CLIENT = new HttpClient();
+        
+        private enum InitializationState: int
+        {
+            Uninitialized = 0,
+            Initialized = -1
+        }
+
+        private static int IsInitialized = (int) InitializationState.Uninitialized;
+        
+        private static bool TryInitialize()
+        {
+            var oldVal = (InitializationState) Interlocked.CompareExchange(ref IsInitialized, (int) InitializationState.Initialized, (int) InitializationState.Uninitialized);
+
+            return oldVal == InitializationState.Uninitialized;
+        }
 
         public Task InitializeAsync()
         {
@@ -36,6 +72,8 @@ public Task InitializeAsync()
         [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
         private static async Task InitializeAsyncInternal()
         {
+            TryInitialize();
+            
             var pythonBundleDirectory = PyConfigT.PythonHomePath;
 
             if (Directory.Exists(pythonBundleDirectory))
@@ -97,6 +135,11 @@ public Task InitializeDependentPackages()
         [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
         private static async Task InitializeDependentPackagesInternal()
         {
+            if ((InitializationState) IsInitialized == InitializationState.Uninitialized)
+            {
+                throw new Exception($"Please run {nameof(InitializeAsync)}() first!");
+            }
+            
             // Apparently this causes stackoverflow when PythonExtensions.GetCachedPythonModule<>() is invoked...
             // // TODO: Consider asynchronous awaiting of pip process
             // await Task.Yield();

Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,9 @@ public struct Numpy: IPythonModule<Numpy>`
`17`	`17`
`18`	`18`	`private static async Task Main(string[] args)`
`19`	`19`	`{`
`20`		`- var core = PythonCore<PyVer3_11, DefaultPythonConfig>.INSTANCE;`
`21`		`- await core.InitializeAsync();`
`22`		`- await core.InitializeDependentPackages();`
	`20`	`+ var pythonCore = PythonCore<PyVer3_11, DefaultPythonConfig>.INSTANCE;`
	`21`	`+ await pythonCore.InitializeAsync();`
	`22`	`+ await pythonCore.InitializeDependentPackages();`
`23`	`23`
`24`	`24`	`using (new PythonHandle())`
`25`	`25`	`{`