Track Runtime run number. Assert, that PyObjects are only disposed in the same run they were created in.

lostmsu · lostmsu · commit cd8abd141b48 · 2021-11-09T14:03:05.000-08:00
diff --git a/src/runtime/pyobject.cs b/src/runtime/pyobject.cs
@@ -26,6 +26,7 @@ public partial class PyObject : DynamicObject, IDisposable
         public StackTrace Traceback { get; private set; }
 #endif  
 
+        readonly long run = Runtime.GetRun();
         protected internal IntPtr obj = IntPtr.Zero;
 
         public static PyObject None => new PyObject(new BorrowedReference(Runtime.PyNone));
@@ -188,6 +189,9 @@ protected virtual void Dispose(bool disposing)
             if (Runtime.Py_IsInitialized() == 0)
                 throw new InvalidOperationException("Python runtime must be initialized");
 
+            if (this.run != Runtime.GetRun())
+                throw new InvalidOperationException("Attempt to dispose PyObject from wrong run");
+
             if (!Runtime.IsFinalizing)
             {
                 long refcount = Runtime.Refcount(this.obj);
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -86,6 +86,16 @@ internal static Version PyVersion
         }
 
         /// <summary>
+        static long run = 0;
+
+        internal static long GetRun()
+        {
+            long runNumber = Interlocked.Read(ref run);
+            System.Diagnostics.Debug.Assert(runNumber > 0,
+                "This must only be called after Runtime is initialized at least once");
+            return runNumber;
+        }
+
         /// Initialize the runtime...
         /// </summary>
         /// <remarks>Always call this method from the Main thread.  After the
@@ -110,6 +120,7 @@ internal static void Initialize(bool initSigs = false, ShutdownMode mode = Shutd
             if (!interpreterAlreadyInitialized)
             {
                 Py_InitializeEx(initSigs ? 1 : 0);
+                Interlocked.Increment(ref run);
                 if (PyEval_ThreadsInitialized() == 0)
                 {
                     PyEval_InitThreads();
